qemu: Choose TPM 2 for backend as default for CRB interface

Choose a TPM 2 device for the backend as default for the CRB interface
since TPM 1.2 would not work.

This patch addresses BZ 1781913: https://bugzilla.redhat.com/show_bug.cgi?id=1781913

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 21f82625c011f4b37d25ded32eac0836aaea7cd7..4a2daffc0ac81eb3b18b6e2d3c4c3b38a5b06a2a 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4116,7 +4116,8 @@ qemuDomainDefTPMsPostParse(virDomainDefPtr def)
 
         /* TPM 1.2 and 2 are not compatible, so we choose a specific version here */
         if (tpm->version == VIR_DOMAIN_TPM_VERSION_DEFAULT) {
-            if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR)
+            if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR ||
+                tpm->model == VIR_DOMAIN_TPM_MODEL_CRB)
                 tpm->version = VIR_DOMAIN_TPM_VERSION_2_0;
             else
                 tpm->version = VIR_DOMAIN_TPM_VERSION_1_2;