On Fri, Jan 17, 2020 at 05:45:22PM +0000, Shameer Kolothum wrote: > Since we now have both pc-dimm and nvdimm support, update > test_acpi_virt_tcg_memhp() to include those. > > Signed-off-by: Shameer Kolothum <shameerali.kolothum.th...@huawei.com>
And you can add a last patch on top updating the expected files and blowing out the allowed diff file. include the ASL changes in the log ... > --- > tests/data/acpi/virt/NFIT.memhp | 0 > tests/data/acpi/virt/SSDT.memhp | 0 > tests/qtest/bios-tables-test.c | 9 +++++++-- > 3 files changed, 7 insertions(+), 2 deletions(-) > create mode 100644 tests/data/acpi/virt/NFIT.memhp > create mode 100644 tests/data/acpi/virt/SSDT.memhp > > diff --git a/tests/data/acpi/virt/NFIT.memhp b/tests/data/acpi/virt/NFIT.memhp > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > index f1ac2d7e96..695d2e7fac 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -913,12 +913,17 @@ static void test_acpi_virt_tcg_memhp(void) > }; > > data.variant = ".memhp"; > - test_acpi_one(" -cpu cortex-a57" > + test_acpi_one(" -machine nvdimm=on" > + " -cpu cortex-a57" > " -m 256M,slots=3,maxmem=1G" > " -object memory-backend-ram,id=ram0,size=128M" > " -object memory-backend-ram,id=ram1,size=128M" > " -numa node,memdev=ram0 -numa node,memdev=ram1" > - " -numa dist,src=0,dst=1,val=21", > + " -numa dist,src=0,dst=1,val=21" > + " -object memory-backend-ram,id=ram2,size=128M" > + " -object memory-backend-ram,id=nvm0,size=128M" > + " -device pc-dimm,id=dimm0,memdev=ram2,node=0" > + " -device nvdimm,id=dimm1,memdev=nvm0,node=1", > &data); > > free_test_data(&data); > -- > 2.17.1 >