From 2bc40bf2948a800de6c65738c376e18ecebc1e2b Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 19 Jun 2013 14:58:36 +0200 Subject: [PATCH] kvm tools: Fix virtio scsi build breakage 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 Signed-off-by: Ingo Molnar Signed-off-by: Pekka Enberg --- include/kvm/virtio-scsi.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/include/kvm/virtio-scsi.h b/include/kvm/virtio-scsi.h index a780d7e..d64aa7e 100644 --- a/include/kvm/virtio-scsi.h +++ b/include/kvm/virtio-scsi.h @@ -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 */