The following changes since commit 0d81cdddaa40a1988b24657aeac19959cfad0fde:
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging (2015-04-27 17:28:41 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to bc1f7c4c915a7c727741c4d27a2795e1039eacd3: acpi: update expected files for memory unplug (2015-05-11 09:21:37 +0200) ---------------------------------------------------------------- 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 <m...@redhat.com> ---------------------------------------------------------------- Gal Hammer (1): acpi: add a missing backslash to the \_SB scope. Jason Wang (10): virtio-net: fix the upper bound when trying to delete queues pc: add 2.4 machine types spapr: add machine type specific instance init function ppc: spapr: add 2.4 machine type monitor: replace the magic number 255 with MAX_QUEUE_NUM monitor: check return value of qemu_find_net_clients_except() virtio-ccw: using VIRTIO_NO_VECTOR instead of 0 for invalid virtqueue virtio: introduce vector to virtqueues mapping virtio-pci: speedup MSI-X masking and unmasking pci: remove hard-coded bar size in msix_init_exclusive_bar() Luke Gorrie (1): vhost-user: Send VHOST_RESET_OWNER on vhost stop Michael S. Tsirkin (3): acpi-build: close } in comment virtio: coding style tweak acpi: update expected files for memory unplug Shannon Zhao (4): hw/i386: Move ACPI header definitions in an arch-independent location hw/i386/acpi-build: move generic acpi building helpers into dedictated file virtio-net: Move DEFINE_VIRTIO_NET_FEATURES to virtio-net virtio-scsi: Move DEFINE_VIRTIO_SCSI_FEATURES to virtio-scsi Tang Chen (3): acpi, mem-hotplug: add acpi_memory_slot_status() to get MemStatus acpi, mem-hotplug: add unplug request cb for memory device acpi, mem-hotplug: add unplug cb for memory device Thomas Huth (1): pci: Merge pci_nic_init() into pci_nic_init_nofail() Zhu Guihua (5): docs: update documentation for memory hot unplug acpi: extend aml_field() to support UpdateRule acpi: fix "Memory device control fields" register acpi: add hardware implementation for memory hot unplug qmp-event: add event notification for memory hot unplug error qapi/event.json | 14 ++++ {hw/i386 => include/hw/acpi}/acpi-defs.h | 0 include/hw/acpi/aml-build.h | 41 +++++++++++- include/hw/acpi/memory_hotplug.h | 12 ++++ include/hw/acpi/pc-hotplug.h | 3 + include/hw/qdev-core.h | 1 + include/hw/virtio/virtio-bus.h | 1 + include/hw/virtio/virtio-net.h | 2 +- include/hw/virtio/virtio-scsi.h | 1 + include/hw/virtio/virtio.h | 3 + hw/acpi/aml-build.c | 62 +++++++++++++++++- hw/acpi/ich9.c | 19 ++++-- hw/acpi/memory_hotplug.c | 96 +++++++++++++++++++++++++-- hw/acpi/piix4.c | 17 ++++- hw/core/qdev.c | 2 +- hw/i386/acpi-build.c | 108 +++++++------------------------ hw/i386/pc.c | 62 ++++++++++++++++-- hw/i386/pc_piix.c | 29 +++++++-- hw/i386/pc_q35.c | 26 +++++++- hw/net/vhost_net.c | 7 ++ hw/net/virtio-net.c | 9 ++- hw/pci/msix.c | 30 +++++---- hw/pci/pci.c | 43 ++++-------- hw/ppc/spapr.c | 54 +++++++++++++++- hw/s390x/s390-virtio-bus.c | 3 - hw/s390x/virtio-ccw.c | 5 +- hw/scsi/virtio-scsi.c | 5 ++ hw/virtio/virtio-pci.c | 51 ++++++++------- hw/virtio/virtio.c | 36 ++++++++++- monitor.c | 25 +++---- tests/bios-tables-test.c | 2 +- docs/memory-hotplug.txt | 23 ++++++- docs/qmp/qmp-events.txt | 17 +++++ docs/specs/acpi_mem_hotplug.txt | 58 +++++++++++++++-- hw/i386/acpi-dsdt-mem-hotplug.dsl | 13 +++- tests/acpi-test-data/pc/DSDT | Bin 2970 -> 3028 bytes tests/acpi-test-data/pc/SSDT | Bin 2475 -> 2486 bytes tests/acpi-test-data/pc/SSDT.bridge | Bin 4334 -> 4345 bytes tests/acpi-test-data/q35/DSDT | Bin 7608 -> 7666 bytes tests/acpi-test-data/q35/SSDT | Bin 680 -> 691 bytes tests/acpi-test-data/q35/SSDT.bridge | Bin 697 -> 708 bytes trace-events | 4 ++ 42 files changed, 673 insertions(+), 211 deletions(-) rename {hw/i386 => include/hw/acpi}/acpi-defs.h (100%)