Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, virtio: fixes A couple of last minute fixes. Signed-off-by:Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Fri 03 Aug 2018 09:35:54 BST # gpg: using RSA key 281F0DB8D28D5469 # 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: tests/acpi: update tables after memory hotplug changes pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size tests/acpi-test: update ACPI tables test blobs hw/acpi-build: Add a check for memory-less NUMA nodes vhost: check region type before casting Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- hw/i386/acpi-build.c 16 additions, 12 deletionshw/i386/acpi-build.c
- hw/virtio/vhost.c 3 additions, 1 deletionhw/virtio/vhost.c
- tests/acpi-test-data/pc/SRAT.dimmpxm 0 additions, 0 deletionstests/acpi-test-data/pc/SRAT.dimmpxm
- tests/acpi-test-data/pc/SRAT.memhp 0 additions, 0 deletionstests/acpi-test-data/pc/SRAT.memhp
- tests/acpi-test-data/pc/SRAT.numamem 0 additions, 0 deletionstests/acpi-test-data/pc/SRAT.numamem
- tests/acpi-test-data/q35/SRAT.dimmpxm 0 additions, 0 deletionstests/acpi-test-data/q35/SRAT.dimmpxm
- tests/acpi-test-data/q35/SRAT.memhp 0 additions, 0 deletionstests/acpi-test-data/q35/SRAT.memhp
- tests/acpi-test-data/q35/SRAT.numamem 0 additions, 0 deletionstests/acpi-test-data/q35/SRAT.numamem
Loading
Please register or sign in to comment