diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-17 17:04:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-17 17:04:40 +0000 |
| commit | e0cbcf1eea16e81f116560130a1b36da711fb102 (patch) | |
| tree | fffb3ad3fef1e9c66d45f1c6edd08214ba390b19 /tests | |
| parent | 825a215c003cd028e26c7d19aa5049d957345f43 (diff) | |
| parent | ccee1a8140211c569156ae649474cc520eb2a36b (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,pci,virtio: fixes, features
Fixes all over the place.
PXB support for ARM.
boot index for vhost-user-fs.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Sun 17 Jan 2021 11:44:55 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:
acpi: Update _DSM method in expected files
acpi: Enable pxb unit-test for ARM virt machine
Kconfig: Compile PXB for ARM_VIRT
acpi/gpex: Exclude pxb's resources from PCI0
acpi/gpex: Inform os to keep firmware resource map
acpi: Add addr offset in build_crs
acpi: Fix unmatched expected DSDT.pxb file
acpi: Allow DSDT acpi table changes
vhost-user-fs: add the "bootindex" property
pci/shpc: don't push attention button when ejecting powered-off device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/acpi/microvm/DSDT.pcie | bin | 3023 -> 3031 bytes | |||
| -rw-r--r-- | tests/data/acpi/virt/DSDT | bin | 5196 -> 5204 bytes | |||
| -rw-r--r-- | tests/data/acpi/virt/DSDT.memhp | bin | 6557 -> 6565 bytes | |||
| -rw-r--r-- | tests/data/acpi/virt/DSDT.numamem | bin | 5196 -> 5204 bytes | |||
| -rw-r--r-- | tests/data/acpi/virt/DSDT.pxb | bin | 7802 -> 7689 bytes | |||
| -rw-r--r-- | tests/qtest/bios-tables-test.c | 4 |
6 files changed, 0 insertions, 4 deletions
diff --git a/tests/data/acpi/microvm/DSDT.pcie b/tests/data/acpi/microvm/DSDT.pcie Binary files differindex 4b765541e3..e590b98f99 100644 --- a/tests/data/acpi/microvm/DSDT.pcie +++ b/tests/data/acpi/microvm/DSDT.pcie diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT Binary files differindex bc519abff9..ea8a0869af 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 differindex 54728e2b4b..897648637c 100644 --- a/tests/data/acpi/virt/DSDT.memhp +++ 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 differindex bc519abff9..ea8a0869af 100644 --- a/tests/data/acpi/virt/DSDT.numamem +++ b/tests/data/acpi/virt/DSDT.numamem diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb Binary files differindex d5f0533a02..ce3b67dff2 100644 --- a/tests/data/acpi/virt/DSDT.pxb +++ b/tests/data/acpi/virt/DSDT.pxb diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 4e026f90d0..669202fc95 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1196,7 +1196,6 @@ static void test_acpi_virt_tcg_numamem(void) } -#ifdef CONFIG_PXB static void test_acpi_virt_tcg_pxb(void) { test_data data = { @@ -1228,7 +1227,6 @@ static void test_acpi_virt_tcg_pxb(void) free_test_data(&data); } -#endif static void test_acpi_tcg_acpi_hmat(const char *machine) { @@ -1342,9 +1340,7 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt", test_acpi_virt_tcg); qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); -#ifdef CONFIG_PXB qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); -#endif } ret = g_test_run(); boot_sector_cleanup(disk); |