432cb7
From 341715473c2a71f11a3888420a0caecf27ed4eb5 Mon Sep 17 00:00:00 2001
432cb7
From: Jon Maloy <jmaloy@redhat.com>
432cb7
Date: Wed, 30 Mar 2022 14:52:34 -0400
432cb7
Subject: [PATCH 11/18] tests: acpi: add SLIC table test
432cb7
432cb7
RH-Author: Jon Maloy <jmaloy@redhat.com>
432cb7
RH-MergeRequest: 141: acpi: fix QEMU crash when started with SLIC table
432cb7
RH-Commit: [3/10] baac9b82c16a50eb4640fd7146775c9d507c7b21 (jmaloy/qemu-kvm)
432cb7
RH-Bugzilla: 2062611
432cb7
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
432cb7
432cb7
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062611
432cb7
Upstream: Merged
432cb7
432cb7
commit 11edfabee443b149468a82b5efc88c96d1d259ec
432cb7
Author: Igor Mammedov <imammedo@redhat.com>
432cb7
Date:   Mon Dec 27 14:31:19 2021 -0500
432cb7
432cb7
    tests: acpi: add SLIC table test
432cb7
432cb7
    When user uses '-acpitable' to add SLIC table, some ACPI
432cb7
    tables (FADT) will change its 'Oem ID'/'Oem Table ID' fields to
432cb7
    match that of SLIC. Test makes sure thati QEMU handles
432cb7
    those fields correctly when SLIC table is added with
432cb7
    '-acpitable' option.
432cb7
432cb7
    Conflicts: tests/qtest/bios-tables-test.c
432cb7
     due to missing 39d7554b2009 ("tests/acpi: add test case for VIOT")
432cb7
432cb7
    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
432cb7
    Message-Id: <20211227193120.1084176-4-imammedo@redhat.com>
432cb7
    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
432cb7
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
432cb7
432cb7
(cherry picked from commit 11edfabee443b149468a82b5efc88c96d1d259ec)
432cb7
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
432cb7
---
432cb7
 tests/qtest/bios-tables-test.c | 15 +++++++++++++++
432cb7
 1 file changed, 15 insertions(+)
432cb7
432cb7
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
432cb7
index 16d8304cde..e159b71136 100644
432cb7
--- a/tests/qtest/bios-tables-test.c
432cb7
+++ b/tests/qtest/bios-tables-test.c
432cb7
@@ -1467,6 +1467,20 @@ static void test_acpi_virt_tcg(void)
432cb7
     free_test_data(&data);
432cb7
 }
432cb7
 
432cb7
+static void test_acpi_q35_slic(void)
432cb7
+{
432cb7
+    test_data data = {
432cb7
+        .machine = MACHINE_Q35,
432cb7
+        .variant = ".slic",
432cb7
+    };
432cb7
+
432cb7
+    test_acpi_one("-acpitable sig=SLIC,oem_id='CRASH ',oem_table_id='ME',"
432cb7
+                  "oem_rev=00002210,asl_compiler_id='qemu',"
432cb7
+                  "asl_compiler_rev=00000000,data=/dev/null",
432cb7
+                  &data);
432cb7
+    free_test_data(&data);
432cb7
+}
432cb7
+
432cb7
 static void test_oem_fields(test_data *data)
432cb7
 {
432cb7
     int i;
432cb7
@@ -1641,6 +1655,7 @@ int main(int argc, char *argv[])
432cb7
             qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic);
432cb7
             qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar);
432cb7
         }
432cb7
+        qtest_add_func("acpi/q35/slic", test_acpi_q35_slic);
432cb7
     } else if (strcmp(arch, "aarch64") == 0) {
432cb7
         if (has_tcg) {
432cb7
             qtest_add_func("acpi/virt", test_acpi_virt_tcg);
432cb7
-- 
432cb7
2.27.0
432cb7