ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb storage: fix status reporting 

Change usb_msd_send_status() to take a pointer to the status packet
instead of writing the status to s->usb_buf which might not point
to the correct location.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2010-12-09 10:36:35 +01:00
parent ca0c730df9
commit ab4797ad2e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/usb-msd.c
View File

@ -196,15 +196,18 @@ static void usb_msd_copy_data(MSDState *s)
} }
} }
static void usb_msd_send_status(MSDState *s) static void usb_msd_send_status(MSDState *s, USBPacket *p)
{ {
struct usb_msd_csw csw; struct usb_msd_csw csw;
int len;
csw.sig = cpu_to_le32(0x53425355); csw.sig = cpu_to_le32(0x53425355);
csw.tag = cpu_to_le32(s->tag); csw.tag = cpu_to_le32(s->tag);
csw.residue = s->residue; csw.residue = s->residue;
csw.status = s->result; csw.status = s->result;
memcpy(s->usb_buf, &csw, 13);
len = MIN(sizeof(csw), p->len);
memcpy(p->data, &csw, len);
} }
static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag, static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag,
@ -224,7 +227,7 @@ static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag,
if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) { if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) {
/* A deferred packet with no write data remaining must be /* A deferred packet with no write data remaining must be
the status read packet. */ the status read packet. */
usb_msd_send_status(s); usb_msd_send_status(s, p);
s->mode = USB_MSDM_CBW; s->mode = USB_MSDM_CBW;
} else { } else {
if (s->data_len) { if (s->data_len) {
@ -425,9 +428,7 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p)
if (len < 13) if (len < 13)
goto fail; goto fail;
s->usb_len = len; usb_msd_send_status(s, p);
s->usb_buf = data;
usb_msd_send_status(s);
s->mode = USB_MSDM_CBW; s->mode = USB_MSDM_CBW;
ret = 13; ret = 13;
break; break;