From e302bb3da6b59ad22c2157bbaac299a301780ba1 Mon Sep 17 00:00:00 2001
From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Date: Tue, 21 Apr 2020 13:59:34 +0100
Subject: [PATCH] tests/acpi: add expected tables for bios-tables-test

Because of the following changes, the expeacted tables for bios-tables-test
needs to be updated.

1. Changed NVDIM DSM output buffer AML code.
2. Updated arm/virt test_acpi_virt_tcg_memhp() to add pc-dimm/nvdimm

Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Message-Id: <20200421125934.14952-8-shameerali.kolothum.thodi@huawei.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/data/acpi/pc/SSDT.dimmpxm             | Bin 685 -> 734 bytes
 tests/data/acpi/q35/SSDT.dimmpxm            | Bin 685 -> 734 bytes
 tests/data/acpi/virt/DSDT.memhp             | Bin 6644 -> 6668 bytes
 tests/data/acpi/virt/NFIT.memhp             | Bin 0 -> 224 bytes
 tests/data/acpi/virt/SSDT.memhp             | Bin 0 -> 736 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   5 -----
 6 files changed, 5 deletions(-)

diff --git a/tests/data/acpi/pc/SSDT.dimmpxm b/tests/data/acpi/pc/SSDT.dimmpxm
index 8ba0e67cb72daa81a65da4906d37a5e0f4af1fd4..ac55387d57e48adb99eb738a102308688a262fb8 100644
GIT binary patch
delta 125
zcmZ3>dXJSWIM^lR9uortW7tG4X>Nb5nD}6)_~<4#t%(LAOunKU-FO)N7nn^=<l-n`
zNa6@_3Uw1?W@IQ3WMW8PBs(=Jv7oub-^DQ`iJ=1|$G}jW4x-abla{0xR3>sUGbBa}
UgA_0%`a6ZXEdddm3m9z~0cGkU^#A|>

delta 76
zcmcb|x|WqIIM^j*EfWI+W57f%X>LFDnD}6)_~<5A^@#=|Og=&z-FO(~3Mv!1m>CkI
dh5cO|Ll_eMokHD;1(_H?bo!F?%?lZA83Fei6ZHT9

diff --git a/tests/data/acpi/q35/SSDT.dimmpxm b/tests/data/acpi/q35/SSDT.dimmpxm
index 2d5b721bcf9c398feb6d005761f898015042e8a4..98e6f0e3f3bb02dd419e36bdd1db9b94c728c406 100644
GIT binary patch
delta 125
zcmZ3>dXJSWIM^lR9uortquWF-X>Nb5nD}6)_~<4#t%(LAOunKU-FO)N7nn^=<l-n`
zNa6@_3Uw1?W@IQ3WMW8PBs(=Jv7oub-^DQ`iJ=1|$G}jW4x-abla{0xR3>sUGbBa}
UgA_0%`a6ZXEdddm3m9z~0bcqd<p2Nx

delta 76
zcmcb|x|WqIIM^j*EfWI+qr*flX>LFDnD}6)_~<5A^@#=|Og=&z-FO(~3Mv!1m>CkI
dh5cO|Ll_eMokHD;1(_H?bo!F?%?lZA83FS;6XgH^

diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/DSDT.memhp
index c527ac4739af3df3c3e042bf91c412033a2b73c3..730e95a46d2cce0af011ffc051d7342beb8f1328 100644
GIT binary patch
delta 66
zcmexj++)J!66_MfBgMeL^l>7WG*kP$jq2<oOpaWW4Mc*Od{`#8h!~455Sv_`z{SGA
W#nKj|7a!~t?-%A0w0WzDJu3iIl@a3r

delta 43
zcmeA%`C`oF66_N4MUsJmsc|BgG*kbajq2<oOr9K*4Mc(&O(wUB7;io=V#^8u9B2%1

diff --git a/tests/data/acpi/virt/NFIT.memhp b/tests/data/acpi/virt/NFIT.memhp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..738c6f74c0ce7dc329cc72cc7b930460ceb9b6a0 100644
GIT binary patch
literal 224
zcmeZs^9*^wz`($G(aGQ0BUr&HBET6W#>l|H0Ahn^1~9N-U}0bevp`~%mp`O^-csVQ
z#+lbxVtdbR1_p)>up|Qm2Z-iq0Fev~j0^@0Ob{jm3j-^N1(pXfP%+3<1_l;}00vfu
XwgyH92p^^<+(d|h5n??|h$tEWN>da8

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..db61d6733284c90153e0e2c1d6c2ac25c22b1d84 100644
GIT binary patch
literal 736
zcmWFzb_sdF#K6F4?Bwt45v<@B=Hlt=%fP_Mz`)=X5#S7>1st_w;)9*yqnkXm{K8y<
zIO07#U3eXx13V2342>8>{6+no9esEUd|iDV)1n*v0zCa0co-NsIk{M(8~lPCeHqfY
z83dvmxj{0_ej#q23ek-+APHs<7av!JAlI;91-DQ?X9YLMAoqq}?9q)vVA&uaS3d=R
z7srr>f9wmSCg(5|2nurvEO{=VKXKj@!OqJ<)|0=->`GW@u|RHe4iCuDU<IG%bf+vl
zE9BgD)APuBqrFK93&p|W25UH-1$mzcPMpZWpujULEn$IV?c_9uNs}`Y7#46&&SF?1
z$jk^P7z=VhE-T0cIjtZI<hBJe)sy?OxmYH*XEQPsbYwFyBo#C#B^M-v++2_b@>L1Q
zy<9Ab3(Te_a&Z(eByof|g}Q;vED&U3NM9s7H7T*6xdY^(B!&)<90NmfI*3j$O<Iy(
zP?^ZZ%#au@3{t?5=<gKjwgg0o2*kSt`?4$n1#(7aRyG4iP;iJNgNQGCkeg=+Cx^dV
za0o*|28b#EsR4x%dJr%&3b8SQRDeS%p(}wQIK(lu07QTcTfj4EGFW7ZAQMADdqQGK
zBFG;clM@+0BGJMLTnb><Ifc5pEddcC_VI3>Asir&B^59vFEU^(0J$bP0i=6@;AD`g
z+zgB``Go=t*g%FQ6(uJo7bhhoMK{U#g&7!d#5=kKF{1mBF}g|4FU-IYEX&0tB8VCQ
YTucyoBZxdRhCDL|C@JzVFx+(p0Iyil0RR91

literal 0
HcmV?d00001

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 862c49e675..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,6 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/SSDT.dimmpxm",
-"tests/data/acpi/q35/SSDT.dimmpxm",
-"tests/data/acpi/virt/DSDT.memhp",
-"tests/data/acpi/virt/SSDT.memhp",
-"tests/data/acpi/virt/NFIT.memhp",