41 lines
1.0 KiB
Diff
41 lines
1.0 KiB
Diff
From f63d074313c5df917535587b50802ece7beb6e45 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Wed, 4 Jan 2012 18:13:54 +0100
|
|
Subject: [PATCH 16/25] 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>
|
|
---
|
|
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 4c06950..3147131 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;
|
|
}
|
|
|
|
--
|
|
1.7.7.5
|
|
|