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>
This commit is contained in:
parent
cc9346e4a9
commit
f698a88a77
|
@ -1196,7 +1196,6 @@ static void test_acpi_virt_tcg_numamem(void)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PXB
|
|
||||||
static void test_acpi_virt_tcg_pxb(void)
|
static void test_acpi_virt_tcg_pxb(void)
|
||||||
{
|
{
|
||||||
test_data data = {
|
test_data data = {
|
||||||
|
@ -1228,7 +1227,6 @@ static void test_acpi_virt_tcg_pxb(void)
|
||||||
|
|
||||||
free_test_data(&data);
|
free_test_data(&data);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
static void test_acpi_tcg_acpi_hmat(const char *machine)
|
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", test_acpi_virt_tcg);
|
||||||
qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
|
qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
|
||||||
qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp);
|
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);
|
qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
ret = g_test_run();
|
ret = g_test_run();
|
||||||
boot_sector_cleanup(disk);
|
boot_sector_cleanup(disk);
|
||||||
|
|
Loading…
Reference in a new issue