From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 11 May 2015 15:21:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: v2.4.0-rc0~139
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0403b0f539f40a21da60409b825b4653b273ab39;p=thirdparty%2Fqemu.git

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

pc, virtio enhancements

Memory hot-unplug support for pc, MSI-X
mapping update speedup for virtio-pci,
misc refactorings and bugfixes.

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

# gpg: Signature made Mon May 11 08:23:43 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream: (28 commits)
  acpi: update expected files for memory unplug
  virtio-scsi: Move DEFINE_VIRTIO_SCSI_FEATURES to virtio-scsi
  virtio-net: Move DEFINE_VIRTIO_NET_FEATURES to virtio-net
  pci: Merge pci_nic_init() into pci_nic_init_nofail()
  acpi: add a missing backslash to the \_SB scope.
  qmp-event: add event notification for memory hot unplug error
  acpi: add hardware implementation for memory hot unplug
  acpi: fix "Memory device control fields" register
  acpi: extend aml_field() to support UpdateRule
  acpi, mem-hotplug: add unplug cb for memory device
  acpi, mem-hotplug: add unplug request cb for memory device
  acpi, mem-hotplug: add acpi_memory_slot_status() to get MemStatus
  docs: update documentation for memory hot unplug
  virtio: coding style tweak
  pci: remove hard-coded bar size in msix_init_exclusive_bar()
  virtio-pci: speedup MSI-X masking and unmasking
  virtio: introduce vector to virtqueues mapping
  virtio-ccw: using VIRTIO_NO_VECTOR instead of 0 for invalid virtqueue
  monitor: check return value of qemu_find_net_clients_except()
  monitor: replace the magic number 255 with MAX_QUEUE_NUM
  ...

Conflicts:
	hw/s390x/s390-virtio-bus.c

[PMM: fixed conflict in s390_virtio_scsi_properties and
s390_virtio_net_properties arrays; since the result of the
two conflicting patches is to empty the property arrays
completely, the conflict resolution is to remove them entirely.]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

0403b0f539f40a21da60409b825b4653b273ab39
diff --cc hw/s390x/s390-virtio-bus.c
index 4f69cbbb70d,c8a78ba5776..0e35ac970a6
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@@ -537,19 -505,18 +536,13 @@@ static unsigned virtio_s390_get_feature
  
  /**************** S390 Virtio Bus Device Descriptions *******************/
  
--static Property s390_virtio_net_properties[] = {
-     DEFINE_VIRTIO_NET_FEATURES(VirtIOS390Device, host_features),
 -    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),
--    DEFINE_PROP_END_OF_LIST(),
--};
--
  static void s390_virtio_net_class_init(ObjectClass *klass, void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
      VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
  
      k->realize = s390_virtio_net_realize;
--    dc->props = s390_virtio_net_properties;
 +    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
  }
  
  static const TypeInfo s390_virtio_net = {
@@@ -657,19 -620,18 +650,13 @@@ static const TypeInfo virtio_s390_devic
      .abstract = true,
  };
  
--static Property s390_virtio_scsi_properties[] = {
-     DEFINE_VIRTIO_SCSI_FEATURES(VirtIOS390Device, host_features),
 -    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),
--    DEFINE_PROP_END_OF_LIST(),
--};
--
  static void s390_virtio_scsi_class_init(ObjectClass *klass, void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
      VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
  
      k->realize = s390_virtio_scsi_realize;
--    dc->props = s390_virtio_scsi_properties;
 +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
  }
  
  static const TypeInfo s390_virtio_scsi = {