103 lines
3.9 KiB
Diff
103 lines
3.9 KiB
Diff
|
From 2a9e30e5cd8d838a367175a0c1bad0e79764063f Mon Sep 17 00:00:00 2001
|
||
|
|
From: liujing <liujing_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 18 Sep 2024 15:09:30 +0800
|
||
|
|
Subject: [PATCH] bios-tables-test: Make oem-fields tests be consistent
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Every other test function is named:
|
||
|
|
|
||
|
|
test_acpi_<machine>_<test>()
|
||
|
|
|
||
|
|
Just make this test the same. Once there, rename "acpi/oem-fields" to
|
||
|
|
"acpi/piix4/oem-fields" so it is consistent with everything else.
|
||
|
|
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
Message-Id: <20220902173452.1904-2-quintela@redhat.com>
|
||
|
|
Reviewed-by: Ani Sinha <ani@anisinha.ca>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
tests/qtest/bios-tables-test.c | 16 ++++++++--------
|
||
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
|
||
|
|
index ff8f13199d..0b89cae577 100644
|
||
|
|
--- a/tests/qtest/bios-tables-test.c
|
||
|
|
+++ b/tests/qtest/bios-tables-test.c
|
||
|
|
@@ -1501,7 +1501,7 @@ static void test_oem_fields(test_data *data)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void test_acpi_oem_fields_pc(void)
|
||
|
|
+static void test_acpi_piix4_oem_fields(void)
|
||
|
|
{
|
||
|
|
test_data data;
|
||
|
|
char *args;
|
||
|
|
@@ -1521,7 +1521,7 @@ static void test_acpi_oem_fields_pc(void)
|
||
|
|
g_free(args);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void test_acpi_oem_fields_q35(void)
|
||
|
|
+static void test_acpi_q35_oem_fields(void)
|
||
|
|
{
|
||
|
|
test_data data;
|
||
|
|
char *args;
|
||
|
|
@@ -1541,7 +1541,7 @@ static void test_acpi_oem_fields_q35(void)
|
||
|
|
g_free(args);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void test_acpi_oem_fields_microvm(void)
|
||
|
|
+static void test_acpi_microvm_oem_fields(void)
|
||
|
|
{
|
||
|
|
test_data data;
|
||
|
|
char *args;
|
||
|
|
@@ -1558,7 +1558,7 @@ static void test_acpi_oem_fields_microvm(void)
|
||
|
|
g_free(args);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void test_acpi_oem_fields_virt(void)
|
||
|
|
+static void test_acpi_virt_oem_fields(void)
|
||
|
|
{
|
||
|
|
test_data data = {
|
||
|
|
.machine = "virt",
|
||
|
|
@@ -1596,13 +1596,13 @@ int main(int argc, char *argv[])
|
||
|
|
if (ret) {
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
- qtest_add_func("acpi/q35/oem-fields", test_acpi_oem_fields_q35);
|
||
|
|
+ qtest_add_func("acpi/q35/oem-fields", test_acpi_q35_oem_fields);
|
||
|
|
if (tpm_model_is_available("-machine q35", "tpm-tis")) {
|
||
|
|
qtest_add_func("acpi/q35/tpm2-tis", test_acpi_q35_tcg_tpm2_tis);
|
||
|
|
qtest_add_func("acpi/q35/tpm12-tis", test_acpi_q35_tcg_tpm12_tis);
|
||
|
|
}
|
||
|
|
qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
|
||
|
|
- qtest_add_func("acpi/oem-fields", test_acpi_oem_fields_pc);
|
||
|
|
+ qtest_add_func("acpi/piix4/oem-fields", test_acpi_piix4_oem_fields);
|
||
|
|
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
|
||
|
|
qtest_add_func("acpi/piix4/pci-hotplug/no_root_hotplug",
|
||
|
|
test_acpi_piix4_no_root_hotplug);
|
||
|
|
@@ -1642,7 +1642,7 @@ int main(int argc, char *argv[])
|
||
|
|
qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg);
|
||
|
|
qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg);
|
||
|
|
qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2_tcg);
|
||
|
|
- qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_fields_microvm);
|
||
|
|
+ qtest_add_func("acpi/microvm/oem-fields", test_acpi_microvm_oem_fields);
|
||
|
|
if (has_tcg) {
|
||
|
|
qtest_add_func("acpi/q35/ivrs", test_acpi_q35_tcg_ivrs);
|
||
|
|
if (strcmp(arch, "x86_64") == 0) {
|
||
|
|
@@ -1660,7 +1660,7 @@ int main(int argc, char *argv[])
|
||
|
|
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/pxb", test_acpi_virt_tcg_pxb);
|
||
|
|
- qtest_add_func("acpi/virt/oem-fields", test_acpi_oem_fields_virt);
|
||
|
|
+ qtest_add_func("acpi/virt/oem-fields", test_acpi_virt_oem_fields);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
ret = g_test_run();
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|