From b233bf89dc50dd338288a5a348889103496cfc42 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 18 Jun 2022 12:46:03 -0400 Subject: [PATCH] qemu: command: Use correct tpm device for all non-x86 The qemu `tpm-tis` device is an ISA device, so only really applicable to x86 archs. For all non-x86 archs we should use `tpm-tis-device` This fixes tpm-tis usage on armv7l and riscv Reviewed-by: Michal Privoznik Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 57334ab246..b307d3139c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9731,7 +9731,7 @@ qemuBuildTPMDevCmd(virCommand *cmd, const char *model = virDomainTPMModelTypeToString(tpm->model); g_autofree char *tpmdev = g_strdup_printf("tpm-%s", tpm->info.alias); - if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch == VIR_ARCH_AARCH64) + if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && !ARCH_IS_X86(def->os.arch)) model = "tpm-tis-device"; if (virJSONValueObjectAdd(&props, -- 2.47.2