From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWgu1-0008O1-Fr for qemu-devel@nongnu.org; Wed, 24 Sep 2014 03:22:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWgtv-0005Wr-0J for qemu-devel@nongnu.org; Wed, 24 Sep 2014 03:22:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWgtu-0005VW-PL for qemu-devel@nongnu.org; Wed, 24 Sep 2014 03:22:10 -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 (8.14.4/8.14.4) with ESMTP id s8O7M5oZ018894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 24 Sep 2014 03:22:05 -0400 From: Fam Zheng Date: Wed, 24 Sep 2014 15:21:41 +0800 Message-Id: <1411543312-6511-4-git-send-email-famz@redhat.com> In-Reply-To: <1411543312-6511-1-git-send-email-famz@redhat.com> References: <1411543312-6511-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 03/14] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, stefanha@redhat.com Move VirtIOSCSIReq to header and add one field "vring" as a wrapper structure of Vring, VirtIOSCSIVring. This is necessary for coming dataplane code that runs uses vring on iothread. Signed-off-by: Fam Zheng Signed-off-by: Paolo Bonzini --- include/hw/virtio/virtio-scsi.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index b91d326..848a1d3 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -17,6 +17,8 @@ #include "hw/virtio/virtio.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" +#include "sysemu/iothread.h" +#include "hw/virtio/dataplane/vring.h" #define TYPE_VIRTIO_SCSI_COMMON "virtio-scsi-common" #define VIRTIO_SCSI_COMMON(obj) \ @@ -153,6 +155,15 @@ struct VirtIOSCSIConf { char *wwpn; }; +struct VirtIOSCSICommon; + +typedef struct { + struct VirtIOSCSICommon *parent; + Vring vring; + EventNotifier host_notifier; + EventNotifier guest_notifier; +} VirtIOSCSIVring; + typedef struct VirtIOSCSICommon { VirtIODevice parent_obj; VirtIOSCSIConf conf; @@ -185,6 +196,8 @@ typedef struct VirtIOSCSIReq { * */ VirtQueueElement elem; + /* Set by dataplane code. */ + VirtIOSCSIVring *vring; SCSIRequest *sreq; size_t resp_size; enum SCSIXferMode mode; -- 1.9.3