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

virtio,acpi: features, fixes, cleanups.

vdpa support
virtio-mem support
a handy script for disassembling acpi tables
misc fixes and cleanups

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 07 Jul 2020 13:00:35 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# 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

* remotes/mst/tags/for_upstream: (41 commits)
  vhost-vdpa: introduce vhost-vdpa net client
  vhost-vdpa: introduce vhost-vdpa backend
  vhost_net: introduce set_config & get_config
  vhost: implement vhost_force_iommu method
  vhost: introduce new VhostOps vhost_force_iommu
  vhost: implement vhost_vq_get_addr method
  vhost: introduce new VhostOps vhost_vq_get_addr
  vhost: implement vhost_dev_start method
  vhost: introduce new VhostOps vhost_dev_start
  vhost: check the existence of vhost_set_iotlb_callback
  virtio-pci: implement queue_enabled method
  virtio-bus: introduce queue_enabled method
  vhost_net: use the function qemu_get_peer
  net: introduce qemu_get_peer
  MAINTAINERS: add VT-d entry
  docs: vhost-user: add Virtio status protocol feature
  tests/acpi: remove stale allowed tables
  numa: Auto-enable NUMA when any memory devices are possible
  virtio-mem: Exclude unplugged memory during migration
  virtio-mem: Add trace events
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	hw/arm/virt.c
#	hw/virtio/trace-events

diff --cc MAINTAINERS
Simple merge

diff --cc configure
Simple merge

diff --cc hw/arm/virt.c
index c78972fb79715da9021a9d20273c72f37cd23d34,f97be80a86523cfb93d67a611f59532083b45fe0..7d9f7157da212f11b5348e33d73d8ec40c3e6cde
--- 1/hw/arm/virt.c
--- 2/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@@ -2515,7 -2486,7 +2516,8 @@@ static void virt_machine_5_0_options(Ma
      virt_machine_5_1_options(mc);
      compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);
      mc->numa_mem_supported = true;
 +    vmc->acpi_expose_flash = true;
+     mc->auto_enable_numa_with_memdev = false;
  }
  DEFINE_VIRT_MACHINE(5, 0)
  

diff --cc hw/net/virtio-net.c
Simple merge

diff --cc hw/virtio/trace-events
index 23109f69bbfbc5d90a6e36622ab88d352da4a54e,292fc15e29cc46fdfb7f962c7365a00919337fd1..045e89cae69ad21a653206a3de74fc61375caee0
--- 1/hw/virtio/trace-events
--- 2/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@@ -74,4 -74,13 +74,14 @@@ virtio_iommu_get_domain(uint32_t domain
  virtio_iommu_put_domain(uint32_t domain_id) "Free domain=%d"
  virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d"
  virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64
 +virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start, uint64_t end) "dev= %d, type=%d start=0x%"PRIx64" end=0x%"PRIx64
+ 
+ # virtio-mem.c
+ virtio_mem_send_response(uint16_t type) "type=%" PRIu16
+ virtio_mem_plug_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16
+ virtio_mem_unplug_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16
+ virtio_mem_unplugged_all(void) ""
+ virtio_mem_unplug_all_request(void) ""
+ virtio_mem_resized_usable_region(uint64_t old_size, uint64_t new_size) "old_size=0x%" PRIx64 "new_size=0x%" PRIx64
+ virtio_mem_state_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16
+ virtio_mem_state_response(uint16_t state) "state=%" PRIu16

diff --cc include/exec/memory.h
Simple merge

diff --cc migration/postcopy-ram.c
Simple merge

diff --cc migration/rdma.c
Simple merge