From fda4096fca83dcdc72e0fc0e4a1ae6e7724fb5e0 Mon Sep 17 00:00:00 2001 From: He Chen Date: Wed, 3 May 2017 17:17:16 +0800 Subject: [PATCH] tests: acpi: extend cphp and memhp testcase with numa distance check Signed-off-by: He Chen Message-Id: <1493803036-4048-1-git-send-email-he.chen@linux.intel.com> Reviewed-by: Igor Mammedov [ehabkost: regenerated tests/acpi-tst-data, included SLIT table] Signed-off-by: Eduardo Habkost --- tests/acpi-test-data/pc/SLIT.cphp | Bin 0 -> 48 bytes tests/acpi-test-data/pc/SLIT.memhp | Bin 0 -> 48 bytes tests/acpi-test-data/pc/SRAT.memhp | Bin 224 -> 264 bytes tests/acpi-test-data/q35/SLIT.cphp | Bin 0 -> 48 bytes tests/acpi-test-data/q35/SLIT.memhp | Bin 0 -> 48 bytes tests/acpi-test-data/q35/SRAT.memhp | Bin 224 -> 264 bytes tests/bios-tables-test.c | 16 ++++++++++++---- 7 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 tests/acpi-test-data/pc/SLIT.cphp create mode 100644 tests/acpi-test-data/pc/SLIT.memhp create mode 100644 tests/acpi-test-data/q35/SLIT.cphp create mode 100644 tests/acpi-test-data/q35/SLIT.memhp diff --git a/tests/acpi-test-data/pc/SLIT.cphp b/tests/acpi-test-data/pc/SLIT.cphp new file mode 100644 index 0000000000000000000000000000000000000000..74ec3b4b461ffecca36d8537975c202a5f011185 GIT binary patch literal 48 scmWIc@eDCwU|?X>aq@Te2v%^42yhMtiZKGkKx`1r1jHb~B`V4V0NaKK0RR91 literal 0 HcmV?d00001 diff --git a/tests/acpi-test-data/pc/SLIT.memhp b/tests/acpi-test-data/pc/SLIT.memhp new file mode 100644 index 0000000000000000000000000000000000000000..74ec3b4b461ffecca36d8537975c202a5f011185 GIT binary patch literal 48 scmWIc@eDCwU|?X>aq@Te2v%^42yhMtiZKGkKx`1r1jHb~B`V4V0NaKK0RR91 literal 0 HcmV?d00001 diff --git a/tests/acpi-test-data/pc/SRAT.memhp b/tests/acpi-test-data/pc/SRAT.memhp index 66ce9a898191d1da961c0c968c04ec56810a5785..a7dddf7760698193819e60a3a96f2a57cf367522 100644 GIT binary patch delta 63 scmaFB*ulgV9OM|n!N|bCxOgI0p(Zl}6aYowfKda^V}S~?Osq)(00EN*IRF3v delta 23 ecmeBRdcepP9OM}CfPsO5@%KcoLPqw9OHu$-0tYz& diff --git a/tests/acpi-test-data/q35/SLIT.cphp b/tests/acpi-test-data/q35/SLIT.cphp new file mode 100644 index 0000000000000000000000000000000000000000..74ec3b4b461ffecca36d8537975c202a5f011185 GIT binary patch literal 48 scmWIc@eDCwU|?X>aq@Te2v%^42yhMtiZKGkKx`1r1jHb~B`V4V0NaKK0RR91 literal 0 HcmV?d00001 diff --git a/tests/acpi-test-data/q35/SLIT.memhp b/tests/acpi-test-data/q35/SLIT.memhp new file mode 100644 index 0000000000000000000000000000000000000000..74ec3b4b461ffecca36d8537975c202a5f011185 GIT binary patch literal 48 scmWIc@eDCwU|?X>aq@Te2v%^42yhMtiZKGkKx`1r1jHb~B`V4V0NaKK0RR91 literal 0 HcmV?d00001 diff --git a/tests/acpi-test-data/q35/SRAT.memhp b/tests/acpi-test-data/q35/SRAT.memhp index 66ce9a898191d1da961c0c968c04ec56810a5785..a7dddf7760698193819e60a3a96f2a57cf367522 100644 GIT binary patch delta 63 scmaFB*ulgV9OM|n!N|bCxOgI0p(Zl}6aYowfKda^V}S~?Osq)(00EN*IRF3v delta 23 ecmeBRdcepP9OM}CfPsO5@%KcoLPqw9OHu$-0tYz& diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 9c96a67053..4e5c65a022 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -723,7 +723,8 @@ static void test_acpi_piix4_tcg_cphp(void) data.machine = MACHINE_PC; data.variant = ".cphp"; test_acpi_one("-smp 2,cores=3,sockets=2,maxcpus=6" - " -numa node -numa node", + " -numa node -numa node" + " -numa dist,src=0,dst=1,val=21", &data); free_test_data(&data); } @@ -736,7 +737,8 @@ static void test_acpi_q35_tcg_cphp(void) data.machine = MACHINE_Q35; data.variant = ".cphp"; test_acpi_one(" -smp 2,cores=3,sockets=2,maxcpus=6" - " -numa node -numa node", + " -numa node -numa node" + " -numa dist,src=0,dst=1,val=21", &data); free_test_data(&data); } @@ -785,7 +787,10 @@ static void test_acpi_q35_tcg_memhp(void) memset(&data, 0, sizeof(data)); data.machine = MACHINE_Q35; data.variant = ".memhp"; - test_acpi_one(" -m 128,slots=3,maxmem=1G -numa node", &data); + test_acpi_one(" -m 128,slots=3,maxmem=1G" + " -numa node -numa node" + " -numa dist,src=0,dst=1,val=21", + &data); free_test_data(&data); } @@ -796,7 +801,10 @@ static void test_acpi_piix4_tcg_memhp(void) memset(&data, 0, sizeof(data)); data.machine = MACHINE_PC; data.variant = ".memhp"; - test_acpi_one(" -m 128,slots=3,maxmem=1G -numa node", &data); + test_acpi_one(" -m 128,slots=3,maxmem=1G" + " -numa node -numa node" + " -numa dist,src=0,dst=1,val=21", + &data); free_test_data(&data); }