[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/39] virtio-scsi: Two stages processing of cmd requ
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 27/39] virtio-scsi: Two stages processing of cmd request |
Date: |
Tue, 30 Sep 2014 14:25:07 +0200 |
From: Fam Zheng <address@hidden>
Mechanical change, in preparation for bdrv_io_plug/bdrv_io_unplug.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi-dataplane.c | 4 +++-
hw/scsi/virtio-scsi.c | 20 ++++++++++++--------
include/hw/virtio/virtio-scsi.h | 3 ++-
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index acbf622..11f5705 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -126,7 +126,9 @@ static void virtio_scsi_iothread_handle_cmd(EventNotifier
*notifier)
event_notifier_test_and_clear(notifier);
while ((req = virtio_scsi_pop_req_vring(s, vring))) {
- virtio_scsi_handle_cmd_req(s, req);
+ if (virtio_scsi_handle_cmd_req_prepare(s, req)) {
+ virtio_scsi_handle_cmd_req_submit(s, req);
+ }
}
}
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 57efe65..6cf070f 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -449,10 +449,9 @@ static void virtio_scsi_fail_cmd_req(VirtIOSCSIReq *req)
virtio_scsi_complete_cmd_req(req);
}
-void virtio_scsi_handle_cmd_req(VirtIOSCSI *s, VirtIOSCSIReq *req)
+bool virtio_scsi_handle_cmd_req_prepare(VirtIOSCSI *s, VirtIOSCSIReq *req)
{
VirtIOSCSICommon *vs = &s->parent_obj;
- int n;
SCSIDevice *d;
int rc;
@@ -464,14 +463,14 @@ void virtio_scsi_handle_cmd_req(VirtIOSCSI *s,
VirtIOSCSIReq *req)
} else {
virtio_scsi_bad_req();
}
- return;
+ return false;
}
d = virtio_scsi_device_find(s, req->req.cmd.lun);
if (!d) {
req->resp.cmd.response = VIRTIO_SCSI_S_BAD_TARGET;
virtio_scsi_complete_cmd_req(req);
- return;
+ return false;
}
if (s->dataplane_started && bdrv_get_aio_context(d->conf.bs) != s->ctx) {
aio_context_acquire(s->ctx);
@@ -487,11 +486,14 @@ void virtio_scsi_handle_cmd_req(VirtIOSCSI *s,
VirtIOSCSIReq *req)
req->sreq->cmd.xfer > req->qsgl.size)) {
req->resp.cmd.response = VIRTIO_SCSI_S_OVERRUN;
virtio_scsi_complete_cmd_req(req);
- return;
+ return false;
}
+ return true;
+}
- n = scsi_req_enqueue(req->sreq);
- if (n) {
+void virtio_scsi_handle_cmd_req_submit(VirtIOSCSI *s, VirtIOSCSIReq *req)
+{
+ if (scsi_req_enqueue(req->sreq)) {
scsi_req_continue(req->sreq);
}
}
@@ -507,7 +509,9 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev,
VirtQueue *vq)
return;
}
while ((req = virtio_scsi_pop_req(s, vq))) {
- virtio_scsi_handle_cmd_req(s, req);
+ if (virtio_scsi_handle_cmd_req_prepare(s, req)) {
+ virtio_scsi_handle_cmd_req_submit(s, req);
+ }
}
}
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index 1a6a919..1cc759a 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -256,7 +256,8 @@ void virtio_scsi_common_realize(DeviceState *dev, Error
**errp,
void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp);
void virtio_scsi_handle_ctrl_req(VirtIOSCSI *s, VirtIOSCSIReq *req);
-void virtio_scsi_handle_cmd_req(VirtIOSCSI *s, VirtIOSCSIReq *req);
+bool virtio_scsi_handle_cmd_req_prepare(VirtIOSCSI *s, VirtIOSCSIReq *req);
+void virtio_scsi_handle_cmd_req_submit(VirtIOSCSI *s, VirtIOSCSIReq *req);
VirtIOSCSIReq *virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq);
void virtio_scsi_free_req(VirtIOSCSIReq *req);
void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
--
1.8.3.1
- [Qemu-devel] [PULL 17/39] virtio-rng: fix virtio-rng child refcount in transports, (continued)
- [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, 2014/09/30
- [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 <=
- [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
- [Qemu-devel] [PULL 32/39] scsi-generic: Handle canceled request in scsi_command_complete, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 34/39] scsi: Drop SCSIReqOps.cancel_io, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 35/39] scsi: Introduce scsi_req_cancel_complete, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 38/39] util: introduce bitmap_try_new, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 39/39] block/iscsi: handle failure on malloc of the allocationmap, Paolo Bonzini, 2014/09/30