tests: Rename id of tpmdev to tpm0
Rename the id of the tpmdev from dev to tpm0 because this 'dev' cannot be used when the tpm-tis-i2c device is used. Reviewed-by: Arun Menon <armenon@redhat.com> Link: https://lore.kernel.org/qemu-devel/20260429121743.1346635-5-stefanb@linux.ibm.com Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Stefan Berger committed
Apr 29, 2026 at 12:17 UTC
0010294f6859d1ac22f30ffc5f8187abcd7c73d0
2 files changed
+6
-6
tests/qtest/tpm-tests.c
+2
-2
@@ -49,8 +49,8 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
49
args = g_strdup_printf(
50
"%s "
51
"-chardev socket,id=chr,path=%s "
52
- "-tpmdev emulator,id=dev,chardev=chr "
53
- "-device %s,tpmdev=dev",
52
+ "-tpmdev emulator,id=tpm0,chardev=chr "
53
+ "-device %s,tpmdev=tpm0",
54
machine_options ? : "", addr->u.q_unix.path, ifmodel);
55
56
s = qtest_start(args);
tests/qtest/tpm-util.c
+4
-4
@@ -240,8 +240,8 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,
240
src_qemu_args = g_strdup_printf(
241
"%s "
242
"-chardev socket,id=chr,path=%s "
243
- "-tpmdev emulator,id=dev,chardev=chr "
244
- "-device %s,tpmdev=dev ",
243
+ "-tpmdev emulator,id=tpm0,chardev=chr "
244
+ "-device %s,tpmdev=tpm0 ",
245
machine_options ? : "", src_tpm_addr->u.q_unix.path, ifmodel);
246
247
*src_qemu = qtest_init(src_qemu_args);
@@ -249,8 +249,8 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,
249
dst_qemu_args = g_strdup_printf(
250
"%s "
251
"-chardev socket,id=chr,path=%s "
252
- "-tpmdev emulator,id=dev,chardev=chr "
253
- "-device %s,tpmdev=dev "
252
+ "-tpmdev emulator,id=tpm0,chardev=chr "
253
+ "-device %s,tpmdev=tpm0 "
254
"-incoming %s",
255
machine_options ? : "",
256
dst_tpm_addr->u.q_unix.path,