Re: [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase

[Laszlo Ersek]

On 05/02/19 16:27, Igor Mammedov wrote:
> On Fri, 26 Apr 2019 19:11:50 +0200
> Laszlo Ersek <address@hidden> wrote:
> 
>> On 04/25/19 07:34, Igor Mammedov wrote:
>>> adds simple arm/virt test case that starts guest with
>>> bios-tables-test.aarch64.iso.qcow2 boot image which
>>> initializes UefiTestSupport* structure in RAM once
>>> guest is booted.
>>>
>>>  * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper
>>>
>>> Signed-off-by: Igor Mammedov <address@hidden>
>>> Reviewed-by: Laszlo Ersek <address@hidden>
>>> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
>>> ---
>>> v3:
>>>   * use firmware blobs directly from pc-bios directory
>>>   * use bios-tables-test.aarch64.iso.qcow2 as test boot image
>>>   * drop leftover qtest-uefi-images-aarch64 iMakefile rule from
>>>     previos version (Laszlo)
>>>   * add Makefile rule to include bios-tables-test into
>>>     check-qtest-aarch64 target
>>> v2:
>>>   * specify in test_data where board's RAM starts and RAM size
>>> ---
>>>  tests/Makefile.include   |  1 +
>>>  tests/bios-tables-test.c | 17 +++++++++++++++++
>>>  2 files changed, 18 insertions(+)
>>>
>>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>>> index e2432d5..983c8b1 100644
>>> --- a/tests/Makefile.include
>>> +++ b/tests/Makefile.include
>>> @@ -267,6 +267,7 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
>>>  check-qtest-aarch64-y = tests/numa-test$(EXESUF)
>>>  check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
>>>  check-qtest-aarch64-y += tests/migration-test$(EXESUF)
>>> +check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
>>>  
>>>  check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
>>>  
>>> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
>>> index 1be55a1..f117461 100644
>>> --- a/tests/bios-tables-test.c
>>> +++ b/tests/bios-tables-test.c
>>> @@ -812,6 +812,21 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
>>>      test_acpi_tcg_dimm_pxm(MACHINE_PC);
>>>  }
>>>  
>>> +static void test_acpi_virt_tcg(void)
>>> +{
>>> +    test_data data = {
>>> +        .machine = "virt",
>>> +        .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>>> +        .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>>> +        .cd = 
>>> "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
>>> +        .ram_start = 0x40000000ULL,
>>> +        .scan_len = 128ULL * 1024 * 1024,
>>> +    };
>>> +
>>> +    test_acpi_one("-cpu cortex-a57 ", &data);
>>> +    free_test_data(&data);
>>> +}
>>> +
>>>  int main(int argc, char *argv[])
>>>  {
>>>      const char *arch = qtest_get_arch();
>>> @@ -840,6 +855,8 @@ int main(int argc, char *argv[])
>>>          qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
>>>          qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm);
>>>          qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
>>> +    } else if (strcmp(arch, "aarch64") == 0) {
>>> +        qtest_add_func("acpi/virt", test_acpi_virt_tcg);
>>>      }
>>>      ret = g_test_run();
>>>      boot_sector_cleanup(disk);
>>>
>>
>> Looks good, my R-b stands.
>>
>> (Please let me know if you want me to look at other patches in the
>> series... struggling again with email bankruptcy...)
>>
>> Thanks!
>> Laszlo
>>
> 
> on respin there will be a new patch added
> 
>   [PATCH v4 11/15] tests: acpi: allow to override default accelerator
> 
> and change to this patch will be forcing TCG accelerator:
> 
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 6cb8b16..385e1ab 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -817,7 +817,6 @@ static void test_acpi_virt_tcg(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .accel = "tcg",
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
>          .cd = 
> "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
> 

You can keep my R-b with that update.

Thanks!
Laszlo