| Message ID | 20200707125356.32450-20-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | microvm: add acpi support | expand |
On Tue, 7 Jul 2020 14:53:55 +0200 Gerd Hoffmann <kraxel@redhat.com> wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/qtest/bios-tables-test.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > index 24b715dce780..b5b98d5c0742 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -1007,6 +1007,20 @@ static void test_acpi_virt_tcg_memhp(void) > > } > > +static void test_acpi_microvm_tcg(void) > +{ > + test_data data; > + > + memset(&data, 0, sizeof(data)); > + data.machine = "microvm"; > + data.required_struct_types = base_required_struct_types; > + data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); I vaguely recall this belongs to smbios tables, does actually microvm provide them? > + data.blkdev = "virtio-blk-device"; > + test_acpi_one(" -machine microvm,acpi=on,rtc=off", > + &data); > + free_test_data(&data); > +} > + > static void test_acpi_virt_tcg_numamem(void) > { > test_data data = { > @@ -1118,6 +1132,7 @@ int main(int argc, char *argv[]) > qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); > qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hmat); > qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hmat); > + qtest_add_func("acpi/microvm", test_acpi_microvm_tcg); > } else if (strcmp(arch, "aarch64") == 0) { > qtest_add_func("acpi/virt", test_acpi_virt_tcg); > qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
Hi, > > + data.required_struct_types = base_required_struct_types; > > + data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > I vaguely recall this belongs to smbios tables, does actually microvm provide them? Checked. Yes, it tests smbios tables. seabios generates something in case qemu doesn't provide smbios tables, so the test works. We don't actually test qemu though, so it probably makes sense to drop that for microvm until we actually generate smbios tables. Should we? take care, Gerd
On Thu, 16 Jul 2020 11:10:35 +0200 Gerd Hoffmann <kraxel@redhat.com> wrote: > Hi, > > > > + data.required_struct_types = base_required_struct_types; > > > + data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > > I vaguely recall this belongs to smbios tables, does actually microvm provide them? > > Checked. Yes, it tests smbios tables. > > seabios generates something in case qemu doesn't provide smbios tables, > so the test works. We don't actually test qemu though, so it probably > makes sense to drop that for microvm until we actually generate smbios > tables. Should we? if dropping it just works, then yes, otherwise I wouldn't bother. > > take care, > Gerd >
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 24b715dce780..b5b98d5c0742 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1007,6 +1007,20 @@ static void test_acpi_virt_tcg_memhp(void) } +static void test_acpi_microvm_tcg(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = "microvm"; + data.required_struct_types = base_required_struct_types; + data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); + data.blkdev = "virtio-blk-device"; + test_acpi_one(" -machine microvm,acpi=on,rtc=off", + &data); + free_test_data(&data); +} + static void test_acpi_virt_tcg_numamem(void) { test_data data = { @@ -1118,6 +1132,7 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hmat); qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hmat); + qtest_add_func("acpi/microvm", test_acpi_microvm_tcg); } else if (strcmp(arch, "aarch64") == 0) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/qtest/bios-tables-test.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)