[v2,7/7] tests/bios-tables-test: Update arm/virt memhp test
diff mbox series

Message ID 20200117174522.22044-8-shameerali.kolothum.thodi@huawei.com
State New
Headers show
Series
  • ARM virt: Add NVDIMM support
Related show

Commit Message

Shameerali Kolothum Thodi Jan. 17, 2020, 5:45 p.m. UTC
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>
---
 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

Comments

Auger Eric Jan. 28, 2020, 4:29 p.m. UTC | #1
Hi Shameer,

On 1/17/20 6:45 PM, 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.thodi@huawei.com>
> ---
>  tests/data/acpi/virt/NFIT.memhp | 0
>  tests/data/acpi/virt/SSDT.memhp | 0
Is it normal to have those 2 above void files? I lost track about the
process.
>  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"
nit: maybe keep the same order as before ...
> +                  " -cpu cortex-a57"
>                    " -m 256M,slots=3,maxmem=1G"
and simply add ,nvdimm=on to above line.
>                    " -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);
> 
Thanks

Eric
Shameerali Kolothum Thodi Jan. 29, 2020, 10:35 a.m. UTC | #2
Hi Eric,

> -----Original Message-----
> From: Qemu-devel
> [mailto:qemu-devel-bounces+shameerali.kolothum.thodi=huawei.com@nongn
> u.org] On Behalf Of Auger Eric
> Sent: 28 January 2020 16:29
> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>;
> qemu-devel@nongnu.org; qemu-arm@nongnu.org; imammedo@redhat.com
> Cc: peter.maydell@linaro.org; xiaoguangrong.eric@gmail.com;
> mst@redhat.com; Linuxarm <linuxarm@huawei.com>; xuwei (O)
> <xuwei5@huawei.com>; shannon.zhaosl@gmail.com; lersek@redhat.com
> Subject: Re: [PATCH v2 7/7] tests/bios-tables-test: Update arm/virt memhp
> test
> 
> Hi Shameer,
> 
> On 1/17/20 6:45 PM, 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.thodi@huawei.com>
> > ---
> >  tests/data/acpi/virt/NFIT.memhp | 0
> >  tests/data/acpi/virt/SSDT.memhp | 0
> Is it normal to have those 2 above void files? I lost track about the
> process.

I guess so :). From tests/qtest/bios-tables-test.c,

/*
 * How to add or update the tests:
 * Contributor:
 * 1. add empty files for new tables, if any, under tests/data/acpi
 * 2. list any changed files in tests/bios-tables-test-allowed-diff.h
 * 3. commit the above *before* making changes that affect the tables
 ...

After reading that again, I am not sure those empty files can be in this
Patch or not. I can move it to 6/7.

> >  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"
> nit: maybe keep the same order as before ...
> > +                  " -cpu cortex-a57"
> >                    " -m 256M,slots=3,maxmem=1G"
> and simply add ,nvdimm=on to above line.
> >                    " -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);
> >

Ok. Noted.

Thanks,
Shameer
Auger Eric Jan. 29, 2020, 1:01 p.m. UTC | #3
Hi Shameer,

On 1/29/20 11:35 AM, Shameerali Kolothum Thodi wrote:
> Hi Eric,
> 
>> -----Original Message-----
>> From: Qemu-devel
>> [mailto:qemu-devel-bounces+shameerali.kolothum.thodi=huawei.com@nongn
>> u.org] On Behalf Of Auger Eric
>> Sent: 28 January 2020 16:29
>> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>;
>> qemu-devel@nongnu.org; qemu-arm@nongnu.org; imammedo@redhat.com
>> Cc: peter.maydell@linaro.org; xiaoguangrong.eric@gmail.com;
>> mst@redhat.com; Linuxarm <linuxarm@huawei.com>; xuwei (O)
>> <xuwei5@huawei.com>; shannon.zhaosl@gmail.com; lersek@redhat.com
>> Subject: Re: [PATCH v2 7/7] tests/bios-tables-test: Update arm/virt memhp
>> test
>>
>> Hi Shameer,
>>
>> On 1/17/20 6:45 PM, 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.thodi@huawei.com>
>>> ---
>>>  tests/data/acpi/virt/NFIT.memhp | 0
>>>  tests/data/acpi/virt/SSDT.memhp | 0
>> Is it normal to have those 2 above void files? I lost track about the
>> process.
> 
> I guess so :). From tests/qtest/bios-tables-test.c,
> 
> /*
>  * How to add or update the tests:
>  * Contributor:
>  * 1. add empty files for new tables, if any, under tests/data/acpi
>  * 2. list any changed files in tests/bios-tables-test-allowed-diff.h
>  * 3. commit the above *before* making changes that affect the tables
>  ...

Thank you for reminding me of the process and doc location
> 
> After reading that again, I am not sure those empty files can be in this
> Patch or not. I can move it to 6/7.

yep, maybe better then to put them in the same patch.
> 
>>>  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"
>> nit: maybe keep the same order as before ...
>>> +                  " -cpu cortex-a57"
>>>                    " -m 256M,slots=3,maxmem=1G"
>> and simply add ,nvdimm=on to above line.
>>>                    " -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);
>>>
> 
> Ok. Noted.


Thanks

Eric
> 
> Thanks,
> Shameer
>
Michael S. Tsirkin Feb. 11, 2020, 10:20 a.m. UTC | #4
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.thodi@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
>

Patch
diff mbox series

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);