From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ripif-000371-RL for qemu-devel@nongnu.org; Thu, 05 Jan 2012 10:59:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ripie-0005cP-Q2 for qemu-devel@nongnu.org; Thu, 05 Jan 2012 10:59:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60168) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ripie-0005cC-ED for qemu-devel@nongnu.org; Thu, 05 Jan 2012 10:59:08 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q05Fx7Lk010302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 5 Jan 2012 10:59:07 -0500 From: Gerd Hoffmann Date: Thu, 5 Jan 2012 16:59:06 +0100 Message-Id: <1325779146-9815-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] usb-storage: cancel I/O on reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- 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.1