clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-04 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: Fix virtio scsi build breakage

Browse Source 
Asias writes:

  In include/kvm/virtio-scsi.h, we have

     /* TODO: Remove this when tcm_vhost goes upstream */

  We are redefining VHOST_SCSI_GET_ABI_VERSION and friends because
  tcm_vhost was not upstream at that time. Pekka, I guess we need to
  upgrade kernel version in lkvm repo and drop our own tcm_vhost
  defines.

Ingo writes:

  I can confirm that the patch below fixes the build problem.

Analyzed-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Ingo Molnar
2015-06-01 16:39:54 +01:00
committed by Will Deacon
parent 48bed025ff
commit 2bc40bf294
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/kvm/virtio-scsi.h
-15
View File
@@ -8,19 +8,4 @@ struct kvm;
int virtio_scsi_init(struct kvm *kvm);
int virtio_scsi_exit(struct kvm *kvm);
/*----------------------------------------------------*/
/* TODO: Remove this when tcm_vhost goes upstream */
#define TRANSPORT_IQN_LEN 224
#define VHOST_SCSI_ABI_VERSION 0
struct vhost_scsi_target {
int abi_version;
unsigned char vhost_wwpn[TRANSPORT_IQN_LEN];
unsigned short vhost_tpgt;
};
/* VHOST_SCSI specific defines */
#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_scsi_target)
#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_scsi_target)
#define VHOST_SCSI_GET_ABI_VERSION _IOW(VHOST_VIRTIO, 0x42, struct vhost_scsi_target)
/*----------------------------------------------------*/
#endif /* KVM__SCSI_VIRTIO_H */