summary refs log tree commit diff stats
path: root/hw/usb-msd.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-08-03 10:49:10 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-12 08:27:37 -0500
commitc39ce112b60ffafbaf700853e32bea74cbb2c148 (patch)
tree057c60e24ca46e5c880fe575fc17620c1dff0ea0 /hw/usb-msd.c
parent12010e7b29a2e777153440ded6fd5bd426eed3e4 (diff)
downloadfocaccia-qemu-c39ce112b60ffafbaf700853e32bea74cbb2c148.tar.gz
focaccia-qemu-c39ce112b60ffafbaf700853e32bea74cbb2c148.zip
scsi: pass cdb already to scsi_req_new
Right now the CDB is not passed to the SCSIBus until scsi_req_enqueue.
Passing it to scsi_req_new will let scsi_req_new dispatch common requests
through different reqops.

Moving the memcpy to scsi_req_new is a hack that will go away as
soon as scsi_req_new will also take care of the parsing.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb-msd.c')
-rw-r--r--hw/usb-msd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 90e57fbf6b..4072efd4b7 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -370,8 +370,8 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p)
                     s->tag, cbw.flags, cbw.cmd_len, s->data_len);
             s->residue = 0;
             s->scsi_len = 0;
-            s->req = scsi_req_new(s->scsi_dev, s->tag, 0, NULL);
-            scsi_req_enqueue(s->req, cbw.cmd);
+            s->req = scsi_req_new(s->scsi_dev, s->tag, 0, cbw.cmd, NULL);
+            scsi_req_enqueue(s->req);
             /* ??? Should check that USB and SCSI data transfer
                directions match.  */
             if (s->mode != USB_MSDM_CSW && s->residue == 0) {