From d82c4f82e0233da642c36c40ef8da781fee689bc Mon Sep 17 00:00:00 2001
From: Dou Liyang <douly.fnst@cn.fujitsu.com>
Date: Thu, 14 Dec 2017 12:08:54 +0800
Subject: [PATCH] ACPI/unit-test: Add a testcase for RAM allocation in numa
 node

As QEMU supports the memory-less node, it is possible that there is
no RAM in the first numa node(also be called as node0). eg:
  ... \
  -m 128,slots=3,maxmem=1G \
  -numa node -numa node,mem=128M \

But, this makes it hard for QEMU to build a known-to-work ACPI SRAT
table. Only fixing it is not enough.

Add a testcase for this situation to make sure the ACPI table is
correct for guest.

Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/DSDT.numamem  | Bin 0 -> 5150 bytes
 tests/acpi-test-data/pc/SRAT.numamem  | Bin 0 -> 224 bytes
 tests/acpi-test-data/q35/DSDT.numamem | Bin 0 -> 7834 bytes
 tests/acpi-test-data/q35/SRAT.numamem | Bin 0 -> 224 bytes
 tests/bios-tables-test.c              |  24 ++++++++++++++++++++++++
 5 files changed, 24 insertions(+)
 create mode 100644 tests/acpi-test-data/pc/DSDT.numamem
 create mode 100644 tests/acpi-test-data/pc/SRAT.numamem
 create mode 100644 tests/acpi-test-data/q35/DSDT.numamem
 create mode 100644 tests/acpi-test-data/q35/SRAT.numamem

diff --git a/tests/acpi-test-data/pc/DSDT.numamem b/tests/acpi-test-data/pc/DSDT.numamem
new file mode 100644
index 0000000000000000000000000000000000000000..224cfdd9e983e02dac5f4bf7e210eaa64cb0dc78
GIT binary patch
literal 5150
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
bA|K%F7s61$02&AYMImUAff34Z;bH~=9gxjE

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/SRAT.numamem b/tests/acpi-test-data/pc/SRAT.numamem
new file mode 100644
index 0000000000000000000000000000000000000000..dbc595d9cb85d3fcb5a4243153f42bb431c9de8f
GIT binary patch
literal 224
zcmWFzatwLEz`(%x#mV2<BUr&HBET6W#>l|H0Ahn^5N3b@0R{$SKBERq0+U8nhs*=1
d<pL34j4Z>b0pkgP<ro+~utOO{+Y3_<q5(~(3IPBB

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/DSDT.numamem b/tests/acpi-test-data/q35/DSDT.numamem
new file mode 100644
index 0000000000000000000000000000000000000000..8c9fa445b0119b6f67533cb968855b41fb9925d9
GIT binary patch
literal 7834
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
T7(fgo7{eIMU<+{e3t<2NI>Rw)

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/SRAT.numamem b/tests/acpi-test-data/q35/SRAT.numamem
new file mode 100644
index 0000000000000000000000000000000000000000..dbc595d9cb85d3fcb5a4243153f42bb431c9de8f
GIT binary patch
literal 224
zcmWFzatwLEz`(%x#mV2<BUr&HBET6W#>l|H0Ahn^5N3b@0R{$SKBERq0+U8nhs*=1
d<pL34j4Z>b0pkgP<ro+~utOO{+Y3_<q5(~(3IPBB

literal 0
HcmV?d00001

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index e28e0c98cf..def81fc243 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -810,6 +810,28 @@ static void test_acpi_piix4_tcg_memhp(void)
     free_test_data(&data);
 }
 
+static void test_acpi_q35_tcg_numamem(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_Q35;
+    data.variant = ".numamem";
+    test_acpi_one(" -numa node -numa node,mem=128", &data);
+    free_test_data(&data);
+}
+
+static void test_acpi_piix4_tcg_numamem(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_PC;
+    data.variant = ".numamem";
+    test_acpi_one(" -numa node -numa node,mem=128", &data);
+    free_test_data(&data);
+}
+
 int main(int argc, char *argv[])
 {
     const char *arch = qtest_get_arch();
@@ -832,6 +854,8 @@ int main(int argc, char *argv[])
         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);
+        qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_numamem);
+        qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem);
     }
     ret = g_test_run();
     boot_sector_cleanup(disk);