On Thu, 23 Jun 2016 16:08:38 +0300 Marcel Apfelbaum <mar...@redhat.com> wrote:
> On 06/16/2016 07:55 PM, Igor Mammedov wrote: > > Test with: > > > > -smp 2,cores=3,sockets=2,maxcpus=6 > > > > to capture sparse APIC ID values that default > > AMD CPU has in above configuration. > > > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > > --- > > tests/bios-tables-test.c | 28 ++++++++++++++++++++++++++++ > > 1 file changed, 28 insertions(+) > > > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > > index 16d11aa..a7abe91 100644 > > --- a/tests/bios-tables-test.c > > +++ b/tests/bios-tables-test.c > > @@ -788,6 +788,32 @@ static void test_acpi_q35_tcg_bridge(void) > > free_test_data(&data); > > } > > > > +static void test_acpi_piix4_tcg_cphp(void) > > +{ > > + test_data data; > > + > > + memset(&data, 0, sizeof(data)); > > + data.machine = MACHINE_PC; > > + data.variant = ".cphp"; > > + test_acpi_one("-machine accel=tcg" > > + " -smp 2,cores=3,sockets=2,maxcpus=6", > > + &data); > > + free_test_data(&data); > > +} > > + > > +static void test_acpi_q35_tcg_cphp(void) > > +{ > > + test_data data; > > + > > + memset(&data, 0, sizeof(data)); > > + data.machine = MACHINE_Q35; > > + data.variant = ".cphp"; > > + test_acpi_one("-machine q35,accel=tcg" > > + " -smp 2,cores=3,sockets=2,maxcpus=6", > > + &data); > > + free_test_data(&data); > > +} > > + > > int main(int argc, char *argv[]) > > { > > const char *arch = qtest_get_arch(); > > @@ -804,6 +830,8 @@ int main(int argc, char *argv[]) > > qtest_add_func("acpi/piix4/tcg/bridge", > > test_acpi_piix4_tcg_bridge); qtest_add_func("acpi/q35/tcg", > > test_acpi_q35_tcg); qtest_add_func("acpi/q35/tcg/bridge", > > test_acpi_q35_tcg_bridge); > > + qtest_add_func("acpi/piix4/tcg/cpuhp", > > test_acpi_piix4_tcg_cphp); > > + qtest_add_func("acpi/q35/tcg/cpuhp", > > test_acpi_q35_tcg_cphp); } > > ret = g_test_run(); > > boot_sector_cleanup(disk); > > > > It looks good, but did you miss the .cphp variant expected files on > purpose? yes, it was in separate commit and I've dropped it before publishing tree, per Michael's suggestion not to post ACPI tables blobs since he updates them himself. I can regenerate blob and post it any time as commit on top of this if needed. > > > Reviewed-by: Marcel Apfelbaum <mar...@redhat.com> > Thanks, > Marcel Thanks!