Merge remote-tracking branch 'bonzini/scsi.2' into staging

Conflicts:
	hw/usb-msd.c

diff --combined hw/usb-msd.c
index 141da2ce8ae995e5183d89a3f635d68d705aef81,6ec2255bce3875b677991733863a7bdccd0e80d8..c59797b27eb200d5d81ef95f44c6b9d41e14158e
--- 1/hw/usb-msd.c
--- 2/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@@ -48,6 -48,7 +48,7 @@@ typedef struct 
      uint32_t data_len;
      uint32_t residue;
      uint32_t tag;
+     SCSIRequest *req;
      SCSIBus bus;
      BlockConf conf;
      SCSIDevice *scsi_dev;
@@@ -119,7 -120,6 +120,7 @@@ static const USBDescDevice desc_device_
              .bConfigurationValue   = 1,
              .iConfiguration        = STR_CONFIG_FULL,
              .bmAttributes          = 0xc0,
 +            .nif = 1,
              .ifs = &desc_iface_full,
          },
      },
@@@ -154,7 -154,6 +155,7 @@@ static const USBDescDevice desc_device_
              .bConfigurationValue   = 1,
              .iConfiguration        = STR_CONFIG_HIGH,
              .bmAttributes          = 0xc0,
 +            .nif = 1,
              .ifs = &desc_iface_high,
          },
      },
@@@ -191,11 -190,7 +192,7 @@@ static void usb_msd_copy_data(MSDState 
      s->scsi_buf += len;
      s->data_len -= len;
      if (s->scsi_len == 0 || s->data_len == 0) {
-         if (s->mode == USB_MSDM_DATAIN) {
-             s->scsi_dev->info->read_data(s->scsi_dev, s->tag);
-         } else if (s->mode == USB_MSDM_DATAOUT) {
-             s->scsi_dev->info->write_data(s->scsi_dev, s->tag);
-         }
+         scsi_req_continue(s->req);
      }
  }
  
@@@ -213,47 -208,21 +210,21 @@@ static void usb_msd_send_status(MSDStat
      memcpy(p->data, &csw, len);
  }
  
- static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag,
-                                      uint32_t arg)
+ static void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)
  {
-     MSDState *s = DO_UPCAST(MSDState, dev.qdev, bus->qbus.parent);
+     MSDState *s = DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent);
      USBPacket *p = s->packet;
  
-     if (tag != s->tag) {
-         fprintf(stderr, "usb-msd: Unexpected SCSI Tag 0x%x\n", tag);
-     }
-     if (reason == SCSI_REASON_DONE) {
-         DPRINTF("Command complete %d\n", arg);
-         s->residue = s->data_len;
-         s->result = arg != 0;
-         if (s->packet) {
-             if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) {
-                 /* A deferred packet with no write data remaining must be
-                    the status read packet.  */
-                 usb_msd_send_status(s, p);
-                 s->mode = USB_MSDM_CBW;
-             } else {
-                 if (s->data_len) {
-                     s->data_len -= s->usb_len;
-                     if (s->mode == USB_MSDM_DATAIN)
-                         memset(s->usb_buf, 0, s->usb_len);
-                     s->usb_len = 0;
-                 }
-                 if (s->data_len == 0)
-                     s->mode = USB_MSDM_CSW;
-             }
-             s->packet = NULL;
-             usb_packet_complete(&s->dev, p);
-         } else if (s->data_len == 0) {
-             s->mode = USB_MSDM_CSW;
-         }
-         return;
+     if (req->tag != s->tag) {
+         fprintf(stderr, "usb-msd: Unexpected SCSI Tag 0x%x\n", req->tag);
      }
-     s->scsi_len = arg;
-     s->scsi_buf = s->scsi_dev->info->get_buf(s->scsi_dev, tag);
+ 
+     assert((s->mode == USB_MSDM_DATAOUT) == (req->cmd.mode == SCSI_XFER_TO_DEV));
+     s->scsi_len = len;
+     s->scsi_buf = scsi_req_get_buf(req);
      if (p) {
          usb_msd_copy_data(s);
 -        if (s->usb_len == 0) {
 +        if (s->packet && s->usb_len == 0) {
              /* Set s->packet to NULL before calling usb_packet_complete
                 because another request may be issued before
                 usb_packet_complete returns.  */
@@@ -264,6 -233,56 +235,56 @@@
      }
  }
  
+ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status)
+ {
+     MSDState *s = DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent);
+     USBPacket *p = s->packet;
+ 
+     if (req->tag != s->tag) {
+         fprintf(stderr, "usb-msd: Unexpected SCSI Tag 0x%x\n", req->tag);
+     }
+     DPRINTF("Command complete %d\n", status);
+     s->residue = s->data_len;
+     s->result = status != 0;
+     if (s->packet) {
+         if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) {
+             /* A deferred packet with no write data remaining must be
+                the status read packet.  */
+             usb_msd_send_status(s, p);
+             s->mode = USB_MSDM_CBW;
+         } else {
+             if (s->data_len) {
+                 s->data_len -= s->usb_len;
+                 if (s->mode == USB_MSDM_DATAIN) {
+                     memset(s->usb_buf, 0, s->usb_len);
+                 }
+                 s->usb_len = 0;
+             }
+             if (s->data_len == 0) {
+                 s->mode = USB_MSDM_CSW;
+             }
+         }
+         s->packet = NULL;
+         usb_packet_complete(&s->dev, p);
+     } else if (s->data_len == 0) {
+         s->mode = USB_MSDM_CSW;
+     }
+     scsi_req_unref(req);
+     s->req = NULL;
+ }
+ 
+ static void usb_msd_request_cancelled(SCSIRequest *req)
+ {
+     MSDState *s = DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent);
+ 
+     if (req == s->req) {
+         scsi_req_unref(s->req);
+         s->req = NULL;
+         s->packet = NULL;
+         s->scsi_len = 0;
+     }
+ }
+ 
  static void usb_msd_handle_reset(USBDevice *dev)
  {
      MSDState *s = (MSDState *)dev;
@@@ -272,13 -291,13 +293,13 @@@
      s->mode = USB_MSDM_CBW;
  }
  
 -static int usb_msd_handle_control(USBDevice *dev, int request, int value,
 -                                  int index, int length, uint8_t *data)
 +static int usb_msd_handle_control(USBDevice *dev, USBPacket *p,
 +               int request, int value, int index, int length, uint8_t *data)
  {
      MSDState *s = (MSDState *)dev;
      int ret;
  
 -    ret = usb_desc_handle_control(dev, request, value, index, length, data);
 +    ret = usb_desc_handle_control(dev, p, request, value, index, length, data);
      if (ret >= 0) {
          return ret;
      }
@@@ -315,12 -334,10 +336,10 @@@
      return ret;
  }
  
 -static void usb_msd_cancel_io(USBPacket *p, void *opaque)
 +static void usb_msd_cancel_io(USBDevice *dev, USBPacket *p)
  {
 -    MSDState *s = opaque;
 +    MSDState *s = DO_UPCAST(MSDState, dev, dev);
-     s->scsi_dev->info->cancel_io(s->scsi_dev, s->tag);
-     s->packet = NULL;
-     s->scsi_len = 0;
+     scsi_req_cancel(s->req);
  }
  
  static int usb_msd_handle_data(USBDevice *dev, USBPacket *p)
@@@ -367,15 -384,12 +386,12 @@@
                      s->tag, cbw.flags, cbw.cmd_len, s->data_len);
              s->residue = 0;
              s->scsi_len = 0;
-             s->scsi_dev->info->send_command(s->scsi_dev, s->tag, cbw.cmd, 0);
+             s->req = scsi_req_new(s->scsi_dev, s->tag, 0);
+             scsi_req_enqueue(s->req, cbw.cmd);
              /* ??? Should check that USB and SCSI data transfer
                 directions match.  */
-             if (s->residue == 0) {
-                 if (s->mode == USB_MSDM_DATAIN) {
-                     s->scsi_dev->info->read_data(s->scsi_dev, s->tag);
-                 } else if (s->mode == USB_MSDM_DATAOUT) {
-                     s->scsi_dev->info->write_data(s->scsi_dev, s->tag);
-                 }
+             if (s->mode != USB_MSDM_CSW && s->residue == 0) {
+                 scsi_req_continue(s->req);
              }
              ret = len;
              break;
@@@ -398,6 -412,7 +414,6 @@@
              }
              if (s->usb_len) {
                  DPRINTF("Deferring packet %p\n", p);
 -                usb_defer_packet(p, usb_msd_cancel_io, s);
                  s->packet = p;
                  ret = USB_RET_ASYNC;
              } else {
@@@ -420,6 -435,7 +436,6 @@@
              if (s->data_len != 0 || len < 13)
                  goto fail;
              /* Waiting for SCSI write to complete.  */
 -            usb_defer_packet(p, usb_msd_cancel_io, s);
              s->packet = p;
              ret = USB_RET_ASYNC;
              break;
@@@ -453,6 -469,7 +469,6 @@@
              }
              if (s->usb_len) {
                  DPRINTF("Deferring packet %p\n", p);
 -                usb_defer_packet(p, usb_msd_cancel_io, s);
                  s->packet = p;
                  ret = USB_RET_ASYNC;
              } else {
@@@ -486,6 -503,12 +502,12 @@@ static void usb_msd_password_cb(void *o
          qdev_unplug(&s->dev.qdev);
  }
  
+ static const struct SCSIBusOps usb_msd_scsi_ops = {
+     .transfer_data = usb_msd_transfer_data,
+     .complete = usb_msd_command_complete,
+     .cancel = usb_msd_request_cancelled
+ };
+ 
  static int usb_msd_initfn(USBDevice *dev)
  {
      MSDState *s = DO_UPCAST(MSDState, dev, dev);
@@@ -515,7 -538,7 +537,7 @@@
      }
  
      usb_desc_init(dev);
-     scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, usb_msd_command_complete);
+     scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, &usb_msd_scsi_ops);
      s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, bs, 0, !!s->removable);
      if (!s->scsi_dev) {
          return -1;
@@@ -601,7 -624,6 +623,7 @@@ static struct USBDeviceInfo msd_info = 
      .usb_desc       = &desc,
      .init           = usb_msd_initfn,
      .handle_packet  = usb_generic_handle_packet,
 +    .cancel_packet  = usb_msd_cancel_io,
      .handle_attach  = usb_desc_attach,
      .handle_reset   = usb_msd_handle_reset,
      .handle_control = usb_msd_handle_control,