From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 3 Mar 2017 10:09:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: v2.9.0-rc0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a81b792cc498321671a93973a9d57e28438038c;p=thirdparty%2Fqemu.git

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

virtio, pc: fixes, features

virtio support for region caches broke a bunch of stuff - fixing most of
it though it's not ideal.  Still pondering the right way to fix it.
New: VM gen ID and hotplug for PXB.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 02 Mar 2017 06:19:17 GMT
# 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

* remotes/mst/tags/for_upstream:
  hw/pxb-pcie: fix PCI Express hotplug support
  tests/acpi: update DSDT after last patch
  acpi: simplify _OSC
  virtio: unbreak virtio-pci with IOMMU after caching ring translations
  virtio: add missing region cache init in virtio_load()
  virtio: invalidate memory in vring_set_avail_event()
  virtio: guard vring access when setting notification
  virtio: check for vring setup in virtio_queue_empty
  MAINTAINERS: Add VM Generation ID entries
  tests: Move reusable ACPI code into a utility file
  qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands
  ACPI: Add Virtual Machine Generation ID support
  ACPI: Add vmgenid blob storage to the build tables
  docs: VM Generation ID device description
  linker-loader: Add new 'write pointer' command

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

9a81b792cc498321671a93973a9d57e28438038c
diff --cc tests/bios-tables-test.c
index d54018da73e,423a6f53c2d..88dbf978535
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@@ -144,39 -72,12 +72,12 @@@ static void free_test_data(test_data *d
          g_free(temp->asl_file);
      }
  
 -    g_array_free(data->tables, false);
 +    g_array_free(data->tables, true);
  }
  
- static uint8_t acpi_checksum(const uint8_t *data, int len)
- {
-     int i;
-     uint8_t sum = 0;
- 
-     for (i = 0; i < len; i++) {
-         sum += data[i];
-     }
- 
-     return sum;
- }
- 
  static void test_acpi_rsdp_address(test_data *data)
  {
-     uint32_t off;
- 
-     /* OK, now find RSDP */
-     for (off = 0xf0000; off < 0x100000; off += 0x10) {
-         uint8_t sig[] = "RSD PTR ";
-         int i;
- 
-         for (i = 0; i < sizeof sig - 1; ++i) {
-             sig[i] = readb(off + i);
-         }
- 
-         if (!memcmp(sig, "RSD PTR ", sizeof sig)) {
-             break;
-         }
-     }
- 
+     uint32_t off = acpi_find_rsdp_address();
      g_assert_cmphex(off, <, 0x100000);
      data->rsdp_addr = off;
  }