Re: [Qemu-devel] [PATCH v6] tests: pc: acpi: piix4: add sparse CPU hotplug case

[Marcel Apfelbaum <marcel.apfelbaum@gmail.com>]

On 03/14/2016 02:25 PM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>   - rebased on top of todays PCI tree to match
>     modified tables
> ---
>   tests/acpi-test-data/pc/APIC.cpuhp_sparse | Bin 0 -> 160 bytes
>   tests/acpi-test-data/pc/DSDT.cpuhp_sparse | Bin 0 -> 5930 bytes
>   tests/acpi-test-data/pc/SRAT.cpuhp_sparse | Bin 0 -> 264 bytes
>   tests/bios-tables-test.c                  |  16 ++++++++++++++++
>   4 files changed, 16 insertions(+)
>   create mode 100644 tests/acpi-test-data/pc/APIC.cpuhp_sparse
>   create mode 100644 tests/acpi-test-data/pc/DSDT.cpuhp_sparse
>   create mode 100644 tests/acpi-test-data/pc/SRAT.cpuhp_sparse
>
> diff --git a/tests/acpi-test-data/pc/APIC.cpuhp_sparse b/tests/acpi-test-data/pc/APIC.cpuhp_sparse
> new file mode 100644
> index 0000000000000000000000000000000000000000..67918d51b7b7fbd26aff57802b3cf358864fb36a
> GIT binary patch
> literal 160
> zcmXAh%MpMe3`7G13?J>mR)CA1WX6lF*o~!Fij|<*a7f<E&Q5aM>P<xIDtldzrJSv1
> z&J<^Gkm&6~&pn)8jo53Ale{s5)($!cstNn)*gEn+U{af5A#frVxiBmxG2=dd@dKqv
> B4FLcE
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/acpi-test-data/pc/DSDT.cpuhp_sparse b/tests/acpi-test-data/pc/DSDT.cpuhp_sparse
> new file mode 100644
> index 0000000000000000000000000000000000000000..c8ce867d6d241b76ecef1e1fc322b68390a23bee
> GIT binary patch
> literal 5930
> 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
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/acpi-test-data/pc/SRAT.cpuhp_sparse b/tests/acpi-test-data/pc/SRAT.cpuhp_sparse
> new file mode 100644
> index 0000000000000000000000000000000000000000..8deeaee3bde46a891d8946b21368c4cef55d7d4f
> GIT binary patch
> literal 264
> zcmWFzatz^MWME*N;N<V@5v<@85#SsQ6axw|fY=}!gyBE{gU^U2&xFQjLF2Qc@!631
> dj2dv8pbRd!0Csgi2Z6x{c9=r!>R__iX#j#W2>}2A
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 0a80ddf..15fa3c9 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -781,6 +781,20 @@ static void test_acpi_q35_tcg_bridge(void)
>       free_test_data(&data);
>   }
>
> +static void test_acpi_piix4_tcg_cpuhp_sparse(void)
> +{
> +    test_data data;
> +
> +    memset(&data, 0, sizeof(data));
> +    data.machine = MACHINE_PC;
> +    data.variant = ".cpuhp_sparse";
> +    test_acpi_one("-machine accel=tcg"
> +                  " -numa node -smp 1,sockets=2,cores=3,maxcpus=6",
> +                  &data);
> +    free_test_data(&data);
> +}
> +
> +
>   int main(int argc, char *argv[])
>   {
>       const char *arch = qtest_get_arch();
> @@ -797,6 +811,8 @@ int main(int argc, char *argv[])
>           qtest_add_func("acpi/piix4/tcg/bridge", test_acpi_piix4_tcg_bridge);
>           qtest_add_func("acpi/q35/tcg", test_acpi_q35_tcg);
>           qtest_add_func("acpi/q35/tcg/bridge", test_acpi_q35_tcg_bridge);
> +        qtest_add_func("acpi/piix4/tcg/cpuhp_sparse",
> +                       test_acpi_piix4_tcg_cpuhp_sparse);
>       }
>       ret = g_test_run();
>       boot_sector_cleanup(disk);
>

Looks OK to me.

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Thanks,
Marcel