[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v1 04/10] tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files
From: |
Stefan Berger |
Subject: |
[PULL v1 04/10] tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files |
Date: |
Wed, 1 Sep 2021 08:21:37 -0400 |
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;
--
2.31.1
- [PULL v1 00/10] Merge tpm 2021/09/01 v1, Stefan Berger, 2021/09/01
- [PULL v1 04/10] tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files,
Stefan Berger <=
- [PULL v1 01/10] tests: Rename TestState to TPMTestState, Stefan Berger, 2021/09/01
- [PULL v1 03/10] tests: acpi: Prepare for renaming of TPM2 related ACPI files, Stefan Berger, 2021/09/01
- [PULL v1 07/10] tests: acpi: prepare for new TPM 1.2 related tables, Stefan Berger, 2021/09/01
- [PULL v1 05/10] tests: acpi: tpm2: Add the renamed ACPI files and drop old ones, Stefan Berger, 2021/09/01
- [PULL v1 08/10] tests: Use QMP to check whether a TPM device model is available, Stefan Berger, 2021/09/01
- [PULL v1 02/10] tests: Add tpm_version field to TPMTestState and fill it, Stefan Berger, 2021/09/01
- [PULL v1 09/10] tests: acpi: Add test cases for TPM 1.2 with TCPA table, Stefan Berger, 2021/09/01
- [PULL v1 06/10] tests: tpm: Create TPM 1.2 response in TPM emulator, Stefan Berger, 2021/09/01
- [PULL v1 10/10] tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs, Stefan Berger, 2021/09/01
- Re: [PULL v1 00/10] Merge tpm 2021/09/01 v1, Peter Maydell, 2021/09/02