[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/14] virtio-scsi: introduce virtio_scsi_complete_cm
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 13/14] virtio-scsi: introduce virtio_scsi_complete_cmd_req |
Date: |
Wed, 18 Jun 2014 15:26:53 +0200 |
This is also related to sense handling, and will be used
by anylayout.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index fbc7db7..06fda89 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -356,6 +356,11 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
}
}
+static void virtio_scsi_complete_cmd_req(VirtIOSCSIReq *req)
+{
+ virtio_scsi_complete_req(req);
+}
+
static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status,
size_t resid)
{
@@ -378,7 +383,7 @@ static void virtio_scsi_command_complete(SCSIRequest *r,
uint32_t status,
memcpy(req->resp.cmd->sense, sense, sense_len);
req->resp.cmd->sense_len = tswap32(sense_len);
}
- virtio_scsi_complete_req(req);
+ virtio_scsi_complete_cmd_req(req);
}
static QEMUSGList *virtio_scsi_get_sg_list(SCSIRequest *r)
@@ -400,13 +405,13 @@ static void virtio_scsi_request_cancelled(SCSIRequest *r)
} else {
req->resp.cmd->response = VIRTIO_SCSI_S_ABORTED;
}
- virtio_scsi_complete_req(req);
+ virtio_scsi_complete_cmd_req(req);
}
static void virtio_scsi_fail_cmd_req(VirtIOSCSIReq *req)
{
req->resp.cmd->response = VIRTIO_SCSI_S_FAILURE;
- virtio_scsi_complete_req(req);
+ virtio_scsi_complete_cmd_req(req);
}
static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq)
@@ -435,7 +440,7 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev,
VirtQueue *vq)
d = virtio_scsi_device_find(s, req->req.cmd->lun);
if (!d) {
req->resp.cmd->response = VIRTIO_SCSI_S_BAD_TARGET;
- virtio_scsi_complete_req(req);
+ virtio_scsi_complete_cmd_req(req);
continue;
}
req->sreq = scsi_req_new(d, req->req.cmd->tag,
@@ -449,7 +454,7 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev,
VirtQueue *vq)
if (req->sreq->cmd.mode != req_mode ||
req->sreq->cmd.xfer > req->qsgl.size) {
req->resp.cmd->response = VIRTIO_SCSI_S_OVERRUN;
- virtio_scsi_complete_req(req);
+ virtio_scsi_complete_cmd_req(req);
continue;
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 03/14] block/iscsi: use 16 byte CDBs only when necessary, (continued)
- [Qemu-devel] [PULL 03/14] block/iscsi: use 16 byte CDBs only when necessary, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 04/14] scsi-disk.c: Fix compilation with -DDEBUG_SCSI, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 05/14] scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 06/14] scsi: Print command name in debug, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 07/14] megasas: use PCI DMA API, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 08/14] util: add return value to qemu_iovec_concat_iov, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 09/14] virtio-scsi: start preparing for any_layout, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 10/14] virtio-scsi: add target swap for VirtIOSCSICtrlTMFReq fields, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 12/14] virtio-scsi: prepare sense data handling for any_layout, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 11/14] virtio-scsi: add extra argument and return type to qemu_sgl_concat, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 13/14] virtio-scsi: introduce virtio_scsi_complete_cmd_req,
Paolo Bonzini <=
- [Qemu-devel] [PULL 14/14] virtio-scsi: add support for the any_layout feature, Paolo Bonzini, 2014/06/18
- Re: [Qemu-devel] [PULL 00/14] SCSI changes for 2014-06-18, Peter Maydell, 2014/06/18