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 <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 57334ab24662ee0afc0ec820876dc2192aaa8464..b307d3139cd40f7a68fa849324f4966adacfa937 100644 (file)
--- 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,