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

virtio, pci, pc: fixes, features

Bugfixes all over the place.
HMAT support.
New flags for vhost-user-blk utility.
Auto-tuning of seg max for virtio storage.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 06 Jan 2020 17:05:05 GMT
# 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: (32 commits)
  intel_iommu: add present bit check for pasid table entries
  intel_iommu: a fix to vtd_find_as_from_bus_num()
  virtio-net: delete also control queue when TX/RX deleted
  virtio: reset region cache when on queue deletion
  virtio-mmio: update queue size on guest write
  tests: add virtio-scsi and virtio-blk seg_max_adjust test
  virtio: make seg_max virtqueue size dependent
  hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35
  vhost-user-scsi: reset the device if supported
  vhost-user: add VHOST_USER_RESET_DEVICE to reset devices
  hw/pci/pci_host: Let pci_data_[read/write] use unsigned 'size' argument
  hw/pci/pci_host: Remove redundant PCI_DPRINTF()
  virtio-mmio: Clear v2 transport state on soft reset
  ACPI: add expected files for HMAT tests (acpihmat)
  tests/bios-tables-test: add test cases for ACPI HMAT
  tests/numa: Add case for QMP build HMAT
  hmat acpi: Build Memory Side Cache Information Structure(s)
  hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s)
  hmat acpi: Build Memory Proximity Domain Attributes Structure(s)
  numa: Extend CLI to provide memory side cache information
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc hw/core/machine.c
index 73bf1f8,ec2e3fc..4f30fb5
--- 1/hw/core/machine.c
--- 2/hw/core/machine.c
+++ b/hw/core/machine.c
@@@ -843,8 -873,15 +873,15 @@@ static void machine_initfn(Object *obj
                                          NULL);
      }
  
 -    if (mc->numa_mem_supported) {
 +    if (mc->cpu_index_to_instance_props && mc->get_default_cpu_node_id) {
          ms->numa_state = g_new0(NumaState, 1);
+         object_property_add_bool(obj, "hmat",
+                                  machine_get_hmat, machine_set_hmat,
+                                  &error_abort);
+         object_property_set_description(obj, "hmat",
+                                         "Set on/off to enable/disable "
+                                         "ACPI Heterogeneous Memory Attribute "
+                                         "Table (HMAT)", NULL);
      }
  
      /* Register notifier when init is done for sysbus sanity checks */

diff --cc hw/core/numa.c
Simple merge

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