From: Igor Mammedov Date: Mon, 5 Dec 2016 23:32:20 +0000 (+0100) Subject: tests: pc: add memory hotplug acpi tables tests X-Git-Tag: v2.9.0-rc0~162^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4462fc604a5f7d07bcbea14ba87673476b1e9125;p=thirdparty%2Fqemu.git tests: pc: add memory hotplug acpi tables tests This also adds SRAT and DSDT blobs for memory hotplug variant Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Marcel Apfelbaum --- diff --git a/tests/acpi-test-data/pc/DSDT.memhp b/tests/acpi-test-data/pc/DSDT.memhp new file mode 100644 index 00000000000..a1010c7fb5c Binary files /dev/null and b/tests/acpi-test-data/pc/DSDT.memhp differ diff --git a/tests/acpi-test-data/pc/SRAT.memhp b/tests/acpi-test-data/pc/SRAT.memhp new file mode 100644 index 00000000000..66ce9a89819 Binary files /dev/null and b/tests/acpi-test-data/pc/SRAT.memhp differ diff --git a/tests/acpi-test-data/q35/DSDT.memhp b/tests/acpi-test-data/q35/DSDT.memhp new file mode 100644 index 00000000000..ecd0d8564b2 Binary files /dev/null and b/tests/acpi-test-data/q35/DSDT.memhp differ diff --git a/tests/acpi-test-data/q35/SRAT.memhp b/tests/acpi-test-data/q35/SRAT.memhp new file mode 100644 index 00000000000..66ce9a89819 Binary files /dev/null and b/tests/acpi-test-data/q35/SRAT.memhp differ diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 812f8305397..54048050c0a 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -867,6 +867,28 @@ static void test_acpi_piix4_tcg_ipmi(void) free_test_data(&data); } +static void test_acpi_q35_tcg_memhp(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_Q35; + data.variant = ".memhp"; + test_acpi_one(" -m 128,slots=3,maxmem=1G -numa node", &data); + free_test_data(&data); +} + +static void test_acpi_piix4_tcg_memhp(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".memhp"; + test_acpi_one(" -m 128,slots=3,maxmem=1G -numa node", &data); + free_test_data(&data); +} + int main(int argc, char *argv[]) { const char *arch = qtest_get_arch(); @@ -887,6 +909,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi); qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp); qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp); + qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp); + qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp); } ret = g_test_run(); boot_sector_cleanup(disk);