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

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 <mst@redhat.com>
# gpg: Signature made Wed 17 May 2017 10:42:06 PM BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* mst/tags/for_upstream:
  exec: abstract address_space_do_translate()
  pci: deassert intx when pci device unrealize
  virtio: allow broken device to notify guest
  Revert "hw/pci: disable pci-bridge's shpc by default"
  acpi-defs: clean up open brace usage
  ACPI: don't call acpi_pcihp_device_plug_cb on xen
  iommu: Don't crash if machine is not PC_MACHINE
  pc: add 2.10 machine type
  pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot
  libvhost-user: fix crash when rings aren't ready
  hw/virtio: fix vhost user fails to startup when MQ
  hw/arm/virt: generate 64-bit addressable ACPI objects
  hw/acpi-defs: replace leading X with x_ in FADT field names

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --cc exec.c
Simple merge

diff --cc hw/acpi/aml-build.c
Simple merge

diff --cc hw/acpi/piix4.c
Simple merge

diff --cc hw/arm/virt-acpi-build.c
Simple merge

diff --cc hw/i386/acpi-build.c
Simple merge

diff --cc hw/i386/amd_iommu.c
Simple merge

diff --cc hw/i386/intel_iommu.c
Simple merge

diff --cc hw/i386/pc.c
index 95a5537a2ca9845849ab1747106bde49e7d5059a,8063241140f8483cabfa8f58984131b541c7a275..816bfa872ce3de10ccb38fa0410ffdf3c60acfec
--- 1/hw/i386/pc.c
--- 2/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@@ -2351,8 -2319,9 +2349,9 @@@ static void pc_machine_class_init(Objec
       * to be used at the moment, 32K should be enough for a while.  */
      pcmc->acpi_data_size = 0x20000 + 0x8000;
      pcmc->save_tsc_khz = true;
+     pcmc->linuxboot_dma_enabled = true;
      mc->get_hotplug_handler = pc_get_hotpug_handler;
 -    mc->cpu_index_to_socket_id = pc_cpu_index_to_socket_id;
 +    mc->cpu_index_to_instance_props = pc_cpu_index_to_props;
      mc->possible_cpu_arch_ids = pc_possible_cpu_arch_ids;
      mc->has_hotpluggable_cpus = true;
      mc->default_boot_order = "cad";

diff --cc hw/i386/pc_piix.c
index d468b963fbc3726f3969ee27069f0a1618d5c18f,8f3d85ca58da73afcd5f1740cdd6a88e5562415f..2234bd046171d6f229c93497afabe8233b34e6b8
--- 1/hw/i386/pc_piix.c
--- 2/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@@ -443,9 -442,19 +443,20 @@@ static void pc_i440fx_2_10_machine_opti
      pc_i440fx_machine_options(m);
      m->alias = "pc";
      m->is_default = 1;
 +    m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
  }
  
+ DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
+                       pc_i440fx_2_10_machine_options);
+ 
+ static void pc_i440fx_2_9_machine_options(MachineClass *m)
+ {
+     pc_i440fx_2_10_machine_options(m);
+     m->is_default = 0;
+     m->alias = NULL;
+     SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
+ }
+ 
  DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
                        pc_i440fx_2_9_machine_options);
  

diff --cc hw/i386/pc_q35.c
index 66303a78cff85245084eeae1a55ac2be81d6b915,cf9a788ec7578576681ddf1ef4b492a4dd71c6fb..f243203844cbd65798d0dc073b0ed4450718ac40
--- 1/hw/i386/pc_q35.c
--- 2/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@@ -306,9 -305,18 +306,19 @@@ static void pc_q35_2_10_machine_options
  {
      pc_q35_machine_options(m);
      m->alias = "q35";
 +    m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
  }
  
+ DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
+                    pc_q35_2_10_machine_options);
+ 
+ static void pc_q35_2_9_machine_options(MachineClass *m)
+ {
+     pc_q35_2_10_machine_options(m);
+     m->alias = NULL;
+     SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
+ }
+ 
  DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
                     pc_q35_2_9_machine_options);
  

diff --cc include/hw/acpi/aml-build.h
Simple merge

diff --cc tests/bios-tables-test.c
Simple merge