Re: [PATCH v2 04/12] qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them

[Igor Mammedov <imammedo@redhat.com>]

On Fri, 24 May 2024 11:44:03 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> Existing AARCH64 virt test functions do not have AARCH64 in their name.
> To add RISC-V virt related test cases, better to rename existing
> functions to indicate they are ARM only.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/qtest/bios-tables-test.c | 35 ++++++++++++++++++----------------
>  1 file changed, 19 insertions(+), 16 deletions(-)
> 
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index d1ff4db7a2..c4a4d1c7bf 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1570,7 +1570,7 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
>      test_acpi_tcg_dimm_pxm(MACHINE_PC);
>  }
>  
> -static void test_acpi_virt_tcg_memhp(void)
> +static void test_acpi_aarch64_virt_tcg_memhp(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1663,7 +1663,7 @@ static void test_acpi_microvm_ioapic2_tcg(void)
>      free_test_data(&data);
>  }
>  
> -static void test_acpi_virt_tcg_numamem(void)
> +static void test_acpi_aarch64_virt_tcg_numamem(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1685,7 +1685,7 @@ static void test_acpi_virt_tcg_numamem(void)
>  
>  }
>  
> -static void test_acpi_virt_tcg_pxb(void)
> +static void test_acpi_aarch64_virt_tcg_pxb(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1758,7 +1758,7 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)
>      test_acpi_tcg_acpi_hmat(MACHINE_PC);
>  }
>  
> -static void test_acpi_virt_tcg_acpi_hmat(void)
> +static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1914,7 +1914,7 @@ static void test_acpi_microvm_acpi_erst(void)
>  }
>  #endif /* CONFIG_POSIX */
>  
> -static void test_acpi_virt_tcg(void)
> +static void test_acpi_aarch64_virt_tcg(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1933,7 +1933,7 @@ static void test_acpi_virt_tcg(void)
>      free_test_data(&data);
>  }
>  
> -static void test_acpi_virt_tcg_topology(void)
> +static void test_acpi_aarch64_virt_tcg_topology(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -2016,7 +2016,7 @@ static void test_acpi_q35_cxl(void)
>  }
>  #endif /* CONFIG_POSIX */
>  
> -static void test_acpi_virt_viot(void)
> +static void test_acpi_aarch64_virt_viot(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -2192,7 +2192,7 @@ static void test_acpi_microvm_oem_fields(void)
>      g_free(args);
>  }
>  
> -static void test_acpi_virt_oem_fields(void)
> +static void test_acpi_aarch64_virt_oem_fields(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -2364,16 +2364,19 @@ int main(int argc, char *argv[])
>          }
>      } else if (strcmp(arch, "aarch64") == 0) {
>          if (has_tcg && qtest_has_device("virtio-blk-pci")) {
> -            qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> +            qtest_add_func("acpi/virt", test_acpi_aarch64_virt_tcg);
>              qtest_add_func("acpi/virt/acpihmatvirt",
> -                            test_acpi_virt_tcg_acpi_hmat);
> -            qtest_add_func("acpi/virt/topology", test_acpi_virt_tcg_topology);
> -            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_virt_oem_fields);
> +                           test_acpi_aarch64_virt_tcg_acpi_hmat);
> +            qtest_add_func("acpi/virt/topology",
> +                           test_acpi_aarch64_virt_tcg_topology);
> +            qtest_add_func("acpi/virt/numamem",
> +                           test_acpi_aarch64_virt_tcg_numamem);
> +            qtest_add_func("acpi/virt/memhp", test_acpi_aarch64_virt_tcg_memhp);
> +            qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb);
> +            qtest_add_func("acpi/virt/oem-fields",
> +                           test_acpi_aarch64_virt_oem_fields);
>              if (qtest_has_device("virtio-iommu-pci")) {
> -                qtest_add_func("acpi/virt/viot", test_acpi_virt_viot);
> +                qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot);
>              }
>          }
>      }