[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/14] virtio-scsi: Two stages processing of cmd
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 11/14] virtio-scsi: Two stages processing of cmd request |
Date: |
Wed, 24 Sep 2014 15:21:49 +0800 |
Mechanical change, in preparation for bdrv_io_plug/bdrv_io_unplug.
Signed-off-by: Fam Zheng <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.9.3
- [Qemu-devel] [PATCH v4 01/14] virtio-scsi: Split virtio_scsi_handle_cmd_req from virtio_scsi_handle_cmd, (continued)
- [Qemu-devel] [PATCH v4 01/14] virtio-scsi: Split virtio_scsi_handle_cmd_req from virtio_scsi_handle_cmd, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 02/14] virtio-scsi: Split virtio_scsi_handle_ctrl_req from virtio_scsi_handle_ctrl, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 03/14] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 04/14] virtio-scsi: Make virtio_scsi_init_req public, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 05/14] virtio-scsi: Make virtio_scsi_free_req public, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 06/14] virtio-scsi: Make virtio_scsi_push_event public, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 07/14] virtio-scsi: Add 'iothread' property to virtio-scsi-pci, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 08/14] virtio-scsi-dataplane: Code to run virtio-scsi on iothread, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 09/14] virtio-scsi: Hook up with dataplane, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 10/14] virtio-scsi: Add migration state notifier for dataplane code, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 11/14] virtio-scsi: Two stages processing of cmd request,
Fam Zheng <=
- [Qemu-devel] [PATCH v4 12/14] virtio-scsi: Batched prepare for cmd reqs, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 13/14] virtio-scsi: Call bdrv_io_plug/bdrv_io_unplug in cmd request handling, Fam Zheng, 2014/09/24
- [Qemu-devel] [PATCH v4 14/14] virtio-scsi: Process ".iothread" property, Fam Zheng, 2014/09/24