aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiahui Cen <cenjiahui@huawei.com>2021-01-14 18:06:42 +0800
committerMichael S. Tsirkin <mst@redhat.com>2021-01-17 06:42:54 -0500
commitf698a88a7723e6ebae736a7f458b4cd1e9582d83 (patch)
tree643fec3b4377d580785f40a90950ffd96fc904c1
parentcc9346e4a9794a8db79a90119f64cdc87cf3e4bc (diff)
downloadqemu-f698a88a7723e6ebae736a7f458b4cd1e9582d83.zip
qemu-f698a88a7723e6ebae736a7f458b4cd1e9582d83.tar.gz
qemu-f698a88a7723e6ebae736a7f458b4cd1e9582d83.tar.bz2
acpi: Enable pxb unit-test for ARM virt machine
No matter whether the pxb is enabled or not, the CONFIG_PXB macro in test would keep undefined. And since pxb is now enabled for ARM Virt machine by default, let's enable pxb unit-test by removing the CONFIG_PXB. Acked-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Jiahui Cen <cenjiahui@huawei.com> Message-Id: <20210114100643.10617-8-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--tests/qtest/bios-tables-test.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 4e026f9..669202f 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);