diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-10-17 15:30:44 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-17 15:30:44 +0100 |
commit | 39b68bc4f1089cc5c5f6140d85017b44e2f0fe11 (patch) | |
tree | 2806e34d2d5e22c51f0ed48c3ba4ac6c9e4febe8 /tests/data | |
parent | 6bda415c10d966c8d3ed450bc35f47f684004a0d (diff) | |
parent | 9d59bed1da5e5815987879346cf708344060ea63 (diff) |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, vhost, acpi: features, fixes, tests
ARM ACPI memory hotplug support +
tests for new arm/virt ACPI tables.
Virtio fs support (no migration).
A vhost-user reconnect bugfix.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 15 Oct 2019 22:02:19 BST
# gpg: using RSA key 281F0DB8D28D5469
# 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:
virtio: add vhost-user-fs-pci device
virtio: add vhost-user-fs base device
virtio: Add virtio_fs linux headers
tests/acpi: add expected tables for arm/virt
tests: document how to update acpi tables
tests: Add bios tests to arm/virt
tests: allow empty expected files
tests/acpi: add empty files
tests: Update ACPI tables list for upcoming arm/virt tests
docs/specs: Add ACPI GED documentation
hw/arm: Use GED for system_powerdown event
hw/arm: Factor out powerdown notifier from GPIO
hw/arm/virt-acpi-build: Add PC-DIMM in SRAT
hw/arm/virt: Enable device memory cold/hot plug with ACPI boot
hw/arm/virt: Add memory hotplug framework
hw/acpi: Add ACPI Generic Event Device Support
hw/acpi: Do not create memory hotplug method when handler is not defined
hw/acpi: Make ACPI IO address space configurable
vhost-user: save features if the char dev is closed
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/data')
-rw-r--r-- | tests/data/acpi/virt/APIC.memhp | bin | 0 -> 168 bytes |
-rw-r--r-- | tests/data/acpi/virt/APIC.numamem | bin | 0 -> 168 bytes |
-rw-r--r-- | tests/data/acpi/virt/DSDT | bin | 18476 -> 18470 bytes |
-rw-r--r-- | tests/data/acpi/virt/DSDT.memhp | bin | 0 -> 19807 bytes |
-rw-r--r-- | tests/data/acpi/virt/DSDT.numamem | bin | 0 -> 18470 bytes |
-rw-r--r-- | tests/data/acpi/virt/FACP.memhp | bin | 0 -> 268 bytes |
-rw-r--r-- | tests/data/acpi/virt/FACP.numamem | bin | 0 -> 268 bytes |
-rw-r--r-- | tests/data/acpi/virt/GTDT.memhp | bin | 0 -> 96 bytes |
-rw-r--r-- | tests/data/acpi/virt/GTDT.numamem | bin | 0 -> 96 bytes |
-rw-r--r-- | tests/data/acpi/virt/MCFG.memhp | bin | 0 -> 60 bytes |
-rw-r--r-- | tests/data/acpi/virt/MCFG.numamem | bin | 0 -> 60 bytes |
-rw-r--r-- | tests/data/acpi/virt/SLIT.memhp | bin | 0 -> 48 bytes |
-rw-r--r-- | tests/data/acpi/virt/SPCR.memhp | bin | 0 -> 80 bytes |
-rw-r--r-- | tests/data/acpi/virt/SPCR.numamem | bin | 0 -> 80 bytes |
-rw-r--r-- | tests/data/acpi/virt/SRAT.memhp | bin | 0 -> 186 bytes |
-rw-r--r-- | tests/data/acpi/virt/SRAT.numamem | bin | 0 -> 106 bytes |
16 files changed, 0 insertions, 0 deletions
diff --git a/tests/data/acpi/virt/APIC.memhp b/tests/data/acpi/virt/APIC.memhp Binary files differnew file mode 100644 index 0000000000..797dfde284 --- /dev/null +++ b/tests/data/acpi/virt/APIC.memhp diff --git a/tests/data/acpi/virt/APIC.numamem b/tests/data/acpi/virt/APIC.numamem Binary files differnew file mode 100644 index 0000000000..797dfde284 --- /dev/null +++ b/tests/data/acpi/virt/APIC.numamem diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT Binary files differindex 20e85c7f89..bce76e3d23 100644 --- a/tests/data/acpi/virt/DSDT +++ b/tests/data/acpi/virt/DSDT diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/DSDT.memhp Binary files differnew file mode 100644 index 0000000000..b4b153fcdc --- /dev/null +++ b/tests/data/acpi/virt/DSDT.memhp diff --git a/tests/data/acpi/virt/DSDT.numamem b/tests/data/acpi/virt/DSDT.numamem Binary files differnew file mode 100644 index 0000000000..bce76e3d23 --- /dev/null +++ b/tests/data/acpi/virt/DSDT.numamem diff --git a/tests/data/acpi/virt/FACP.memhp b/tests/data/acpi/virt/FACP.memhp Binary files differnew file mode 100644 index 0000000000..27de99f51b --- /dev/null +++ b/tests/data/acpi/virt/FACP.memhp diff --git a/tests/data/acpi/virt/FACP.numamem b/tests/data/acpi/virt/FACP.numamem Binary files differnew file mode 100644 index 0000000000..27de99f51b --- /dev/null +++ b/tests/data/acpi/virt/FACP.numamem diff --git a/tests/data/acpi/virt/GTDT.memhp b/tests/data/acpi/virt/GTDT.memhp Binary files differnew file mode 100644 index 0000000000..10107a65e9 --- /dev/null +++ b/tests/data/acpi/virt/GTDT.memhp diff --git a/tests/data/acpi/virt/GTDT.numamem b/tests/data/acpi/virt/GTDT.numamem Binary files differnew file mode 100644 index 0000000000..10107a65e9 --- /dev/null +++ b/tests/data/acpi/virt/GTDT.numamem diff --git a/tests/data/acpi/virt/MCFG.memhp b/tests/data/acpi/virt/MCFG.memhp Binary files differnew file mode 100644 index 0000000000..e8987e1af0 --- /dev/null +++ b/tests/data/acpi/virt/MCFG.memhp diff --git a/tests/data/acpi/virt/MCFG.numamem b/tests/data/acpi/virt/MCFG.numamem Binary files differnew file mode 100644 index 0000000000..e8987e1af0 --- /dev/null +++ b/tests/data/acpi/virt/MCFG.numamem diff --git a/tests/data/acpi/virt/SLIT.memhp b/tests/data/acpi/virt/SLIT.memhp Binary files differnew file mode 100644 index 0000000000..74ec3b4b46 --- /dev/null +++ b/tests/data/acpi/virt/SLIT.memhp diff --git a/tests/data/acpi/virt/SPCR.memhp b/tests/data/acpi/virt/SPCR.memhp Binary files differnew file mode 100644 index 0000000000..377271a0e7 --- /dev/null +++ b/tests/data/acpi/virt/SPCR.memhp diff --git a/tests/data/acpi/virt/SPCR.numamem b/tests/data/acpi/virt/SPCR.numamem Binary files differnew file mode 100644 index 0000000000..377271a0e7 --- /dev/null +++ b/tests/data/acpi/virt/SPCR.numamem diff --git a/tests/data/acpi/virt/SRAT.memhp b/tests/data/acpi/virt/SRAT.memhp Binary files differnew file mode 100644 index 0000000000..1b57db2072 --- /dev/null +++ b/tests/data/acpi/virt/SRAT.memhp diff --git a/tests/data/acpi/virt/SRAT.numamem b/tests/data/acpi/virt/SRAT.numamem Binary files differnew file mode 100644 index 0000000000..9526e5a28e --- /dev/null +++ b/tests/data/acpi/virt/SRAT.numamem |