This includes the previous pull request which still does not appear to be in - not rebased so merging twice will not cause conflicts. Note that patch 08 makes checkpatch complain, patch 9 fixes that.
The following changes since commit 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb: Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging (2017-05-09 15:49:14 -0400) 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 a764040cc831cfe5b8bf1c80e8341b9bf2de3ce8: exec: abstract address_space_do_translate() (2017-05-18 00:35:15 +0300) ---------------------------------------------------------------- pci, virtio, vhost: fixes A bunch of fixes that missed the release. Most notably we are reverting shpc back to enabled by default state as guests uses that as an indicator that hotplug is supported (even though it's unused). Unfortunately we can't fix this on the stable branch since that would break migration. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> ---------------------------------------------------------------- Ard Biesheuvel (2): hw/acpi-defs: replace leading X with x_ in FADT field names hw/arm/virt: generate 64-bit addressable ACPI objects Bruce Rogers (1): ACPI: don't call acpi_pcihp_device_plug_cb on xen Eduardo Habkost (1): iommu: Don't crash if machine is not PC_MACHINE Greg Kurz (1): virtio: allow broken device to notify guest Herongguang (Stephen) (1): pci: deassert intx when pci device unrealize Igor Mammedov (1): pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot Marc-André Lureau (1): libvhost-user: fix crash when rings aren't ready Marcel Apfelbaum (1): Revert "hw/pci: disable pci-bridge's shpc by default" Michael S. Tsirkin (1): acpi-defs: clean up open brace usage Peter Xu (2): pc: add 2.10 machine type exec: abstract address_space_do_translate() Zhiyong Yang (1): hw/virtio: fix vhost user fails to startup when MQ contrib/libvhost-user/libvhost-user.h | 6 +- include/hw/acpi/acpi-defs.h | 45 +++++++-------- include/hw/acpi/aml-build.h | 3 + include/hw/compat.h | 6 +- include/hw/i386/pc.h | 10 ++-- contrib/libvhost-user/libvhost-user.c | 26 +++++++-- exec.c | 103 +++++++++++++++++++++++----------- hw/acpi/aml-build.c | 27 +++++++++ hw/acpi/piix4.c | 11 +++- hw/arm/virt-acpi-build.c | 26 ++++----- hw/i386/acpi-build.c | 4 +- hw/i386/amd_iommu.c | 15 ++++- hw/i386/intel_iommu.c | 14 ++++- hw/i386/pc.c | 9 ++- hw/i386/pc_piix.c | 16 +++++- hw/i386/pc_q35.c | 14 ++++- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci/pci.c | 1 + hw/virtio/vhost-user.c | 21 ++++--- hw/virtio/virtio.c | 4 +- tests/bios-tables-test.c | 4 +- 21 files changed, 253 insertions(+), 114 deletions(-)