| Message ID | 20200311172014.33052-10-shameerali.kolothum.thodi@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | ARM virt: Add NVDIMM support | expand |
On Wed, 11 Mar 2020 17:20:13 +0000 Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote: SUBJ is pointless, s/Update.../ arm/virt: test pc-dimm and nvdimm coldplug > 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.thodi@huawei.com> > --- > v2 -> v3 > -Moved addition of empty table files to the previous patch > --- > tests/qtest/bios-tables-test.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > index 0a597bbacf..c9843829b3 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -927,12 +927,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);
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 0a597bbacf..c9843829b3 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -927,12 +927,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);
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.thodi@huawei.com> --- v2 -> v3 -Moved addition of empty table files to the previous patch --- tests/qtest/bios-tables-test.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.17.1