From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeP9T-0000kp-Kf for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:06:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeP9P-0000ux-QB for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:06:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeP9P-0000ur-Kk for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:06:35 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 45A048E68F for ; Tue, 22 Sep 2015 15:06:35 +0000 (UTC) From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:05:31 +0200 Message-Id: <1442934371-12567-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> References: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 08/48] vhost-scsi: include linux/vhost.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau Replace ad-hoc declarations with the linux header. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <1442585920-28373-1-git-send-email-marcandre.lureau@redhat.co= m> Signed-off-by: Paolo Bonzini --- hw/scsi/vhost-scsi.c | 1 + include/hw/virtio/vhost-scsi.h | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index bac9ddb..fb7983d 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -26,6 +26,7 @@ #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "hw/fw-path-provider.h" +#include "linux/vhost.h" =20 /* Features supported by host kernel. */ static const int kernel_feature_bits[] =3D { diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scs= i.h index 701bfee..9fd63df 100644 --- a/include/hw/virtio/vhost-scsi.h +++ b/include/hw/virtio/vhost-scsi.h @@ -19,37 +19,12 @@ #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" =20 -/* - * Used by QEMU userspace to ensure a consistent vhost-scsi ABI. - * - * ABI Rev 0: July 2012 version starting point for v3.6-rc merge candida= te + - * RFC-v2 vhost-scsi userspace. Add GET_ABI_VERSION ioctl us= age - * ABI Rev 1: January 2013. Ignore vhost_tpgt filed in struct vhost_scsi= _target. - * All the targets under vhost_wwpn can be seen and used by guest= . - */ - -#define VHOST_SCSI_ABI_VERSION 1 - -/* TODO #include properly */ -/* For VHOST_SCSI_SET_ENDPOINT/VHOST_SCSI_CLEAR_ENDPOINT ioctl */ -struct vhost_scsi_target { - int abi_version; - char vhost_wwpn[224]; - unsigned short vhost_tpgt; - unsigned short reserved; -}; - enum vhost_scsi_vq_list { VHOST_SCSI_VQ_CONTROL =3D 0, VHOST_SCSI_VQ_EVENT =3D 1, VHOST_SCSI_VQ_NUM_FIXED =3D 2, }; =20 -#define VHOST_VIRTIO 0xAF -#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_sc= si_target) -#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_= scsi_target) -#define VHOST_SCSI_GET_ABI_VERSION _IOW(VHOST_VIRTIO, 0x42, int) - #define TYPE_VHOST_SCSI "vhost-scsi" #define VHOST_SCSI(obj) \ OBJECT_CHECK(VHostSCSI, (obj), TYPE_VHOST_SCSI) --=20 2.5.0