From 9bd0e32a194826facff4e12d2cc8ba027dc107cb Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:37 -0400
Subject: [PATCH 01/10] tests: Rename TestState to TPMTestState

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-2-stefanb@linux.ibm.com
---
 tests/qtest/bios-tables-test.c    | 2 +-
 tests/qtest/tpm-crb-test.c        | 4 ++--
 tests/qtest/tpm-emu.c             | 6 +++---
 tests/qtest/tpm-emu.h             | 6 +++---
 tests/qtest/tpm-tis-device-test.c | 2 +-
 tests/qtest/tpm-tis-test.c        | 2 +-
 tests/qtest/tpm-tis-util.c        | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 51d3a4e239..a622f91a37 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1098,7 +1098,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
     gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX",
                                           machine, tpm_if);
     char *tmp_path = g_dir_make_tmp(tmp_dir_name, NULL);
-    TestState test;
+    TPMTestState test;
     test_data data;
     GThread *thread;
     char *args, *variant = g_strdup_printf(".%s", tpm_if);
diff --git a/tests/qtest/tpm-crb-test.c b/tests/qtest/tpm-crb-test.c
index ed533900d1..50936f1482 100644
--- a/tests/qtest/tpm-crb-test.c
+++ b/tests/qtest/tpm-crb-test.c
@@ -26,7 +26,7 @@ uint64_t tpm_tis_base_addr = TPM_TIS_ADDR_BASE;
 
 static void tpm_crb_test(const void *data)
 {
-    const TestState *s = data;
+    const TPMTestState *s = data;
     uint32_t intfid = readl(TPM_CRB_ADDR_BASE + A_CRB_INTF_ID);
     uint32_t csize = readl(TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_SIZE);
     uint64_t caddr = readq(TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_LADDR);
@@ -145,7 +145,7 @@ int main(int argc, char **argv)
     int ret;
     char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-crb-test.XXXXXX", NULL);
     GThread *thread;
-    TestState test;
+    TPMTestState test;
 
     module_call_init(MODULE_INIT_QOM);
     g_test_init(&argc, &argv, NULL);
diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
index 2e8eb7b94f..b9cddcc240 100644
--- a/tests/qtest/tpm-emu.c
+++ b/tests/qtest/tpm-emu.c
@@ -18,7 +18,7 @@
 #include "qapi/error.h"
 #include "tpm-emu.h"
 
-void tpm_emu_test_wait_cond(TestState *s)
+void tpm_emu_test_wait_cond(TPMTestState *s)
 {
     gint64 end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND;
 
@@ -36,7 +36,7 @@ void tpm_emu_test_wait_cond(TestState *s)
 
 static void *tpm_emu_tpm_thread(void *data)
 {
-    TestState *s = data;
+    TPMTestState *s = data;
     QIOChannel *ioc = s->tpm_ioc;
 
     s->tpm_msg = g_new(struct tpm_hdr, 1);
@@ -71,7 +71,7 @@ static void *tpm_emu_tpm_thread(void *data)
 
 void *tpm_emu_ctrl_thread(void *data)
 {
-    TestState *s = data;
+    TPMTestState *s = data;
     QIOChannelSocket *lioc = qio_channel_socket_new();
     QIOChannel *ioc;
 
diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h
index 73f3bed0c4..b066ad63fb 100644
--- a/tests/qtest/tpm-emu.h
+++ b/tests/qtest/tpm-emu.h
@@ -26,7 +26,7 @@ struct tpm_hdr {
     char buffer[];
 } QEMU_PACKED;
 
-typedef struct TestState {
+typedef struct TPMTestState {
     GMutex data_mutex;
     GCond data_cond;
     bool data_cond_signal;
@@ -34,9 +34,9 @@ typedef struct TestState {
     QIOChannel *tpm_ioc;
     GThread *emu_tpm_thread;
     struct tpm_hdr *tpm_msg;
-} TestState;
+} TPMTestState;
 
-void tpm_emu_test_wait_cond(TestState *s);
+void tpm_emu_test_wait_cond(TPMTestState *s);
 void *tpm_emu_ctrl_thread(void *data);
 
 #endif /* TESTS_TPM_EMU_H */
diff --git a/tests/qtest/tpm-tis-device-test.c b/tests/qtest/tpm-tis-device-test.c
index 63ed36440f..d36ae20243 100644
--- a/tests/qtest/tpm-tis-device-test.c
+++ b/tests/qtest/tpm-tis-device-test.c
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
 {
     char *tmp_path = g_dir_make_tmp("qemu-tpm-tis-device-test.XXXXXX", NULL);
     GThread *thread;
-    TestState test;
+    TPMTestState test;
     char *args;
     int ret;
 
diff --git a/tests/qtest/tpm-tis-test.c b/tests/qtest/tpm-tis-test.c
index 79ffbc943e..6fee4779ea 100644
--- a/tests/qtest/tpm-tis-test.c
+++ b/tests/qtest/tpm-tis-test.c
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
     int ret;
     char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-tis-test.XXXXXX", NULL);
     GThread *thread;
-    TestState test;
+    TPMTestState test;
 
     module_call_init(MODULE_INIT_QOM);
     g_test_init(&argc, &argv, NULL);
diff --git a/tests/qtest/tpm-tis-util.c b/tests/qtest/tpm-tis-util.c
index 9aff503fd8..939893bf01 100644
--- a/tests/qtest/tpm-tis-util.c
+++ b/tests/qtest/tpm-tis-util.c
@@ -373,7 +373,7 @@ void tpm_tis_test_check_access_reg_release(const void *data)
  */
 void tpm_tis_test_check_transmit(const void *data)
 {
-    const TestState *s = data;
+    const TPMTestState *s = data;
     uint8_t access;
     uint32_t sts;
     uint16_t bcount;

From 09b20a148afeebe2084c92672d3acaa26a371296 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:38 -0400
Subject: [PATCH 02/10] tests: Add tpm_version field to TPMTestState and fill
 it

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-3-stefanb@linux.ibm.com
---
 tests/qtest/bios-tables-test.c    |  5 +++--
 tests/qtest/tpm-crb-test.c        |  1 +
 tests/qtest/tpm-emu.c             | 13 ++++++++++---
 tests/qtest/tpm-emu.h             |  8 ++++++++
 tests/qtest/tpm-tis-device-test.c |  1 +
 tests/qtest/tpm-tis-test.c        |  1 +
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index a622f91a37..93c9d306b5 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1092,7 +1092,7 @@ static void test_acpi_piix4_tcg_numamem(void)
 uint64_t tpm_tis_base_addr;
 
 static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
-                              uint64_t base)
+                              uint64_t base, enum TPMVersion tpm_version)
 {
 #ifdef CONFIG_TPM
     gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX",
@@ -1113,6 +1113,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
     g_mutex_init(&test.data_mutex);
     g_cond_init(&test.data_cond);
     test.data_cond_signal = false;
+    test.tpm_version = tpm_version;
 
     thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
     tpm_emu_test_wait_cond(&test);
@@ -1145,7 +1146,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
 
 static void test_acpi_q35_tcg_tpm_tis(void)
 {
-    test_acpi_tcg_tpm("q35", "tis", 0xFED40000);
+    test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_2_0);
 }
 
 static void test_acpi_tcg_dimm_pxm(const char *machine)
diff --git a/tests/qtest/tpm-crb-test.c b/tests/qtest/tpm-crb-test.c
index 50936f1482..7b94453390 100644
--- a/tests/qtest/tpm-crb-test.c
+++ b/tests/qtest/tpm-crb-test.c
@@ -156,6 +156,7 @@ int main(int argc, char **argv)
     g_mutex_init(&test.data_mutex);
     g_cond_init(&test.data_cond);
     test.data_cond_signal = false;
+    test.tpm_version = TPM_VERSION_2_0;
 
     thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
     tpm_emu_test_wait_cond(&test);
diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
index b9cddcc240..8baf49eafd 100644
--- a/tests/qtest/tpm-emu.c
+++ b/tests/qtest/tpm-emu.c
@@ -56,9 +56,16 @@ static void *tpm_emu_tpm_thread(void *data)
         s->tpm_msg->code = be32_to_cpu(s->tpm_msg->code);
 
         /* reply error */
-        s->tpm_msg->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS);
-        s->tpm_msg->len = cpu_to_be32(sizeof(struct tpm_hdr));
-        s->tpm_msg->code = cpu_to_be32(TPM_RC_FAILURE);
+        switch (s->tpm_version) {
+        case TPM_VERSION_2_0:
+            s->tpm_msg->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS);
+            s->tpm_msg->len = cpu_to_be32(sizeof(struct tpm_hdr));
+            s->tpm_msg->code = cpu_to_be32(TPM_RC_FAILURE);
+            break;
+        default:
+            g_debug("unsupport TPM version %u", s->tpm_version);
+            g_assert_not_reached();
+        }
         qio_channel_write(ioc, (char *)s->tpm_msg, be32_to_cpu(s->tpm_msg->len),
                           &error_abort);
     }
diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h
index b066ad63fb..610519883a 100644
--- a/tests/qtest/tpm-emu.h
+++ b/tests/qtest/tpm-emu.h
@@ -18,6 +18,7 @@
 
 #include "qemu/sockets.h"
 #include "io/channel.h"
+#include "sysemu/tpm.h"
 
 struct tpm_hdr {
     uint16_t tag;
@@ -26,6 +27,12 @@ struct tpm_hdr {
     char buffer[];
 } QEMU_PACKED;
 
+#ifndef CONFIG_TPM
+enum TPMVersion {
+    TPM_VERSION_2_0 = 2,
+};
+#endif
+
 typedef struct TPMTestState {
     GMutex data_mutex;
     GCond data_cond;
@@ -34,6 +41,7 @@ typedef struct TPMTestState {
     QIOChannel *tpm_ioc;
     GThread *emu_tpm_thread;
     struct tpm_hdr *tpm_msg;
+    enum TPMVersion tpm_version;
 } TPMTestState;
 
 void tpm_emu_test_wait_cond(TPMTestState *s);
diff --git a/tests/qtest/tpm-tis-device-test.c b/tests/qtest/tpm-tis-device-test.c
index d36ae20243..3ddefb51ec 100644
--- a/tests/qtest/tpm-tis-device-test.c
+++ b/tests/qtest/tpm-tis-device-test.c
@@ -46,6 +46,7 @@ int main(int argc, char **argv)
     g_mutex_init(&test.data_mutex);
     g_cond_init(&test.data_cond);
     test.data_cond_signal = false;
+    test.tpm_version = TPM_VERSION_2_0;
 
     thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
     tpm_emu_test_wait_cond(&test);
diff --git a/tests/qtest/tpm-tis-test.c b/tests/qtest/tpm-tis-test.c
index 6fee4779ea..a4a25ba745 100644
--- a/tests/qtest/tpm-tis-test.c
+++ b/tests/qtest/tpm-tis-test.c
@@ -40,6 +40,7 @@ int main(int argc, char **argv)
     g_mutex_init(&test.data_mutex);
     g_cond_init(&test.data_cond);
     test.data_cond_signal = false;
+    test.tpm_version = TPM_VERSION_2_0;
 
     thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
     tpm_emu_test_wait_cond(&test);

From a003dbc69e92b416dafa2b0d988c6ca8cff85ae4 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:39 -0400
Subject: [PATCH 03/10] tests: acpi: Prepare for renaming of TPM2 related ACPI
 files

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-4-stefanb@linux.ibm.com
---
 tests/data/acpi/q35/DSDT.tis.tpm2           | 0
 tests/data/acpi/q35/TPM2.tis.tpm2           | 0
 tests/qtest/bios-tables-test-allowed-diff.h | 2 ++
 3 files changed, 2 insertions(+)
 create mode 100644 tests/data/acpi/q35/DSDT.tis.tpm2
 create mode 100644 tests/data/acpi/q35/TPM2.tis.tpm2

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..b301b8fa06 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,3 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/TPM2.tis.tpm2",

From bf8443ef99125e3c0f2511572af6de552287a734 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:40 -0400
Subject: [PATCH 04/10] tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-5-stefanb@linux.ibm.com
---
 tests/qtest/bios-tables-test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 93c9d306b5..4ccbe56158 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1101,7 +1101,8 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
     TPMTestState test;
     test_data data;
     GThread *thread;
-    char *args, *variant = g_strdup_printf(".%s", tpm_if);
+    const char *suffix = tpm_version == TPM_VERSION_2_0 ? "tpm2" : "tpm12";
+    char *args, *variant = g_strdup_printf(".%s.%s", tpm_if, suffix);
 
     tpm_tis_base_addr = base;
 

From 4a42dda7c13498dfdc3e34575606e35109f22300 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:41 -0400
Subject: [PATCH 05/10] tests: acpi: tpm2: Add the renamed ACPI files and drop
 old ones

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-6-stefanb@linux.ibm.com
---
 tests/data/acpi/q35/DSDT.tis                | Bin 8894 -> 0 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8894 bytes
 tests/data/acpi/q35/TPM2.tis                | Bin 76 -> 0 bytes
 tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   2 --
 5 files changed, 2 deletions(-)
 delete mode 100644 tests/data/acpi/q35/DSDT.tis
 delete mode 100644 tests/data/acpi/q35/TPM2.tis

diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis
deleted file mode 100644
index d1433e3c14570bbd17b029a9aec6bc53134c3b7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8894
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

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d1433e3c14570bbd17b029a9aec6bc53134c3b7d 100644
GIT binary patch
literal 8894
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

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/q35/TPM2.tis b/tests/data/acpi/q35/TPM2.tis
deleted file mode 100644
index fe0f05987be40f1c1742ae189df7821adc522fc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmWFu@HO&bU|?Vob@F%i2v%^42yj+VP*7lGU|;~TK{NvrU_)X<m>?DZ*+Faoa$E-i

diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fe0f05987be40f1c1742ae189df7821adc522fc0 100644
GIT binary patch
literal 76
zcmWFu@HO&bU|?Vob@F%i2v%^42yj+VP*7lGU|;~TK{NvrU_)X<m>?DZ*+Faoa$E-i

literal 0
HcmV?d00001

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index b301b8fa06..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,3 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/TPM2.tis.tpm2",

From 044d55dcd47cbb9f03db255cdad1586f17c8a2da Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:42 -0400
Subject: [PATCH 06/10] tests: tpm: Create TPM 1.2 response in TPM emulator

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-7-stefanb@linux.ibm.com
---
 tests/qtest/tpm-emu.c | 5 +++++
 tests/qtest/tpm-emu.h | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
index 8baf49eafd..32c704194b 100644
--- a/tests/qtest/tpm-emu.c
+++ b/tests/qtest/tpm-emu.c
@@ -62,6 +62,11 @@ static void *tpm_emu_tpm_thread(void *data)
             s->tpm_msg->len = cpu_to_be32(sizeof(struct tpm_hdr));
             s->tpm_msg->code = cpu_to_be32(TPM_RC_FAILURE);
             break;
+        case TPM_VERSION_1_2:
+            s->tpm_msg->tag = cpu_to_be16(TPM_TAG_RSP_COMMAND);
+            s->tpm_msg->len = cpu_to_be32(sizeof(struct tpm_hdr));
+            s->tpm_msg->code = cpu_to_be32(TPM_FAIL);
+            break;
         default:
             g_debug("unsupport TPM version %u", s->tpm_version);
             g_assert_not_reached();
diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h
index 610519883a..fcb5d7a1d6 100644
--- a/tests/qtest/tpm-emu.h
+++ b/tests/qtest/tpm-emu.h
@@ -16,6 +16,9 @@
 #define TPM_RC_FAILURE 0x101
 #define TPM2_ST_NO_SESSIONS 0x8001
 
+#define TPM_FAIL 9
+#define TPM_TAG_RSP_COMMAND 0xc4
+
 #include "qemu/sockets.h"
 #include "io/channel.h"
 #include "sysemu/tpm.h"
@@ -29,6 +32,7 @@ struct tpm_hdr {
 
 #ifndef CONFIG_TPM
 enum TPMVersion {
+    TPM_VERSION_1_2 = 1,
     TPM_VERSION_2_0 = 2,
 };
 #endif

From 343776a68528a132ff9068bb0731f584b38ff2ea Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:43 -0400
Subject: [PATCH 07/10] tests: acpi: prepare for new TPM 1.2 related tables

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-8-stefanb@linux.ibm.com
---
 tests/data/acpi/q35/DSDT.tis.tpm12          | 0
 tests/data/acpi/q35/TCPA.tis.tpm12          | 0
 tests/qtest/bios-tables-test-allowed-diff.h | 2 ++
 3 files changed, 2 insertions(+)
 create mode 100644 tests/data/acpi/q35/DSDT.tis.tpm12
 create mode 100644 tests/data/acpi/q35/TCPA.tis.tpm12

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..fb093b32b9 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,3 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT.tis.tpm12",
+"tests/data/acpi/q35/TCPA.tis.tpm12",

From 58edc32cfc796d56336a283aace5bdb5de25dc80 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:44 -0400
Subject: [PATCH 08/10] tests: Use QMP to check whether a TPM device model is
 available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use QMP to check whether a given TPM device model is available and if it
is not the case then do not register the tests that require it.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20210802215246.1433175-9-stefanb@linux.ibm.com
---
 tests/qtest/bios-tables-test.c |  8 +++----
 tests/qtest/tpm-emu.c          | 38 ++++++++++++++++++++++++++++++++++
 tests/qtest/tpm-emu.h          |  2 ++
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 4ccbe56158..89bf55c838 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1094,7 +1094,6 @@ uint64_t tpm_tis_base_addr;
 static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
                               uint64_t base, enum TPMVersion tpm_version)
 {
-#ifdef CONFIG_TPM
     gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX",
                                           machine, tpm_if);
     char *tmp_path = g_dir_make_tmp(tmp_dir_name, NULL);
@@ -1140,9 +1139,6 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
     g_free(tmp_dir_name);
     g_free(args);
     free_test_data(&data);
-#else
-    g_test_skip("TPM disabled");
-#endif
 }
 
 static void test_acpi_q35_tcg_tpm_tis(void)
@@ -1518,7 +1514,9 @@ int main(int argc, char *argv[])
             return ret;
         }
         qtest_add_func("acpi/q35/oem-fields", test_acpi_oem_fields_q35);
-        qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_tis);
+        if (tpm_model_is_available("-machine q35", "tpm-tis")) {
+            qtest_add_func("acpi/q35/tpm2-tis", test_acpi_q35_tcg_tpm_tis);
+        }
         qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
         qtest_add_func("acpi/oem-fields", test_acpi_oem_fields_pc);
         qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
index 32c704194b..2994d1cf42 100644
--- a/tests/qtest/tpm-emu.c
+++ b/tests/qtest/tpm-emu.c
@@ -16,6 +16,8 @@
 #include "backends/tpm/tpm_ioctl.h"
 #include "io/channel-socket.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qstring.h"
 #include "tpm-emu.h"
 
 void tpm_emu_test_wait_cond(TPMTestState *s)
@@ -192,3 +194,39 @@ void *tpm_emu_ctrl_thread(void *data)
     object_unref(OBJECT(lioc));
     return NULL;
 }
+
+bool tpm_model_is_available(const char *args, const char *tpm_if)
+{
+    QTestState *qts;
+    QDict *rsp_tpm;
+    bool ret = false;
+
+    qts = qtest_init(args);
+    if (!qts) {
+        return false;
+    }
+
+    rsp_tpm = qtest_qmp(qts, "{ 'execute': 'query-tpm'}");
+    if (!qdict_haskey(rsp_tpm, "error")) {
+        QDict *rsp_models = qtest_qmp(qts,
+                                      "{ 'execute': 'query-tpm-models'}");
+        if (qdict_haskey(rsp_models, "return")) {
+            QList *models = qdict_get_qlist(rsp_models, "return");
+            QListEntry *e;
+
+            QLIST_FOREACH_ENTRY(models, e) {
+                QString *s = qobject_to(QString, qlist_entry_obj(e));
+                const char *ename = qstring_get_str(s);
+                if (!strcmp(ename, tpm_if)) {
+                    ret = true;
+                    break;
+                }
+            }
+        }
+        qobject_unref(rsp_models);
+    }
+    qobject_unref(rsp_tpm);
+    qtest_quit(qts);
+
+    return ret;
+}
diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h
index fcb5d7a1d6..c33d99af37 100644
--- a/tests/qtest/tpm-emu.h
+++ b/tests/qtest/tpm-emu.h
@@ -22,6 +22,7 @@
 #include "qemu/sockets.h"
 #include "io/channel.h"
 #include "sysemu/tpm.h"
+#include "libqos/libqtest.h"
 
 struct tpm_hdr {
     uint16_t tag;
@@ -50,5 +51,6 @@ typedef struct TPMTestState {
 
 void tpm_emu_test_wait_cond(TPMTestState *s);
 void *tpm_emu_ctrl_thread(void *data);
+bool tpm_model_is_available(const char *args, const char *tpm_if);
 
 #endif /* TESTS_TPM_EMU_H */

From 33660128d41722ea599afcfa85f1ab6496650c70 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:45 -0400
Subject: [PATCH 09/10] tests: acpi: Add test cases for TPM 1.2 with TCPA table

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-10-stefanb@linux.ibm.com
---
 tests/qtest/bios-tables-test.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 89bf55c838..4f11d03055 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1141,11 +1141,16 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
     free_test_data(&data);
 }
 
-static void test_acpi_q35_tcg_tpm_tis(void)
+static void test_acpi_q35_tcg_tpm2_tis(void)
 {
     test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_2_0);
 }
 
+static void test_acpi_q35_tcg_tpm12_tis(void)
+{
+    test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_1_2);
+}
+
 static void test_acpi_tcg_dimm_pxm(const char *machine)
 {
     test_data data;
@@ -1515,7 +1520,8 @@ int main(int argc, char *argv[])
         }
         qtest_add_func("acpi/q35/oem-fields", test_acpi_oem_fields_q35);
         if (tpm_model_is_available("-machine q35", "tpm-tis")) {
-            qtest_add_func("acpi/q35/tpm2-tis", test_acpi_q35_tcg_tpm_tis);
+            qtest_add_func("acpi/q35/tpm2-tis", test_acpi_q35_tcg_tpm2_tis);
+            qtest_add_func("acpi/q35/tpm12-tis", test_acpi_q35_tcg_tpm12_tis);
         }
         qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
         qtest_add_func("acpi/oem-fields", test_acpi_oem_fields_pc);

From 75539b886ade79a30365badf95831bd5b3068342 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:46 -0400
Subject: [PATCH 10/10] tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs

The TCPA.tis.tpm12 file contains the following:

[000h 0000   4]                    Signature : "TCPA"    [Trusted Computing Platform Alliance table]
[004h 0004   4]                 Table Length : 00000032
[008h 0008   1]                     Revision : 02
[009h 0009   1]                     Checksum : 32
[00Ah 0010   6]                       Oem ID : "BOCHS "
[010h 0016   8]                 Oem Table ID : "BXPC    "
[018h 0024   4]                 Oem Revision : 00000001
[01Ch 0028   4]              Asl Compiler ID : "BXPC"
[020h 0032   4]        Asl Compiler Revision : 00000001

[024h 0036   2]               Platform Class : 0000
[026h 0038   4]         Min Event Log Length : 00010000
[02Ah 0042   8]            Event Log Address : 0000000007FF0000

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-11-stefanb@linux.ibm.com
---
 tests/data/acpi/q35/DSDT.tis.tpm12          | Bin 0 -> 8894 bytes
 tests/data/acpi/q35/TCPA.tis.tpm12          | Bin 0 -> 50 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   2 --
 3 files changed, 2 deletions(-)

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6735e73971c6be95deceb23051a78af6a4573bd8 100644
GIT binary patch
literal 8894
zcmZ<>b_v<1#K6EP<mB({5v<@85#X$#prF9Wz`y`vgJ=OymKcWU1{Wvyct&m}7RKmC
zZZO-$$=!)VM90M`)SYogM#8j&gp&3I#>4`Kq(uT#lM)M>I}(x@K#EF}3b?pH3;|cZ
z_+Y2_=q6{b0B27Fj(87G7aqq8TpS$n&JY$eN4%p;5CcbisHY2qh!1<bf3P!4S2lyQ
zOSs_zKi0_^g2G$^(Z08hzst)wObah@JYai0tt*?0#n~m?s4JU`!`UU=xBx^XR3~uB
zCoB+{G&z&87Ni|4XShIk(qynSL`(oAQ;+}>S;zws0vTnvBs;pv!X?Pj8SF;h0KWhO
zX9Gh9j(F#wU_p5<nRamo1|Cr0FfcGMZ215G|9%jIfq_Awl0m?i1L8|p4vzrW5U>e6
zju#l2A-;-k@CXR;W#D08xbTmgfhD?80K^v#bM<pk2nceCR}e9a4-Ro;C;*8h6o7;h
zs}i^b5*F}GoSeWgIf48C|0N6y_$E$HWSEl3!|?Dc>k@_~T>KEX33BnZae~}(;U5DF
z14AW)fSMl2HK6d0Zj$m0c8muHF%JWSJVSItfM-x36ITKkkAOG7J~K=qNL6%`iMNwW
zJk0gX%p4$B!K{(s5_M-xU`SwKWOQdtVMt+MWK?2esAPz4Qt|Z<h3n!MM$yH=#i|4f
zq39+fpMVfUnAt3l_+~^=E5OC;&RD@*!OX#-)BrZw$l2c)u7{No9GY14{9yjU%)p@}
z0M?@#6ygkb4L3CYz(yA^6fiJyC^0ZrG6?tyBEqO4z&SXCk^2Y_7e{oX0Epup;OrTy
z5a8_Tq7dB>?CKTI$bE)~izT{|8^m#TGH~@$h;DH5^9^F;z5>w(;y63`h59N4c)CO=
zL^C@1ID0dQs0KK@dND;SgLwb{7i54`6jU;1GJwp8RtE_$VGz-F^mK{9rV3<M0f<O|
zs!b4aVGD2x_T^jP1I-#2%uhZIHm&lVDE`V<^02dS0m!VJ+=K<nld~8WNKVe=Vp<?P
zsTQ1$c>e$Y|DR!rATwhlh+tSKzCd(x78iSg5GxY{FGFHMLPsJ4!;(af08eK(1`(e4
z08eMef(#H(pf8dUlvo6uUx5-9M?g?WfRJ}_gAg|h_y7M4K7QV=3=lS>kDs?2gAfl$
zoQuiF&)XfwVfOL!_Fxd=W#Re%pOFEi#|_Q{>2hZf;)BS6^?4w;Af2vIwM<~0?r<JR
zCrl|516ZdkR3{Sy7f2_}7G|(cm<yO0KssScnISsepgNf$I$^f3fOW!Lzyj6@Q_2F-
z33EIPL?_G^R<KT(3s}KAVM<vcI$@4yh3JIY!Uom}a{(JzCrl|DL?_JgY!IC=TiC%m
zVJ=_?>x3y~hv<Yko*kkSW(x;cC(H#LV4X0f91xu_$8$h*!ffFL>x8+06RZ=aloO&8
z=6FtsPM9rRV4W}*aDjEglyX6I!W_>9(FwDK8>|!N0&cKQm{M+tPMG7lAv$5U@PKu~
zT)+d?2~)}g(Ft=r4@4)-7GAJUm<xEpI$=tAAv$4>=Y{Bm*}@0b33CA-SSL&=A4Dh2
z@q7@SFkAS+I$<v02kV3><%j5mIi4S)6K0D5SSQQ{0$`mmr2-J0Fvkl(bi!;A1nY#k
zKoG1Grc@B36Xtk9h)$R-LSUUR7YKoM!juX@biy1j1knkzMHs9T<^o}`PMA_*h)$T}
zg&{g&wupdr!dxH%)(KN80?`R`ya+@m%ob6wPM8Zs!8&0|MIkz2ju(aKgxMkn)(LZg
z7+5DvsTf2j%<*CnoiJO(!8&0s5C`joDHVt4ggIUuq7!C|1Xw4`1rlJLFr^X@oiN8s
zKy<=vkp$~>gqE6;V4Y6T!cG#R(;2}9m6|S4wNfZLrBHNAq3V=^*a_1qjiOT;MW-~X
zPH9w~GAKG_P;|<m>Xbp%DT|_07DcBls!mx{opNBEu&|W_>x6}^97HE9Y~>(2VPPu|
z)(Hz+d9Y4c*vdn6!opS_qSJ)|RDn7oRiN&{p709PJ=habfw~8KA}Ub#U{9E(j0_AA
zb<paR5uy-YfkKqRxXcjq!D^YnI$=qQi2<Y&mT*B8C`2h(C#V8NvV|F}6XpVDuufRQ
z1y!IBrC^<)3KZfZu$?Smov^@V0qcYXE~o;9C<W^TRiF^ZgLSfkb;7a^D_AEi9zYc+
zL@8J&r~-vJ9;}lMtP|!>Hn2{ZKS32JL@8J&r~-vJ9;}lctP|!>cCb#EKS32JL@8J&
zr~-vJ9;}lCtP|!>4zNy`KS32JL@8J&r~-vJ9;}lStP|!>POwgxKS32JL@8J&r~-vJ
z9;}lKtP|!>F0f9RKS32JL@8J&r~-vJ9;}latP|!>Zm>?6KS32JL@8J&r~-vJ9;}lG
ztP|!>9<WZBKS32JL@8J&r~-vJ9;}lWtP|!>Ua(G>KS32JL@8J&r~-vJ9;}lOtP|!>
zKCn)hKS32JL@8J&r~-vJ9;}letP|!>ey~oMKS32JL@8J&r~-vJ9;{OUtP|!>0kBS(
zKS32JL@8J&r~-vJ9;{OktP|!>L9kAkKS32JL@8J&r~-vJ9;{OctP|!>A+S!EKS32J
zL@8J&r~-vJ9;{OstP|!>VX#h^KS32JL@8J&r~-vJ9;{OYtP|!>5wK2}KS32JL@8J&
zr~-vJ9;{OotP|!>QLs*!KS32JL@8J&r~-vJ9;{OgtP|!>F|baUKS32JL@8J&r~-vJ
z9;{OwtP|!>aj;I9KS32JL@8J&r~-vJ9;{OWtP|!>39wF>KS32JL@8J&r~-vJ9;{Om
ztP@tqOM-R63VBck>K^O~E94~^xIpDCtQwR;(J6(Z6I6jB=>%1v?!lfgozf^erBQT(
zDo`Yypb8X8rwoct85EtM3KU5vr~*aODT|_07DXqh0!7jZsz8x+%7Jyl!d4Ef6Bf3h
z3KS`9K@})c*vf--!opS_tP>Wtpb8YpPEZ93wo^nZJ|HNBVFAx%Q1_H!38+K5kPSpR
zMmJjNGlP1mpivFbcn4!ZP@p46Kv19)h;RlGE*uOB0YQPTAhsKba0d|{93sM=fx#h+
z3plH}8ZsD`aB(i-;ubOS40I0S<Om1~G7#kB;_hT)-~^8ZRWfve#JE@kf`U8?sx!Fw
z89=NhAi?M+A9f!<Z%5dW2M<4Z_=15WJ|HMqP>f5slaGOunU#Tofs28Gftvv|awEbI
z8gXG*0&)V#$s&UBE}p>*wIDWE1Bevi2aQL8R5%BL`Qq`xLBWh&8BjNXtOtohZFfSm
zosk6FosevI0^9C{X1kLJcH5nzn|wijhYY3hI9`DIor{SC>z$FTcLrPUjAp$v4(pwv
z*1Mp2o{O0T>s^qncL7`Pf@Zx74(nZ@*1Mux&q9Lru1MCqf~|K&v)&bl^{!Cs-O#OP
zCBb?(B<tP4*1Mru?}o#AH>maQ=+?85V7)t%_3mKn-O;Rf$6>uY)Orte>)A=L-UG>c
z53uzfXx4k+u-+rO$(O}F*b_b1a|uAKhZP<I;Oq_=zeN=jVFPD*5jJqXh8l;SjkyF-
zjT6LT97GJOaTxhh2-P?tEXF~^uo{Pv&xBEp6UJg3L=3BO82Ls7)i@C>#zDle8i$b&
zL{W_s#bO*p46AV%=~@icI58~7LBy~chmlUjQH>MFVjM&a)i?oZ#CUcSf3UBU0c6ad
znL(aGz~2ruavR;`!4-oT@ec@c4TfbBE;ex8#OoXos^F1dQjk-cu27U(oL^d$oLbBf
z&FCE9;|(22=jGyZXS~64gNKo)5;U6-1R6TO!NbK9-KY@|1e(QAa1L<wV|4cP3ubf<
z@(p8jcJ(p<5pIkO%+AifE*#N~LIFX+A<WLfu09G33eGN$AqpZq@t%I390d#@!RRJm
z;~21ioC883j^uT84)8QEFf;%;12S>MDkA6{;uguYfNOFFLz}aKfkCE-2b*(nh$CmT
za*RF;$j_ig0LY^t4}gZ>(S?IueF_*77D!D-mjHR8fQvsNS{*~i$9qYFh%YP1TclaU
zh;EdtmjPDuMcl-kgPr|2aCn2m+0Qjxi0OX;LvjIQ$|4t`$tjEl3@HVS2?Y#^i+p${
zOio~&n#@?hkWi3}ZY9{m=z`9^E(^q`qKmpXh9oatz&SaQ>wf`b%F+UC@(WZjLJkz~
z1<4&CHzqQaCKfOzEHqzWilGdgGD6%Ulew4+FajpXH>`j$p)?sZvFOSInOOuGn8c6_
zit=Q}g5+pJ?4H9g%hNBoGzoh!`*J$_2Z!+B2<CzebRUBP55s(CUzdVRbd@fSAq8Aa
z=%OH{S?Gc;jv-iG7u{?DO4Fc;JqFNJOmK)J#}ZKLX5fhTbqo>Y=Hg)BU|;~XLq+)F
z{ewfeL7rjA$jlOvj?s&E4{(ilH85g;=6Fy>0;MSde-@AwIO9X}lz|z8h-JL1fguAZ
zAmB5CpsA_<|DoE!`N-K1>{1jJ0-j=!oC;C_sn6VaxDIvjGBELgo&Fz0GP*PV;Q7JB
z$kD;ez{tZ468g@=!0>|y&gcCPQurA>$qJSSHH-iM2Q`a9s+kzTG9b@_xE%lg|6dPc
zFfcHzK#@7{|Ns7f5SasZUD^x`5ZfRkkkA6nfpNeDpfrfz#t90{EB_b*Kuz)JCTAA+
z09VM2HF!4I(ZCEcYsm`|M=Bp7lbGBP--F9X1vUjXMgh>=s259sM?erHxIt6O2txv#
zJ+YLvm}VW}Il{vzQOO{n8N<L4A8Z^i#KywN$N*xS#0zn-a4~T)fqAAN8IXSjtPxQX
z-K6Ih?hL5|c>`U2Lk$cJj6ixr9J!EPEWj$j3M$bB{54}h1*d?!CMZUuo4A7w3?TEz
z4AD(m!3Gu(4i6|SML6Pv4P6+PFn}0FForRh!4}}`7s3$T<gcO!>V<^__`)Y;c?==G
zM47*4WMF^?eM3k<fDr=^L*SKvTv5@DDqwCvfTtfvK!9g}LO?(em<R;1d=-2G0)iBx
zL3)fCc%lNY`~xjl2nh%<X7u$B3*!(m3JGxY<6OWwX=(;H1LG0~uu?;YA|8f-EB`VW
zpsEcSLjnTaIF^9PkN{sJAr?@uh6MN;3$cPyq=>6Tyi2ez&jNQ5$eM&@zwX*fn{Dx1
zqS7nCF;^^j0r%uAh9!cmTulEN7jR9^VqC&&sAtTuKxc9m7gIrVM>YdPLIKDv35g51
zCRZnNu`@6%VJt`p2nY%+U<e2Z@?FBPz<zQT7xMzq$(f7=An^{6OBflJfT#t^lQX%P
z;KIg?3?Q~INQp5Q6IhM$0*=X9Tr5ktm_W0?T&xA4umLN8C=LL#Q53T+;bLCk$_kzZ
z#^uHZJP_w{F@Y2dfE<V9YLIKWn4tb>?#O0@`9*Sa78eJq$CrS;4W4^mU<wJww;>7U
l!e>g|CdjylUH^0?b^#|i7?~NF7YI+zVua~W07d2!1^@<WX?Xwu

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/q35/TCPA.tis.tpm12 b/tests/data/acpi/q35/TCPA.tis.tpm12
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a56961b413e7715b3d60f9836d1c8f2f4c7347cb 100644
GIT binary patch
literal 50
wcmWG>4sbMLU|?V}a`Jcf2v%^42yj+VP*7lGU|;~TK{Nvc0|SWu&kkY%0M}Lr0RR91

literal 0
HcmV?d00001

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index fb093b32b9..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,3 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.tis.tpm12",
-"tests/data/acpi/q35/TCPA.tis.tpm12",