From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwYfn-0006t8-Av for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwYfc-0002dK-T8 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:15 -0400 Received: from mail-we0-x22d.google.com ([2a00:1450:400c:c03::22d]:35550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwYfc-0002d9-Mh for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:04 -0400 Received: by mail-we0-f173.google.com with SMTP id t60so5830038wes.18 for ; Mon, 16 Jun 2014 08:18:03 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 16 Jun 2014 17:17:49 +0200 Message-Id: <1402931870-17261-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1402931870-17261-1-git-send-email-pbonzini@redhat.com> References: <1402931870-17261-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/7] virtio-scsi: introduce virtio_scsi_complete_cmd_req List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com This is also related to sense handling, and will be used by anylayout. Signed-off-by: Paolo Bonzini --- v1->v2: missed a few replacements in patch 6 (Paolo) 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