[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] tests: Add suffix tpm2 or tpm12 to ACPI table files
From: |
Stefan Berger |
Subject: |
[PATCH 3/7] tests: Add suffix tpm2 or tpm12 to ACPI table files |
Date: |
Wed, 30 Jun 2021 11:37:19 -0400 |
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
tests/data/acpi/q35/{DSDT.tis => DSDT.tis.tpm2} | Bin
tests/data/acpi/q35/{TPM2.tis => TPM2.tis.tpm2} | Bin
tests/qtest/bios-tables-test.c | 3 ++-
3 files changed, 2 insertions(+), 1 deletion(-)
rename tests/data/acpi/q35/{DSDT.tis => DSDT.tis.tpm2} (100%)
rename tests/data/acpi/q35/{TPM2.tis => TPM2.tis.tpm2} (100%)
diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis.tpm2
similarity index 100%
rename from tests/data/acpi/q35/DSDT.tis
rename to tests/data/acpi/q35/DSDT.tis.tpm2
diff --git a/tests/data/acpi/q35/TPM2.tis b/tests/data/acpi/q35/TPM2.tis.tpm2
similarity index 100%
rename from tests/data/acpi/q35/TPM2.tis
rename to tests/data/acpi/q35/TPM2.tis.tpm2
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;
--
2.31.1
- [PATCH 0/7] tests: Add test cases for TPM 1.2 ACPI tables, Stefan Berger, 2021/06/30
- [PATCH 5/7] tests: acpi: prepare for new TPM 1.2 related tables, Stefan Berger, 2021/06/30
- [PATCH 4/7] test: tpm: Create TPM 1.2 response in TPM emulator, Stefan Berger, 2021/06/30
- [PATCH 7/7] tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs, Stefan Berger, 2021/06/30
- [PATCH 1/7] tests: Rename TestState to TPMTestState, Stefan Berger, 2021/06/30
- [PATCH 3/7] tests: Add suffix tpm2 or tpm12 to ACPI table files,
Stefan Berger <=
- [PATCH 6/7] tests: acpi: Add test cases for TPM 1.2 with TCPA table, Stefan Berger, 2021/06/30
- [PATCH 2/7] tests: Add tpm_version field to TPMTestState and fill it, Stefan Berger, 2021/06/30