From: Ross Zwisler <ross.zwisler@linux.intel.com>
Date: Mon, 21 May 2018 16:32:03 +0000 (-0600)
Subject: ACPI testing: test NFIT platform capabilities
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cab27afa10c241cb99df41f770b29cebd6a91e73;p=qemu.git

ACPI testing: test NFIT platform capabilities

Add testing for the newly added NFIT Platform Capabilities Structure.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/tests/acpi-test-data/pc/NFIT.dimmpxm b/tests/acpi-test-data/pc/NFIT.dimmpxm
index 2bfc6c51f3..598d331b75 100644
Binary files a/tests/acpi-test-data/pc/NFIT.dimmpxm and b/tests/acpi-test-data/pc/NFIT.dimmpxm differ
diff --git a/tests/acpi-test-data/q35/NFIT.dimmpxm b/tests/acpi-test-data/q35/NFIT.dimmpxm
index 2bfc6c51f3..598d331b75 100644
Binary files a/tests/acpi-test-data/q35/NFIT.dimmpxm and b/tests/acpi-test-data/q35/NFIT.dimmpxm differ
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index bf3e193ae9..256d463cb8 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -830,7 +830,7 @@ static void test_acpi_tcg_dimm_pxm(const char *machine)
     memset(&data, 0, sizeof(data));
     data.machine = machine;
     data.variant = ".dimmpxm";
-    test_acpi_one(" -machine nvdimm=on"
+    test_acpi_one(" -machine nvdimm=on,nvdimm-cap=3"
                   " -smp 4,sockets=4"
                   " -m 128M,slots=3,maxmem=1G"
                   " -numa node,mem=32M,nodeid=0"