[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/39] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSI
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 23/39] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq |
Date: |
Tue, 30 Sep 2014 14:25:03 +0200 |
From: Fam Zheng <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/hw/virtio/virtio-scsi.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index 2ff145a..e886517 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) \
@@ -154,6 +156,15 @@ struct VirtIOSCSIConf {
IOThread *iothread;
};
+struct VirtIOSCSI;
+
+typedef struct {
+ struct VirtIOSCSI *parent;
+ Vring vring;
+ EventNotifier host_notifier;
+ EventNotifier guest_notifier;
+} VirtIOSCSIVring;
+
typedef struct VirtIOSCSICommon {
VirtIODevice parent_obj;
VirtIOSCSIConf conf;
@@ -165,7 +176,7 @@ typedef struct VirtIOSCSICommon {
VirtQueue **cmd_vqs;
} VirtIOSCSICommon;
-typedef struct {
+typedef struct VirtIOSCSI {
VirtIOSCSICommon parent_obj;
SCSIBus bus;
@@ -186,6 +197,8 @@ typedef struct VirtIOSCSIReq {
* */
VirtQueueElement elem;
+ /* Set by dataplane code. */
+ VirtIOSCSIVring *vring;
SCSIRequest *sreq;
size_t resp_size;
enum SCSIXferMode mode;
--
1.8.3.1
- [Qemu-devel] [PULL 07/39] virtio-scsi: Make virtio_scsi_init_req public, (continued)
- [Qemu-devel] [PULL 07/39] virtio-scsi: Make virtio_scsi_init_req public, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 09/39] virtio-scsi: Make virtio_scsi_push_event public, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 14/39] virtio-serial: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 15/39] virtio-serial: fix virtio-serial child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 16/39] virtio-rng: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 17/39] virtio-rng: fix virtio-rng child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 18/39] virtio-balloon: fix virtio-balloon child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 19/39] virtio-9p: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 20/39] virtio-9p: fix virtio-9p child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 21/39] virtio: add a wrapper for virtio-backend initialization, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 23/39] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq,
Paolo Bonzini <=
- [Qemu-devel] [PULL 22/39] virtio-scsi: Add 'iothread' property to virtio-scsi, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 24/39] virtio-scsi-dataplane: Code to run virtio-scsi on iothread, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 25/39] virtio-scsi: Hook up with dataplane, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 26/39] virtio-scsi: Add migration state notifier for dataplane code, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 27/39] virtio-scsi: Two stages processing of cmd request, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 28/39] virtio-scsi: Batched prepare for cmd reqs, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 29/39] virtio-scsi: Call bdrv_io_plug/bdrv_io_unplug in cmd request handling, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 30/39] virtio-scsi: Process ".iothread" property, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 31/39] scsi: Drop scsi_req_abort, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 33/39] scsi: Unify request unref in scsi_req_cancel, Paolo Bonzini, 2014/09/30