[v2] tests: Add test cases for TPM 1.2 ACPI tables

[PATCH v2 4/9] tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files

Posted by Stefan Berger 4 years, 7 months ago

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <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

Re: [PATCH v2 4/9] tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files

Posted by Igor Mammedov 4 years, 7 months ago

On Thu,  8 Jul 2021 14:38:09 -0400
Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:

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

> ---
>  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;
>