From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 21 Nov 2011 10:41:30 +0000 (+0100)
Subject: usb-storage: drop result from device state.
X-Git-Tag: qemu-xen-4.2.0~113^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=414c460431036bdadea8120d056c7e493bb60fb9;p=qemu-upstream-4.2-testing.git

usb-storage: drop result from device state.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 089c23c69..6f32a0ecc 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -59,7 +59,6 @@ typedef struct {
     char *serial;
     SCSIDevice *scsi_dev;
     uint32_t removable;
-    int result;
     /* For async completion.  */
     USBPacket *packet;
 } MSDState;
@@ -231,12 +230,11 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status)
 
     DPRINTF("Command complete %d tag 0x%x\n", status, req->tag);
     s->residue = s->data_len;
-    s->result = status != 0;
 
     s->csw.sig = cpu_to_le32(0x53425355);
     s->csw.tag = cpu_to_le32(req->tag);
     s->csw.residue = s->residue;
-    s->csw.status = s->result;
+    s->csw.status = status != 0;
 
     if (s->packet) {
         if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) {