diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2011-11-21 11:36:17 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-11-21 14:08:01 +0100 |
| commit | 7b863f41de0c0089c2735e3caa8952bb3b0a5a7c (patch) | |
| tree | 8c8ce77ac6dd8dbefc74347d04a72686213a0af7 /hw | |
| parent | 92a114f6f8487b8b256340cac5a5a10498e220c1 (diff) | |
usb-storage: drop tag from device state.
scsi keeps track of the tag in SCSIRequest,
no need to store a separate copy.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb-msd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 5dc4afc538..089c23c692 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -52,7 +52,6 @@ typedef struct { uint8_t *scsi_buf; uint32_t data_len; uint32_t residue; - uint32_t tag; struct usb_msd_csw csw; SCSIRequest *req; SCSIBus bus; @@ -230,12 +229,12 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status) MSDState *s = DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent); USBPacket *p = s->packet; - DPRINTF("Command complete %d\n", status); + DPRINTF("Command complete %d tag 0x%x\n", status, req->tag); s->residue = s->data_len; s->result = status != 0; s->csw.sig = cpu_to_le32(0x53425355); - s->csw.tag = cpu_to_le32(s->tag); + s->csw.tag = cpu_to_le32(req->tag); s->csw.residue = s->residue; s->csw.status = s->result; @@ -260,7 +259,6 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status) } else if (s->data_len == 0) { s->mode = USB_MSDM_CSW; } - scsi_req_unref(req); s->req = NULL; } @@ -340,6 +338,7 @@ static void usb_msd_cancel_io(USBDevice *dev, USBPacket *p) static int usb_msd_handle_data(USBDevice *dev, USBPacket *p) { MSDState *s = (MSDState *)dev; + uint32_t tag; int ret = 0; struct usb_msd_cbw cbw; uint8_t devep = p->devep; @@ -366,7 +365,7 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p) fprintf(stderr, "usb-msd: Bad LUN %d\n", cbw.lun); goto fail; } - s->tag = le32_to_cpu(cbw.tag); + tag = le32_to_cpu(cbw.tag); s->data_len = le32_to_cpu(cbw.data_len); if (s->data_len == 0) { s->mode = USB_MSDM_CSW; @@ -376,10 +375,10 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p) s->mode = USB_MSDM_DATAOUT; } DPRINTF("Command tag 0x%x flags %08x len %d data %d\n", - s->tag, cbw.flags, cbw.cmd_len, s->data_len); + 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, cbw.cmd, NULL); + s->req = scsi_req_new(s->scsi_dev, tag, 0, cbw.cmd, NULL); scsi_req_enqueue(s->req); /* ??? Should check that USB and SCSI data transfer directions match. */ |