On Sun, 17 Jul 2016 19:53:09 +0300 Marcel Apfelbaum <mar...@redhat.com> wrote:
> Add an ivshmem device with 1G shared memory to > pxb in order to check the ACPI code of 64bit MMIO allocation. > > Suggested-by: Igor Mammedov <imamm...@redhat.com> > Signed-off-by: Marcel Apfelbaum <mar...@redhat.com> > Tested-by: Laszlo Ersek <ler...@redhat.com> Reviewed-by: Igor Mammedov <imamm...@redhat.com> > --- > tests/bios-tables-test.c | 37 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index de4019e..b23c6b0 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -864,6 +864,41 @@ static void test_acpi_piix4_tcg_ipmi(void) > free_test_data(&data); > } > > +static void test_acpi_piix4_tcg_pxb(void) > +{ > + test_data data; > + > + memset(&data, 0, sizeof(data)); > + data.machine = MACHINE_PC; > + data.variant = ".pxb"; > + data.required_struct_types = base_required_struct_types; > + data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > + test_acpi_one("-machine accel=tcg" > + " -device pxb,id=pxb,bus_nr=0x80,bus=pci.0" > + " -object > memory-backend-file,size=1G,mem-path=/tmp/shmem,share,id=mb" > + " -device ivshmem-plain,memdev=mb,bus=pxb", > + &data); > + free_test_data(&data); > +} > + > +static void test_acpi_q35_tcg_pxb_pcie(void) > +{ > + test_data data; > + > + memset(&data, 0, sizeof(data)); > + data.machine = MACHINE_Q35; > + data.variant = ".pxb_pcie"; > + data.required_struct_types = base_required_struct_types; > + data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types); > + test_acpi_one("-machine q35,accel=tcg" > + " -device pxb-pcie,id=pxb,bus_nr=0x80,bus=pcie.0" > + " -device ioh3420,id=rp,bus=pxb,slot=1" > + " -object > memory-backend-file,size=1G,mem-path=/tmp/shmem,share,id=mb" > + " -device ivshmem-plain,memdev=mb,bus=rp", > + &data); > + free_test_data(&data); > +} > + > int main(int argc, char *argv[]) > { > const char *arch = qtest_get_arch(); > @@ -884,6 +919,8 @@ int main(int argc, char *argv[]) > qtest_add_func("acpi/q35/tcg/ipmi", test_acpi_q35_tcg_ipmi); > qtest_add_func("acpi/piix4/tcg/cpuhp", test_acpi_piix4_tcg_cphp); > qtest_add_func("acpi/q35/tcg/cpuhp", test_acpi_q35_tcg_cphp); > + qtest_add_func("acpi/piix4/tcg/pxb", test_acpi_piix4_tcg_pxb); > + qtest_add_func("acpi/q35/tcg/pxb-pcie", test_acpi_q35_tcg_pxb_pcie); > } > ret = g_test_run(); > boot_sector_cleanup(disk);