david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-scsi: Two stages processing of cmd request

Browse Source 
Mechanical change, in preparation for bdrv_io_plug/bdrv_io_unplug.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2014-09-23 15:49:27 +08:00 committed by Paolo Bonzini
parent dfb37cf7fa
commit 359eea71d9
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/scsi/virtio-scsi-dataplane.c
View File

@ -126,7 +126,9 @@ static void virtio_scsi_iothread_handle_cmd(EventNotifier *notifier)
event_notifier_test_and_clear(notifier); event_notifier_test_and_clear(notifier);
while ((req = virtio_scsi_pop_req_vring(s, vring))) { 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);
}
} }
} }

20
hw/scsi/virtio-scsi.c
View File

@ -449,10 +449,9 @@ static void virtio_scsi_fail_cmd_req(VirtIOSCSIReq *req)
virtio_scsi_complete_cmd_req(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; VirtIOSCSICommon *vs = &s->parent_obj;
int n;
SCSIDevice *d; SCSIDevice *d;
int rc; int rc;
@ -464,14 +463,14 @@ void virtio_scsi_handle_cmd_req(VirtIOSCSI *s, VirtIOSCSIReq *req)
} else { } else {
virtio_scsi_bad_req(); virtio_scsi_bad_req();
} }
return; return false;
} }
d = virtio_scsi_device_find(s, req->req.cmd.lun); d = virtio_scsi_device_find(s, req->req.cmd.lun);
if (!d) { if (!d) {
req->resp.cmd.response = VIRTIO_SCSI_S_BAD_TARGET; req->resp.cmd.response = VIRTIO_SCSI_S_BAD_TARGET;
virtio_scsi_complete_cmd_req(req); virtio_scsi_complete_cmd_req(req);
return; return false;
} }
if (s->dataplane_started && bdrv_get_aio_context(d->conf.bs) != s->ctx) { if (s->dataplane_started && bdrv_get_aio_context(d->conf.bs) != s->ctx) {
aio_context_acquire(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->sreq->cmd.xfer > req->qsgl.size)) {
req->resp.cmd.response = VIRTIO_SCSI_S_OVERRUN; req->resp.cmd.response = VIRTIO_SCSI_S_OVERRUN;
virtio_scsi_complete_cmd_req(req); virtio_scsi_complete_cmd_req(req);
return; return false;
}
return true;
} }
n = scsi_req_enqueue(req->sreq); void virtio_scsi_handle_cmd_req_submit(VirtIOSCSI *s, VirtIOSCSIReq *req)
if (n) { {
if (scsi_req_enqueue(req->sreq)) {
scsi_req_continue(req->sreq); scsi_req_continue(req->sreq);
} }
} }
@ -507,7 +509,9 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq)
return; return;
} }
while ((req = virtio_scsi_pop_req(s, vq))) { 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);
}
} }
} }

3
include/hw/virtio/virtio-scsi.h
View File

@ -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_common_unrealize(DeviceState *dev, Error **errp);
void virtio_scsi_handle_ctrl_req(VirtIOSCSI *s, VirtIOSCSIReq *req); 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); VirtIOSCSIReq *virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq);
void virtio_scsi_free_req(VirtIOSCSIReq *req); void virtio_scsi_free_req(VirtIOSCSIReq *req);
void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev, void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,