From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 05/20] virtio-scsi: implement parse_cdb
Date: Tue, 19 Aug 2014 12:42:48 +0200 [thread overview]
Message-ID: <1408444983-21464-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1408444983-21464-1-git-send-email-pbonzini@redhat.com>
Enable passthrough of vendor-specific commands.
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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.8.3.1
next prev parent reply other threads:[~2014-08-19 10:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-19 10:42 [Qemu-devel] [PULL 00/20] SCSI and memory changes for 2014-08-18 Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 01/20] scsi-bus: prepare scsi_req_new for introduction of parse_cdb Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 02/20] scsi-bus: introduce parse_cdb in SCSIDeviceClass and SCSIBusInfo Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 03/20] scsi-block: extract scsi_block_is_passthrough Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 04/20] scsi-block, scsi-generic: implement parse_cdb Paolo Bonzini
2014-08-19 10:42 ` Paolo Bonzini [this message]
2014-08-19 10:42 ` [Qemu-devel] [PULL 06/20] qom: object: delete properties before calling instance_finalize Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 07/20] qom: object: move unparenting to the child property's release callback Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 08/20] sysbus: remove unused function sysbus_del_io Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 09/20] vga: do not dynamically allocate chain4_alias Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 10/20] nic: do not destroy memory regions in cleanup functions Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 11/20] ioport: split deletion and destruction Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 12/20] memory: convert memory_region_destroy to object_unparent Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 13/20] memory: remove memory_region_destroy Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 14/20] tpm_tis: remove instance_finalize callback Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 15/20] loader: Abstract away ref to memory region names Paolo Bonzini
2014-08-19 10:42 ` [Qemu-devel] [PULL 16/20] exec: " Paolo Bonzini
2014-08-19 10:43 ` [Qemu-devel] [PULL 17/20] memory: constify memory_region_name Paolo Bonzini
2014-08-19 10:43 ` [Qemu-devel] [PULL 18/20] memory: Use memory_region_name for name access Paolo Bonzini
2014-08-19 10:43 ` [Qemu-devel] [PULL 19/20] memory: Use canonical path component as the name Paolo Bonzini
2014-08-19 18:51 ` Peter Maydell
2014-08-20 5:01 ` Peter Crosthwaite
2014-08-19 19:01 ` Peter Maydell
2014-08-20 5:04 ` Peter Crosthwaite
2014-08-20 7:50 ` Peter Maydell
2014-08-20 8:16 ` Paolo Bonzini
2014-08-19 10:43 ` [Qemu-devel] [PULL 20/20] mtree: remove write-only field Paolo Bonzini
2014-08-19 14:09 ` [Qemu-devel] [PULL 00/20] SCSI and memory changes for 2014-08-18 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408444983-21464-6-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).