From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 9 Mar 2015 09:14:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0048fa6c807fc8fb5c52873562ea3debfa65f085;p=qemu.git

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pci, pc, virtio fixes and cleanups

A bunch of fixes all over the place.
All of ACPI refactoring has been merged.
Legacy pci commands have been dropped.
virtio header cleanup
initial patches from virtio-1.0 branch

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

* remotes/mst/tags/for_upstream: (130 commits)
  acpi: drop unused code
  aml-build: comment fix
  acpi-build: fix typo in comment
  acpi: update generated files
  vhost user:support vhost user nic for non msi guests
  aml-build: fix build for glib < 2.22
  acpi: update generated files
  Makefile.target: binary depends on config-devices
  acpi-test-data: update after pci rewrite
  acpi, mem-hotplug: use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb().
  pci-hotplug-old: Has been dead for five major releases, bury
  pci: Give a few helpers internal linkage
  acpi: make build_*() routines static to aml-build.c
  pc: acpi: remove not used anymore ssdt-[misc|pcihp].hex.generated blobs
  pc: acpi-build: drop template patching and create PCI bus tree dynamically
  tests: ACPI: update pc/SSDT.bridge due to new alg of PCI tree creation
  pc: acpi-build: simplify PCI bus tree generation
  tests: add ACPI blobs for qemu with bridge cases
  tests: bios-tables-test: add support for testing bridges
  tests: ACPI test blobs update due to PCI0._CRS changes
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Conflicts:
	hw/pci/pci-hotplug-old.c
---

0048fa6c807fc8fb5c52873562ea3debfa65f085
diff --cc hw/display/qxl.c
index 762f75dc2d,208346d274..b6d65b9487
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@@ -1907,13 -1910,13 +1907,13 @@@ static void qxl_init_ramsize(PCIQXLDevi
          qxl->vram32_size = 4096;
          qxl->vram_size = 4096;
      }
 -    qxl->vgamem_size = msb_mask(qxl->vgamem_size * 2 - 1);
 -    qxl->vga.vram_size = msb_mask(qxl->vga.vram_size * 2 - 1);
 -    qxl->vram32_size = msb_mask(qxl->vram32_size * 2 - 1);
 -    qxl->vram_size = msb_mask(qxl->vram_size * 2 - 1);
 +    qxl->vgamem_size = pow2ceil(qxl->vgamem_size);
 +    qxl->vga.vram_size = pow2ceil(qxl->vga.vram_size);
 +    qxl->vram32_size = pow2ceil(qxl->vram32_size);
 +    qxl->vram_size = pow2ceil(qxl->vram_size);
  }
  
- static int qxl_init_common(PCIQXLDevice *qxl)
+ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp)
  {
      uint8_t* config = qxl->pci.config;
      uint32_t pci_device_rev;
@@@ -1942,12 -1945,12 +1942,12 @@@
          break;
      case 4: /* qxl-4 */
          pci_device_rev = QXL_REVISION_STABLE_V12;
 -        io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
 +        io_size = pow2ceil(QXL_IO_RANGE_SIZE);
          break;
      default:
-         error_report("Invalid revision %d for qxl device (max %d)",
-                      qxl->revision, QXL_DEFAULT_REVISION);
-         return -1;
+         error_setg(errp, "Invalid revision %d for qxl device (max %d)",
+                    qxl->revision, QXL_DEFAULT_REVISION);
+         return;
      }
  
      pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
diff --cc hw/scsi/virtio-scsi.c
index 4db3b23ea3,c5d910995f..cfb52e8fd9
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@@ -763,12 -768,9 +764,12 @@@ static void virtio_scsi_hotplug(Hotplug
              return;
          }
          blk_op_block_all(sd->conf.blk, s->blocker);
 +        aio_context_acquire(s->ctx);
 +        blk_set_aio_context(sd->conf.blk, s->ctx);
 +        aio_context_release(s->ctx);
      }
  
-     if ((vdev->guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) {
+     if (virtio_has_feature(vdev, VIRTIO_SCSI_F_HOTPLUG)) {
          virtio_scsi_push_event(s, sd,
                                 VIRTIO_SCSI_T_TRANSPORT_RESET,
                                 VIRTIO_SCSI_EVT_RESET_RESCAN);