[Qemu-devel] [PATCH v2 02/11] tests: acpi: test NVDIMM tables

[Xiao Guangrong]

Add nvdimm test, two tables are created which are NFIT and
SSDT

Max memory size and multiple slots are needed to enable NVDIMM which
cause the primal SSDT table is also updated

Signed-off-by: Xiao Guangrong <address@hidden>
---
 tests/acpi-test-data/pc/NFIT                | Bin 0 -> 224 bytes
 tests/acpi-test-data/pc/NFIT.bridge         | Bin 0 -> 224 bytes
 tests/acpi-test-data/pc/SSDT                | Bin 2486 -> 2885 bytes
 tests/acpi-test-data/pc/SSDT-NVDIMM         | Bin 0 -> 134 bytes
 tests/acpi-test-data/pc/SSDT-NVDIMM.bridge  | Bin 0 -> 134 bytes
 tests/acpi-test-data/pc/SSDT.bridge         | Bin 4345 -> 4745 bytes
 tests/acpi-test-data/q35/NFIT               | Bin 0 -> 224 bytes
 tests/acpi-test-data/q35/NFIT.bridge        | Bin 0 -> 224 bytes
 tests/acpi-test-data/q35/SSDT               | Bin 691 -> 1090 bytes
 tests/acpi-test-data/q35/SSDT-NVDIMM        | Bin 0 -> 134 bytes
 tests/acpi-test-data/q35/SSDT-NVDIMM.bridge | Bin 0 -> 134 bytes
 tests/acpi-test-data/q35/SSDT.bridge        | Bin 708 -> 1107 bytes
 tests/bios-tables-test.c                    |  15 ++++++++++-----
 13 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 tests/acpi-test-data/pc/NFIT
 create mode 100644 tests/acpi-test-data/pc/NFIT.bridge
 create mode 100644 tests/acpi-test-data/pc/SSDT-NVDIMM
 create mode 100644 tests/acpi-test-data/pc/SSDT-NVDIMM.bridge
 create mode 100644 tests/acpi-test-data/q35/NFIT
 create mode 100644 tests/acpi-test-data/q35/NFIT.bridge
 create mode 100644 tests/acpi-test-data/q35/SSDT-NVDIMM
 create mode 100644 tests/acpi-test-data/q35/SSDT-NVDIMM.bridge

diff --git a/tests/acpi-test-data/pc/NFIT b/tests/acpi-test-data/pc/NFIT
new file mode 100644
index 
0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
literal 224
zcmeZs^9*^wz`($m?Bwt45v<@address@hidden(mrn~aaiNb
zYb>$7=Qc<Js+I%9=4b$sATa}&I7~lS9wG}NA^IRB3qt_VmbL~)xGspAFcTpLMkZuk
G#IXUIOA`SA

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/NFIT.bridge 
b/tests/acpi-test-data/pc/NFIT.bridge
new file mode 100644
index 
0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
literal 224
zcmeZs^9*^wz`($m?Bwt45v<@address@hidden(mrn~aaiNb
zYb>$7=Qc<Js+I%9=4b$sATa}&I7~lS9wG}NA^IRB3qt_VmbL~)xGspAFcTpLMkZuk
G#IXUIOA`SA

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
index 
210d6a71e58aa34ce8e94121d25bcf58c3bd503c..83c5fcc88786f3f8c2ccb3e1fd935ab6b940cbf8
 100644
GIT binary patch
delta 469
zcmdlcd{m4pIM^k`m79TqQFbF&G$WJ4yvgZ|dnNohV)U8ggPr07oIMSEJpx=fd|mv4
address@hidden@ETMY7%*_edw9C=I9}js5Rr>_4hm*i5~I(8tlt+X
z2vQD|4i0g|lnx3Gfl3EN_+m-}1;Nsa@&3W}A<P)2`$M#6WM+xT$GdtNFk+|x3W7|?
zfI8j~?s!8|9bb>>JQ7?_k>f>Vd_&wMBAFI&P0nCw1I0lmh{*_I8fI?Z!Ss&}0M+w@
Ae*gdg

delta 67
zcmX>qwoRBTIM^j*8z%z;<MoYP(Tq%vt&`Ik_lo;+#OO1}2Rp?FIC~oSdIY#|_`3K7
XF-*2$Dq|address@hidden

diff --git a/tests/acpi-test-data/pc/SSDT-NVDIMM 
b/tests/acpi-test-data/pc/SSDT-NVDIMM
new file mode 100644
index 
0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
literal 134
zcmWFzb_r=?U|?Xp<K*w`5v<@B=Hlt=3*-aEoFW38L9~D)TTFbgQ+#xj2P;rMh$G&^
z(}ma3Il$Avz|e?6MAXmO(T8OL=j1GgC4$V1V1iMEKi(zSmt_e^E+aE5JGx2QFU-Jz
LBi_*^2tyJ8_y8aQ

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/SSDT-NVDIMM.bridge 
b/tests/acpi-test-data/pc/SSDT-NVDIMM.bridge
new file mode 100644
index 
0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
literal 134
zcmWFzb_r=?U|?Xp<K*w`5v<@B=Hlt=3*-aEoFW38L9~D)TTFbgQ+#xj2P;rMh$G&^
z(}ma3Il$Avz|e?6MAXmO(T8OL=j1GgC4$V1V1iMEKi(zSmt_e^E+aE5JGx2QFU-Jz
LBi_*^2tyJ8_y8aQ

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/SSDT.bridge 
b/tests/acpi-test-data/pc/SSDT.bridge
index 
6e6660b1fbe0bdb7fe0b257cb53c31fa9bb21a14..051c2e34aebbe6214a8c1e37b39f744bb4943051
 100644
GIT binary patch
delta 470
zcmeyV*s01D9PAR(Da63QsJxLYnvuChh;ec{<6a3rju?IB_+Y2_0B27FUylG64qq3)
zATFlK)=Xvf(M?|address@hidden;address@hidden
z3WAgarGrBpF{OioL!i<D5x$txKtZsyV!VHFeF!s#>HZMy8JSrk^6{=-28<XgfPx?s
zGN6t(ggf4lRL9q2I*$a`Q{;FN8Q%~$iAbgeT$3{x+CXuT31TvWn1-2~cQ85f0RS^@
Bg82Xd

delta 67
zcmeBF{i(<m9PASEQ-FbiQDGxjG$WJC&&e5#d&address@hidden)U8ggPr07oIMSEJpx=fd|mv4
X7$(~?m9dMk`G&YfGHv!?apVI4kDw9$

diff --git a/tests/acpi-test-data/q35/NFIT b/tests/acpi-test-data/q35/NFIT
new file mode 100644
index 
0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
literal 224
zcmeZs^9*^wz`($m?Bwt45v<@address@hidden(mrn~aaiNb
zYb>$7=Qc<Js+I%9=4b$sATa}&I7~lS9wG}NA^IRB3qt_VmbL~)xGspAFcTpLMkZuk
G#IXUIOA`SA

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/NFIT.bridge 
b/tests/acpi-test-data/q35/NFIT.bridge
new file mode 100644
index 
0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
literal 224
zcmeZs^9*^wz`($m?Bwt45v<@address@hidden(mrn~aaiNb
zYb>$7=Qc<Js+I%9=4b$sATa}&I7~lS9wG}NA^IRB3qt_VmbL~)xGspAFcTpLMkZuk
G#IXUIOA`SA

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
index 
0970c67ddb1456707c0111f7e5e659ef385af408..f75d0745ce6d34ae7416409d4f8f42402e6c20b6
 100644
GIT binary patch
delta 468
address@hidden)U8ggPr07oIMSEJpx=fd|mv4
address@hidden;Wel*Fks+__waP#alF9OAR-s<92Cs3Bu1YFS-&q(
address@hidden<Nbr{Lzpp4_lIcD$jlOvk9YMlV8l=X6a<-&
z0d>3~-0_B_I=&address@hidden(zaG|Zfw!{iPClKFy&

delta 66
address@hidden;?W9>#RenuuQ$;r};d&address@hidden)U8ggPr07oIMSEJpx=fd|mv4
W7$$#UEMpg8^9^x}WSab&*&P5k77>a7

diff --git a/tests/acpi-test-data/q35/SSDT-NVDIMM 
b/tests/acpi-test-data/q35/SSDT-NVDIMM
new file mode 100644
index 
0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
literal 134
zcmWFzb_r=?U|?Xp<K*w`5v<@B=Hlt=3*-aEoFW38L9~D)TTFbgQ+#xj2P;rMh$G&^
z(}ma3Il$Avz|e?6MAXmO(T8OL=j1GgC4$V1V1iMEKi(zSmt_e^E+aE5JGx2QFU-Jz
LBi_*^2tyJ8_y8aQ

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/SSDT-NVDIMM.bridge 
b/tests/acpi-test-data/q35/SSDT-NVDIMM.bridge
new file mode 100644
index 
0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
literal 134
zcmWFzb_r=?U|?Xp<K*w`5v<@B=Hlt=3*-aEoFW38L9~D)TTFbgQ+#xj2P;rMh$G&^
z(}ma3Il$Avz|e?6MAXmO(T8OL=j1GgC4$V1V1iMEKi(zSmt_e^E+aE5JGx2QFU-Jz
LBi_*^2tyJ8_y8aQ

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/SSDT.bridge 
b/tests/acpi-test-data/q35/SSDT.bridge
index 
a77868861754ce0b3333b2b7bc8091c03a53754d..87586ac9455a4933fc2a069e98a19e07cbf04670
 100644
GIT binary patch
delta 468
address@hidden>address@hidden&LG5XB$!A|i3&YlLo9sw>KzAk=2
address@hidden>_4hm*i5~I(8tlt+X
z2vQD|4i0g|lnx3Gfl3EN_+m-}1;Nsa@&3W}A<P)2`$M#6WM+xT$GdtNFk+|x3W7|?
zfI8j~?s!8|9bb>>JQ7?_k>f>Vd_&wMBAFI&P0nCw1I0lmh{*_I8fH$;VTu3%NXmk4

delta 66
zcmcc2afFpCIM^lR2onPXqwGd5enuv5smaoed&address@hidden)U8ggPr07oIMSEJpx=fd|mv4
W7$$#UEMpg8^9^x}WSab&IRXGMZ4qz)

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index fc01cce..87cf2e5 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -157,6 +157,10 @@ static const char *iasl = stringify(CONFIG_IASL);
 static const char *iasl;
 #endif
 
+#define NVDIMM_PARAMS   " -m 128M,maxmem=5G,slots=2 "                   \
+                        "-object memory-backend-ram,id=mem1,size=128M " \
+                        "-device nvdimm,memdev=mem1"
+
 static void free_test_data(test_data *data)
 {
     AcpiSdtTable *temp;
@@ -823,7 +827,7 @@ static void test_acpi_piix4_tcg(void)
      */
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_PC;
-    test_acpi_one("-machine accel=tcg", &data);
+    test_acpi_one("-machine accel=tcg,nvdimm" NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
@@ -834,7 +838,8 @@ static void test_acpi_piix4_tcg_bridge(void)
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_PC;
     data.variant = ".bridge";
-    test_acpi_one("-machine accel=tcg -device pci-bridge,chassis_nr=1", &data);
+    test_acpi_one("-machine accel=tcg,nvdimm -device pci-bridge,chassis_nr=1"
+                  NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
@@ -844,7 +849,7 @@ static void test_acpi_q35_tcg(void)
 
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_Q35;
-    test_acpi_one("-machine q35,accel=tcg", &data);
+    test_acpi_one("-machine q35,accel=tcg,nvdimm" NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
@@ -855,8 +860,8 @@ static void test_acpi_q35_tcg_bridge(void)
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_Q35;
     data.variant = ".bridge";
-    test_acpi_one("-machine q35,accel=tcg -device pci-bridge,chassis_nr=1",
-                  &data);
+    test_acpi_one("-machine q35,accel=tcg,nvdimm "
+                  "-device pci-bridge,chassis_nr=1" NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
-- 
1.8.3.1