Message ID | 1456495168-144510-2-git-send-email-imammedo@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 02/26/2016 03:59 PM, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > tests/acpi-test-data/pc/APIC.cpuhp_sparse | Bin 0 -> 168 bytes > tests/acpi-test-data/pc/DSDT.cpuhp_sparse | Bin 0 -> 5889 bytes > tests/acpi-test-data/pc/SRAT.cpuhp_sparse | Bin 0 -> 280 bytes > tests/bios-tables-test.c | 16 ++++++++++++++++ > 4 files changed, 16 insertions(+) > create mode 100644 tests/acpi-test-data/pc/APIC.cpuhp_sparse > create mode 100644 tests/acpi-test-data/pc/DSDT.cpuhp_sparse > create mode 100644 tests/acpi-test-data/pc/SRAT.cpuhp_sparse > > diff --git a/tests/acpi-test-data/pc/APIC.cpuhp_sparse b/tests/acpi-test-data/pc/APIC.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..d921ee1fa15fd6a549d8f12eb5f15682f5d5a8f3 > GIT binary patch > literal 168 > zcmXAh!4ZHU3<LuLgP=Xw3h>dF%=qzdbCzK#R)XfpBiYT(O;X*;O+@O-ds&YqpS2{; > z6lZXd=xv>zdpNz4*lUfG{4fZO5n3yB4pbBN)39~mfxvoghK(a9-2xZHV(ezz$1i^D > C5DftU > > literal 0 > HcmV?d00001 > > diff --git a/tests/acpi-test-data/pc/DSDT.cpuhp_sparse b/tests/acpi-test-data/pc/DSDT.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..0dafa1037da867521d69d0ee0a5d2df07ac5a419 > GIT binary patch > literal 5889 > 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 > > literal 0 > HcmV?d00001 > > diff --git a/tests/acpi-test-data/pc/SRAT.cpuhp_sparse b/tests/acpi-test-data/pc/SRAT.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..5377019cca32fb7a97111ea79d96d68a52627cd8 > GIT binary patch > literal 280 > zcmWFzatx7RWME*-aq@Te2v%^42yhMtiUEZfKx_~V!f+sf!DmF1XF}sMqw!hL_^fDr > gHe^1d2Ha*Sg9|QzT^-PYVDNz*rVzV2m@IZ00Pd>^0RR91 > > literal 0 > HcmV?d00001 > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 0a80ddf..15fa3c9 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -781,6 +781,20 @@ static void test_acpi_q35_tcg_bridge(void) > free_test_data(&data); > } > > +static void test_acpi_piix4_tcg_cpuhp_sparse(void) > +{ > + test_data data; > + > + memset(&data, 0, sizeof(data)); > + data.machine = MACHINE_PC; > + data.variant = ".cpuhp_sparse"; > + test_acpi_one("-machine accel=tcg" > + " -numa node -smp 1,sockets=2,cores=3,maxcpus=6", > + &data); > + free_test_data(&data); > +} > + > + > int main(int argc, char *argv[]) > { > const char *arch = qtest_get_arch(); > @@ -797,6 +811,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_sparse", > + test_acpi_piix4_tcg_cpuhp_sparse); > } > ret = g_test_run(); > boot_sector_cleanup(disk); > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
On 02/26/2016 03:59 PM, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > tests/acpi-test-data/pc/APIC.cpuhp_sparse | Bin 0 -> 168 bytes > tests/acpi-test-data/pc/DSDT.cpuhp_sparse | Bin 0 -> 5889 bytes > tests/acpi-test-data/pc/SRAT.cpuhp_sparse | Bin 0 -> 280 bytes > tests/bios-tables-test.c | 16 ++++++++++++++++ > 4 files changed, 16 insertions(+) > create mode 100644 tests/acpi-test-data/pc/APIC.cpuhp_sparse > create mode 100644 tests/acpi-test-data/pc/DSDT.cpuhp_sparse > create mode 100644 tests/acpi-test-data/pc/SRAT.cpuhp_sparse > > diff --git a/tests/acpi-test-data/pc/APIC.cpuhp_sparse b/tests/acpi-test-data/pc/APIC.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..d921ee1fa15fd6a549d8f12eb5f15682f5d5a8f3 > GIT binary patch > literal 168 > zcmXAh!4ZHU3<LuLgP=Xw3h>dF%=qzdbCzK#R)XfpBiYT(O;X*;O+@O-ds&YqpS2{; > z6lZXd=xv>zdpNz4*lUfG{4fZO5n3yB4pbBN)39~mfxvoghK(a9-2xZHV(ezz$1i^D > C5DftU > > literal 0 > HcmV?d00001 > > diff --git a/tests/acpi-test-data/pc/DSDT.cpuhp_sparse b/tests/acpi-test-data/pc/DSDT.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..0dafa1037da867521d69d0ee0a5d2df07ac5a419 > GIT binary patch > literal 5889 > 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 > > literal 0 > HcmV?d00001 > > diff --git a/tests/acpi-test-data/pc/SRAT.cpuhp_sparse b/tests/acpi-test-data/pc/SRAT.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..5377019cca32fb7a97111ea79d96d68a52627cd8 > GIT binary patch > literal 280 > zcmWFzatx7RWME*-aq@Te2v%^42yhMtiUEZfKx_~V!f+sf!DmF1XF}sMqw!hL_^fDr > gHe^1d2Ha*Sg9|QzT^-PYVDNz*rVzV2m@IZ00Pd>^0RR91 > > literal 0 > HcmV?d00001 > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 0a80ddf..15fa3c9 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -781,6 +781,20 @@ static void test_acpi_q35_tcg_bridge(void) > free_test_data(&data); > } > > +static void test_acpi_piix4_tcg_cpuhp_sparse(void) > +{ > + test_data data; > + > + memset(&data, 0, sizeof(data)); > + data.machine = MACHINE_PC; > + data.variant = ".cpuhp_sparse"; > + test_acpi_one("-machine accel=tcg" > + " -numa node -smp 1,sockets=2,cores=3,maxcpus=6", > + &data); > + free_test_data(&data); > +} > + > + > int main(int argc, char *argv[]) > { > const char *arch = qtest_get_arch(); > @@ -797,6 +811,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_sparse", > + test_acpi_piix4_tcg_cpuhp_sparse); > } > ret = g_test_run(); > boot_sector_cleanup(disk); > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
On Fri, Feb 26, 2016 at 02:59:19PM +0100, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Seems to give warnings likely because expected files changed upstream. I skipped this patch in series, pls rebase it. We also really need to find a better way to test this than just adding more variants that have to be updated each time. > --- > tests/acpi-test-data/pc/APIC.cpuhp_sparse | Bin 0 -> 168 bytes > tests/acpi-test-data/pc/DSDT.cpuhp_sparse | Bin 0 -> 5889 bytes > tests/acpi-test-data/pc/SRAT.cpuhp_sparse | Bin 0 -> 280 bytes > tests/bios-tables-test.c | 16 ++++++++++++++++ > 4 files changed, 16 insertions(+) > create mode 100644 tests/acpi-test-data/pc/APIC.cpuhp_sparse > create mode 100644 tests/acpi-test-data/pc/DSDT.cpuhp_sparse > create mode 100644 tests/acpi-test-data/pc/SRAT.cpuhp_sparse > > diff --git a/tests/acpi-test-data/pc/APIC.cpuhp_sparse b/tests/acpi-test-data/pc/APIC.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..d921ee1fa15fd6a549d8f12eb5f15682f5d5a8f3 > GIT binary patch > literal 168 > zcmXAh!4ZHU3<LuLgP=Xw3h>dF%=qzdbCzK#R)XfpBiYT(O;X*;O+@O-ds&YqpS2{; > z6lZXd=xv>zdpNz4*lUfG{4fZO5n3yB4pbBN)39~mfxvoghK(a9-2xZHV(ezz$1i^D > C5DftU > > literal 0 > HcmV?d00001 > > diff --git a/tests/acpi-test-data/pc/DSDT.cpuhp_sparse b/tests/acpi-test-data/pc/DSDT.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..0dafa1037da867521d69d0ee0a5d2df07ac5a419 > GIT binary patch > literal 5889 > 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 > > literal 0 > HcmV?d00001 > > diff --git a/tests/acpi-test-data/pc/SRAT.cpuhp_sparse b/tests/acpi-test-data/pc/SRAT.cpuhp_sparse > new file mode 100644 > index 0000000000000000000000000000000000000000..5377019cca32fb7a97111ea79d96d68a52627cd8 > GIT binary patch > literal 280 > zcmWFzatx7RWME*-aq@Te2v%^42yhMtiUEZfKx_~V!f+sf!DmF1XF}sMqw!hL_^fDr > gHe^1d2Ha*Sg9|QzT^-PYVDNz*rVzV2m@IZ00Pd>^0RR91 > > literal 0 > HcmV?d00001 > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 0a80ddf..15fa3c9 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -781,6 +781,20 @@ static void test_acpi_q35_tcg_bridge(void) > free_test_data(&data); > } > > +static void test_acpi_piix4_tcg_cpuhp_sparse(void) > +{ > + test_data data; > + > + memset(&data, 0, sizeof(data)); > + data.machine = MACHINE_PC; > + data.variant = ".cpuhp_sparse"; > + test_acpi_one("-machine accel=tcg" > + " -numa node -smp 1,sockets=2,cores=3,maxcpus=6", > + &data); > + free_test_data(&data); > +} > + > + > int main(int argc, char *argv[]) > { > const char *arch = qtest_get_arch(); > @@ -797,6 +811,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_sparse", > + test_acpi_piix4_tcg_cpuhp_sparse); > } > ret = g_test_run(); > boot_sector_cleanup(disk); > -- > 1.8.3.1
diff --git a/tests/acpi-test-data/pc/APIC.cpuhp_sparse b/tests/acpi-test-data/pc/APIC.cpuhp_sparse new file mode 100644 index 0000000000000000000000000000000000000000..d921ee1fa15fd6a549d8f12eb5f15682f5d5a8f3 GIT binary patch literal 168 zcmXAh!4ZHU3<LuLgP=Xw3h>dF%=qzdbCzK#R)XfpBiYT(O;X*;O+@O-ds&YqpS2{; z6lZXd=xv>zdpNz4*lUfG{4fZO5n3yB4pbBN)39~mfxvoghK(a9-2xZHV(ezz$1i^D C5DftU literal 0 HcmV?d00001 diff --git a/tests/acpi-test-data/pc/DSDT.cpuhp_sparse b/tests/acpi-test-data/pc/DSDT.cpuhp_sparse new file mode 100644 index 0000000000000000000000000000000000000000..0dafa1037da867521d69d0ee0a5d2df07ac5a419 GIT binary patch literal 5889 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 literal 0 HcmV?d00001 diff --git a/tests/acpi-test-data/pc/SRAT.cpuhp_sparse b/tests/acpi-test-data/pc/SRAT.cpuhp_sparse new file mode 100644 index 0000000000000000000000000000000000000000..5377019cca32fb7a97111ea79d96d68a52627cd8 GIT binary patch literal 280 zcmWFzatx7RWME*-aq@Te2v%^42yhMtiUEZfKx_~V!f+sf!DmF1XF}sMqw!hL_^fDr gHe^1d2Ha*Sg9|QzT^-PYVDNz*rVzV2m@IZ00Pd>^0RR91 literal 0 HcmV?d00001 diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 0a80ddf..15fa3c9 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -781,6 +781,20 @@ static void test_acpi_q35_tcg_bridge(void) free_test_data(&data); } +static void test_acpi_piix4_tcg_cpuhp_sparse(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".cpuhp_sparse"; + test_acpi_one("-machine accel=tcg" + " -numa node -smp 1,sockets=2,cores=3,maxcpus=6", + &data); + free_test_data(&data); +} + + int main(int argc, char *argv[]) { const char *arch = qtest_get_arch(); @@ -797,6 +811,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_sparse", + test_acpi_piix4_tcg_cpuhp_sparse); } ret = g_test_run(); boot_sector_cleanup(disk);
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- tests/acpi-test-data/pc/APIC.cpuhp_sparse | Bin 0 -> 168 bytes tests/acpi-test-data/pc/DSDT.cpuhp_sparse | Bin 0 -> 5889 bytes tests/acpi-test-data/pc/SRAT.cpuhp_sparse | Bin 0 -> 280 bytes tests/bios-tables-test.c | 16 ++++++++++++++++ 4 files changed, 16 insertions(+) create mode 100644 tests/acpi-test-data/pc/APIC.cpuhp_sparse create mode 100644 tests/acpi-test-data/pc/DSDT.cpuhp_sparse create mode 100644 tests/acpi-test-data/pc/SRAT.cpuhp_sparse