Re: [Qemu-devel] [PATCH v3 5/5] tests: acpi: extend cphp testcase with numa check

[Igor Mammedov]

On Mon, 4 Jul 2016 15:14:40 +0300
"Michael S. Tsirkin" <address@hidden> wrote:

> On Fri, Jul 01, 2016 at 01:50:26PM +0200, Igor Mammedov wrote:
> > so it would be possible to verify _PXM generation in
> > DSDT and SRAT tables.
> > 
> > Signed-off-by: Igor Mammedov <address@hidden>
> > Reviewed-by: Marcel Apfelbaum <address@hidden>
> 
> It's still a pain to backport, pls make it a separate patch if
> you repost.
Ok, I'll split it.

> 
> > ---
> > NOTE to maintainer:
> > SRAT table is included in patch as it doesn't have
> > any chance for conflicts compared to often changing
> > DSDT
> > 
> > following table blobs should be updated in git tree as part
> > of this commit after
> > running ./tests/acpi-test-data/rebuild-expected-aml.sh
> > 
> > tests/acpi-test-data/q35/DSDT.cphp
> > tests/acpi-test-data/pc/DSDT.cphp
> > ---
> >  tests/acpi-test-data/pc/SRAT.cphp  | Bin 0 -> 304 bytes
> >  tests/acpi-test-data/q35/SRAT.cphp | Bin 0 -> 304 bytes
> >  tests/bios-tables-test.c           |   6 ++++--
> >  3 files changed, 4 insertions(+), 2 deletions(-)
> >  create mode 100644 tests/acpi-test-data/pc/SRAT.cphp
> >  create mode 100644 tests/acpi-test-data/q35/SRAT.cphp
> > 
> > diff --git a/tests/acpi-test-data/pc/SRAT.cphp
> > b/tests/acpi-test-data/pc/SRAT.cphp new file mode 100644
> > index
> > 0000000000000000000000000000000000000000..ff2137642f488ec70b85207ed6c20e7351d61e98
> > GIT binary patch literal 304
> > zcmWFzattwGWME)4bMklg2v%^42yhMtiUEZfKx_~V!f+sf!DmF1XF}yOvY_!<(fDl0
> > pd`1npO;83GTmZW|po75R12aq^syaB21u74tQT&BzFU&Ml8UVWm2>}2A
> > 
> > literal 0
> > HcmV?d00001
> > 
> > diff --git a/tests/acpi-test-data/q35/SRAT.cphp
> > b/tests/acpi-test-data/q35/SRAT.cphp new file mode 100644
> > index
> > 0000000000000000000000000000000000000000..ff2137642f488ec70b85207ed6c20e7351d61e98
> > GIT binary patch literal 304
> > zcmWFzattwGWME)4bMklg2v%^42yhMtiUEZfKx_~V!f+sf!DmF1XF}yOvY_!<(fDl0
> > pd`1npO;83GTmZW|po75R12aq^syaB21u74tQT&BzFU&Ml8UVWm2>}2A
> > 
> > literal 0
> > HcmV?d00001
> > 
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index de4019e..3796089 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -809,7 +809,8 @@ static void test_acpi_piix4_tcg_cphp(void)
> >      data.machine = MACHINE_PC;
> >      data.variant = ".cphp";
> >      test_acpi_one("-machine accel=tcg"
> > -                  " -smp 2,cores=3,sockets=2,maxcpus=6",
> > +                  " -smp 2,cores=3,sockets=2,maxcpus=6"
> > +                  " -numa node -numa node",
> >                    &data);
> >      free_test_data(&data);
> >  }
> > @@ -822,7 +823,8 @@ static void test_acpi_q35_tcg_cphp(void)
> >      data.machine = MACHINE_Q35;
> >      data.variant = ".cphp";
> >      test_acpi_one("-machine q35,accel=tcg"
> > -                  " -smp 2,cores=3,sockets=2,maxcpus=6",
> > +                  " -smp 2,cores=3,sockets=2,maxcpus=6"
> > +                  " -numa node -numa node",
> >                    &data);
> >      free_test_data(&data);
> >  }
> > -- 
> > 1.8.3.1