motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio-scsi: introduce virtio_scsi_complete_cmd_req

Browse source 
This is also related to sense handling, and will be used
by anylayout.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-06-10 20:16:20 +02:00
parent 489c7901a6
commit a3de269ccc
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hw/scsi/virtio-scsi.c
View file

@ -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, static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status,
size_t resid) 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); memcpy(req->resp.cmd->sense, sense, sense_len);
req->resp.cmd->sense_len = tswap32(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) static QEMUSGList *virtio_scsi_get_sg_list(SCSIRequest *r)
@ -400,13 +405,13 @@ static void virtio_scsi_request_cancelled(SCSIRequest *r)
} else { } else {
req->resp.cmd->response = VIRTIO_SCSI_S_ABORTED; 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) static void virtio_scsi_fail_cmd_req(VirtIOSCSIReq *req)
{ {
req->resp.cmd->response = VIRTIO_SCSI_S_FAILURE; 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) 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); 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_req(req); virtio_scsi_complete_cmd_req(req);
continue; continue;
} }
req->sreq = scsi_req_new(d, req->req.cmd->tag, 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 || if (req->sreq->cmd.mode != req_mode ||
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_req(req); virtio_scsi_complete_cmd_req(req);
continue; continue;
} }
} }