From patchwork Mon Feb 4 10:40:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [29/60] usb-storage: fix SYNCHRONIZE_CACHE Date: Mon, 04 Feb 2013 00:40:39 -0000 From: Michael Tokarev X-Patchwork-Id: 217962 Message-Id: <1359974470-17044-30-git-send-email-mjt@msgid.tls.msk.ru> To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-stable@nongnu.org, Gerd Hoffmann From: Gerd Hoffmann Commit 59310659073d85745854f2f10c4292555c5a1c51 is incomplete, we'll arrive in the scsi command complete callback in CSW state and must handle that case correctly. Signed-off-by: Gerd Hoffmann (cherry picked from commit 54414218d78c9d043417b27bb29bd0334b4e3cb5) Signed-off-by: Michael Tokarev --- hw/usb/dev-storage.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index ae22fb1..3a993d3 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -242,6 +242,9 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status, size_t r the status read packet. */ usb_msd_send_status(s, p); s->mode = USB_MSDM_CBW; + } else if (s->mode == USB_MSDM_CSW) { + usb_msd_send_status(s, p); + s->mode = USB_MSDM_CBW; } else { if (s->data_len) { int len = (p->iov.size - p->result);