diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2012-01-04 18:13:54 +0100 |
---|---|---|
committer | Justin M. Forbes <jforbes@redhat.com> | 2012-01-10 09:45:28 -0600 |
commit | f63d074313c5df917535587b50802ece7beb6e45 (patch) | |
tree | 23e6ffcd54c4ae188f99b6db1dd34d3bd6ef7cc8 | |
parent | 9b81fbdbb0cc930aacec343c6ab37adfd60c9e76 (diff) |
usb-storage: cancel I/O on reset
When resetting the usb-storage device we'll have to carefully cancel
and clear any requests which might be in flight, otherwise we'll confuse
the state machine.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r-- | hw/usb-msd.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 4c0695012..3147131db 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -278,6 +278,18 @@ static void usb_msd_handle_reset(USBDevice *dev) MSDState *s = (MSDState *)dev; DPRINTF("Reset\n"); + if (s->req) { + scsi_req_cancel(s->req); + } + assert(s->req == NULL); + + if (s->packet) { + USBPacket *p = s->packet; + s->packet = NULL; + p->result = USB_RET_STALL; + usb_packet_complete(dev, p); + } + s->mode = USB_MSDM_CBW; } |