From: Peter Maydell Date: Mon, 4 May 2020 14:51:09 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5375af3cd7b8adcc10c18d8083b7be63976c9645;p=qemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio,acpi,pci,pc: backlog from pre-5.0 Mostly fixes, cleanups, but also new features for arm/virt and pc acpi. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Mon 04 May 2020 15:27:06 BST # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin " [full] # gpg: aka "Michael S. Tsirkin " [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: (29 commits) hw/i386: Make vmmouse helpers static hw/i386: Add 'vmport.h' local header hw/i386/vmport: Remove unused 'hw/input/i8042.h' include hw/i386/pc: Create 'vmport' device in place acpi: unit-test: Update WAET ACPI Table expected binaries acpi: Add Windows ACPI Emulated Device Table (WAET) acpi: unit-test: Ignore diff in WAET ACPI table Refactor vhost_user_set_mem_table functions tests/acpi: add expected tables for bios-tables-test bios-tables-test: test pc-dimm and nvdimm coldplug for arm/virt tests: Update ACPI tables list for upcoming arm/virt test changes hw/arm/virt: Add nvdimm hotplug support hw/arm/virt: Add nvdimm hot-plug infrastructure nvdimm: Use configurable ACPI IO base and size hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length acpi: DSDT without _STA checkpatch: ignore allowed diff list checkpatch: fix acpi check with multiple file name vhost-user-blk: fix invalid memory access virtio-pci: update virtio pci bar layout documentation ... Signed-off-by: Peter Maydell --- 5375af3cd7b8adcc10c18d8083b7be63976c9645