From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XBmY1-0000ZL-01 for qemu-devel@nongnu.org; Mon, 28 Jul 2014 11:09:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XBmXr-00006A-R8 for qemu-devel@nongnu.org; Mon, 28 Jul 2014 11:09:08 -0400 Received: from mail-qa0-x235.google.com ([2607:f8b0:400d:c00::235]:41328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XBmXr-00005x-N9 for qemu-devel@nongnu.org; Mon, 28 Jul 2014 11:08:59 -0400 Received: by mail-qa0-f53.google.com with SMTP id v10so7829230qac.26 for ; Mon, 28 Jul 2014 08:08:59 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-37-117-143-217.cust.vodafonedsl.it. [37.117.143.217]) by mx.google.com with ESMTPSA id i2sm22891723qge.27.2014.07.28.08.08.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jul 2014 08:08:58 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 28 Jul 2014 17:08:39 +0200 Message-Id: <1406560119-22362-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1406560119-22362-1-git-send-email-pbonzini@redhat.com> References: <1406560119-22362-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] virtio-scsi: implement parse_cdb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Enable passthrough of vendor-specific commands. Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 0eb069a..2dd9255 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -406,6 +406,30 @@ static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, virtio_scsi_complete_cmd_req(req); } +static int virtio_scsi_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, + uint8_t *buf, void *hba_private) +{ + VirtIOSCSIReq *req = hba_private; + + if (cmd->len == 0) { + cmd->len = MIN(VIRTIO_SCSI_CDB_SIZE, SCSI_CMD_BUF_SIZE); + memcpy(cmd->buf, buf, cmd->len); + } + + /* Extract the direction and mode directly from the request, for + * host device passthrough. + */ + cmd->xfer = req->qsgl.size; + if (cmd->xfer == 0) { + cmd->mode = SCSI_XFER_NONE; + } else if (iov_size(req->elem.in_sg, req->elem.in_num) > req->resp_size) { + cmd->mode = SCSI_XFER_FROM_DEV; + } else { + cmd->mode = SCSI_XFER_TO_DEV; + } + return 0; +} + static QEMUSGList *virtio_scsi_get_sg_list(SCSIRequest *r) { VirtIOSCSIReq *req = r->hba_private; @@ -658,6 +682,7 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { .change = virtio_scsi_change, .hotplug = virtio_scsi_hotplug, .hot_unplug = virtio_scsi_hot_unplug, + .parse_cdb = virtio_scsi_parse_cdb, .get_sg_list = virtio_scsi_get_sg_list, .save_request = virtio_scsi_save_request, .load_request = virtio_scsi_load_request, -- 1.9.3