On Fri, Dec 3, 2021 at 12:39 AM Eric DeVolder <eric.devol...@oracle.com> wrote:
>
> This change implements the test suite checks for the ERST table.
>
> Signed-off-by: Eric DeVolder <eric.devol...@oracle.com>
Reviewed-by: Ani Sinha <a...@anisinha.ca>
> ---
> tests/qtest/bios-tables-test.c | 56
> ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 56 insertions(+)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 2588741..2f073e6 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1446,6 +1446,57 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)
> test_acpi_tcg_acpi_hmat(MACHINE_PC);
> }
>
> +static void test_acpi_erst(const char *machine)
> +{
> + gchar *tmp_path = g_dir_make_tmp("qemu-test-erst.XXXXXX", NULL);
> + gchar *params;
> + test_data data;
> +
> + memset(&data, 0, sizeof(data));
> + data.machine = machine;
> + data.variant = ".acpierst";
> + params = g_strdup_printf(
> + " -object memory-backend-file,id=erstnvram,"
> + "mem-path=%s,size=0x10000,share=on"
> + " -device acpi-erst,memdev=erstnvram", tmp_path);
> + test_acpi_one(params, &data);
> + free_test_data(&data);
> + g_free(params);
> + g_assert(g_rmdir(tmp_path) == 0);
> + g_free(tmp_path);
> +}
> +
> +static void test_acpi_piix4_acpi_erst(void)
> +{
> + test_acpi_erst(MACHINE_PC);
> +}
> +
> +static void test_acpi_q35_acpi_erst(void)
> +{
> + test_acpi_erst(MACHINE_Q35);
> +}
> +
> +static void test_acpi_microvm_acpi_erst(void)
> +{
> + gchar *tmp_path = g_dir_make_tmp("qemu-test-erst.XXXXXX", NULL);
> + gchar *params;
> + test_data data;
> +
> + test_acpi_microvm_prepare(&data);
> + data.variant = ".pcie";
> + data.tcg_only = true; /* need constant host-phys-bits */
> + params = g_strdup_printf(" -machine microvm,"
> + "acpi=on,ioapic2=off,rtc=off,pcie=on"
> + " -object memory-backend-file,id=erstnvram,"
> + "mem-path=%s,size=0x10000,share=on"
> + " -device acpi-erst,memdev=erstnvram", tmp_path);
> + test_acpi_one(params, &data);
> + g_free(params);
> + g_assert(g_rmdir(tmp_path) == 0);
> + g_free(tmp_path);
> + free_test_data(&data);
> +}
> +
> static void test_acpi_virt_tcg(void)
> {
> test_data data = {
> @@ -1624,6 +1675,8 @@ 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/piix4/acpierst", test_acpi_piix4_acpi_erst);
> + qtest_add_func("acpi/q35/acpierst", test_acpi_q35_acpi_erst);
> qtest_add_func("acpi/microvm", test_acpi_microvm_tcg);
> qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg);
> qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg);
> @@ -1639,6 +1692,9 @@ int main(int argc, char *argv[])
> qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic);
> qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar);
> }
> + if (strcmp(arch, "x86_64") == 0) {
> + qtest_add_func("acpi/microvm/acpierst",
> test_acpi_microvm_acpi_erst);
> + }
> } else if (strcmp(arch, "aarch64") == 0) {
> if (has_tcg) {
> qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> --
> 1.8.3.1
>
