Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
  virtio-scsi: use dma_context_memory
  dma: Define dma_context_memory and use in sysbus-ohci
  megasas: Correct target/lun mapping
  scsi-disk: flush cache after disabling it
  megasas: do not include block_int.h
  scsi: remove superfluous call to scsi_device_set_ua
  virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events
  scsi: do not return short responses for emulated commands

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --combined hw/usb/hcd-ohci.c
index 6a39e9697b5ce7428a745d58f891263ef635d5b2,efae0322ee28e4bd5c5cdac93ac3fee119fee0ba..64de906e41a2b7f4075a5c79d21ca9ad77e322ed
--- 1/hw/usb/hcd-ohci.c
--- 2/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@@ -807,24 -807,21 +807,24 @@@ static int ohci_service_iso_td(OHCIStat
                           DMA_DIRECTION_TO_DEVICE);
      }
  
 -    if (completion) {
 -        ret = ohci->usb_packet.result;
 -    } else {
 +    if (!completion) {
          bool int_req = relative_frame_number == frame_count &&
                         OHCI_BM(iso_td.flags, TD_DI) == 0;
          dev = ohci_find_device(ohci, OHCI_BM(ed->flags, ED_FA));
          ep = usb_ep_get(dev, pid, OHCI_BM(ed->flags, ED_EN));
          usb_packet_setup(&ohci->usb_packet, pid, ep, addr, false, int_req);
          usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, len);
 -        ret = usb_handle_packet(dev, &ohci->usb_packet);
 -        if (ret == USB_RET_ASYNC) {
 +        usb_handle_packet(dev, &ohci->usb_packet);
 +        if (ohci->usb_packet.status == USB_RET_ASYNC) {
              usb_device_flush_ep_queue(dev, ep);
              return 1;
          }
      }
 +    if (ohci->usb_packet.status == USB_RET_SUCCESS) {
 +        ret = ohci->usb_packet.actual_length;
 +    } else {
 +        ret = ohci->usb_packet.status;
 +    }
  
  #ifdef DEBUG_ISOCH
      printf("so 0x%.8x eo 0x%.8x\nsa 0x%.8x ea 0x%.8x\ndir %s len %zu ret %d\n",
@@@ -1000,6 -997,7 +1000,6 @@@ static int ohci_service_td(OHCIState *o
      }
  #endif
      if (completion) {
 -        ret = ohci->usb_packet.result;
          ohci->async_td = 0;
          ohci->async_complete = 0;
      } else {
@@@ -1019,22 -1017,16 +1019,22 @@@
          usb_packet_setup(&ohci->usb_packet, pid, ep, addr, !flag_r,
                           OHCI_BM(td.flags, TD_DI) == 0);
          usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, pktlen);
 -        ret = usb_handle_packet(dev, &ohci->usb_packet);
 +        usb_handle_packet(dev, &ohci->usb_packet);
  #ifdef DEBUG_PACKET
 -        DPRINTF("ret=%d\n", ret);
 +        DPRINTF("status=%d\n", ohci->usb_packet.status);
  #endif
 -        if (ret == USB_RET_ASYNC) {
 +        if (ohci->usb_packet.status == USB_RET_ASYNC) {
              usb_device_flush_ep_queue(dev, ep);
              ohci->async_td = addr;
              return 1;
          }
      }
 +    if (ohci->usb_packet.status == USB_RET_SUCCESS) {
 +        ret = ohci->usb_packet.actual_length;
 +    } else {
 +        ret = ohci->usb_packet.status;
 +    }
 +
      if (ret >= 0) {
          if (dir == OHCI_TD_DIR_IN) {
              ohci_copy_td(ohci, &td, ohci->usb_buf, ret,
@@@ -1859,7 -1851,7 +1859,7 @@@ static int ohci_init_pxa(SysBusDevice *
  
      /* Cannot fail as we pass NULL for masterbus */
      usb_ohci_init(&s->ohci, &dev->qdev, s->num_ports, s->dma_offset, NULL, 0,
-                   NULL);
+                   &dma_context_memory);
      sysbus_init_irq(dev, &s->ohci.irq);
      sysbus_init_mmio(dev, &s->ohci.mem);