Re: [PATCH 4/6] tests: Rename id of tpmdev to tpm0

[Arun Menon <armenon@redhat.com>]

Hi,

On Tue, Apr 28, 2026 at 01:07:16PM +0000, Stefan Berger wrote:
> Rename the id of the tpmdev from dev to tpm0 because this 'dev' cannot
> be used when the tpm-tis-i2c device is used.
> 
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
>  tests/qtest/tpm-tests.c | 4 ++--
>  tests/qtest/tpm-util.c  | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c
> index dcbf5457ed..d1fe4a85d4 100644
> --- a/tests/qtest/tpm-tests.c
> +++ b/tests/qtest/tpm-tests.c
> @@ -49,8 +49,8 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
>      args = g_strdup_printf(
>          "%s "
>          "-chardev socket,id=chr,path=%s "
> -        "-tpmdev emulator,id=dev,chardev=chr "
> -        "-device %s,tpmdev=dev",
> +        "-tpmdev emulator,id=tpm0,chardev=chr "
> +        "-device %s,tpmdev=tpm0",
>          machine_options ? : "", addr->u.q_unix.path, ifmodel);
>  
>      s = qtest_start(args);
> diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
> index 1a47099807..35e9d3f32e 100644
> --- a/tests/qtest/tpm-util.c
> +++ b/tests/qtest/tpm-util.c
> @@ -227,8 +227,8 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,
>      src_qemu_args = g_strdup_printf(
>          "%s "
>          "-chardev socket,id=chr,path=%s "
> -        "-tpmdev emulator,id=dev,chardev=chr "
> -        "-device %s,tpmdev=dev ",
> +        "-tpmdev emulator,id=tpm0,chardev=chr "
> +        "-device %s,tpmdev=tpm0 ",
>          machine_options ? : "", src_tpm_addr->u.q_unix.path, ifmodel);
>  
>      *src_qemu = qtest_init(src_qemu_args);
> @@ -236,8 +236,8 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,
>      dst_qemu_args = g_strdup_printf(
>          "%s "
>          "-chardev socket,id=chr,path=%s "
> -        "-tpmdev emulator,id=dev,chardev=chr "
> -        "-device %s,tpmdev=dev "
> +        "-tpmdev emulator,id=tpm0,chardev=chr "
> +        "-device %s,tpmdev=tpm0 "
>          "-incoming %s",
>          machine_options ? : "",
>          dst_tpm_addr->u.q_unix.path,
> -- 
> 2.43.0
> 
> 

Reviewed-by: Arun Menon <armenon@redhat.com>


Regards,
Arun Menon