conf: Add support for tpm-spapr to domain XML

This patch adds support for the tpm-spapr device model for ppc64. The XML for
this type of TPM looks as follows:

 <tpm model='tpm-spapr'>
   <backend type='emulator'/>
 </tpm>

Extend the documentation.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 60a103d7c67b7dbb04c8882b560f374025a40bfd..44e2062d018e5c872c56da801960848d42e3155e 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -8508,10 +8508,13 @@ qemu-kvm -net nic,model=? /dev/null
         <p>
           The <code>model</code> attribute specifies what device
           model QEMU provides to the guest. If no model name is provided,
-          <code>tpm-tis</code> will automatically be chosen.
+          <code>tpm-tis</code> will automatically be chosen for non-PPC64
+          architectures.
           <span class="since">Since 4.4.0</span>, another available choice
           is the <code>tpm-crb</code>, which should only be used when the
-          backend device is a TPM 2.0.
+          backend device is a TPM 2.0. <span class="since">Since 6.1.0</span>,
+          pSeries guests on PPC64 are supported and the default is
+          <code>tpm-spapr</code>.
         </p>
       </dd>
       <dt><code>backend</code></dt>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index ea237a05e56654bc3ed3c0c3aad891bfe8e6ca3a..9577d26c2a832979ace8d3d7fe1c9223688a2ac9 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4383,6 +4383,7 @@
           <choice>
             <value>tpm-tis</value>
             <value>tpm-crb</value>
+            <value>tpm-spapr</value>
           </choice>
         </attribute>
       </optional>
@@ -4390,6 +4391,9 @@
       <optional>
         <ref name="alias"/>
       </optional>
+      <optional>
+        <ref name="address"/>
+      </optional>
     </element>
   </define>
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 040643e78fd10547d6ffe7a416b5fc4d3609009e..51ae520897a2400ad763a01f6e3be9be0a8dc07c 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1128,6 +1128,7 @@ VIR_ENUM_IMPL(virDomainTPMModel,
               "default",
               "tpm-tis",
               "tpm-crb",
+              "tpm-spapr",
 );
 
 VIR_ENUM_IMPL(virDomainTPMBackend,

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cb4a0cedf0b7aaf084e74dc8355de71fd6182713..2db3c19473605a1f2254f32a42555a5fc265a051 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1255,6 +1255,7 @@ typedef enum {
     VIR_DOMAIN_TPM_MODEL_DEFAULT,
     VIR_DOMAIN_TPM_MODEL_TIS,
     VIR_DOMAIN_TPM_MODEL_CRB,
+    VIR_DOMAIN_TPM_MODEL_SPAPR,
 
     VIR_DOMAIN_TPM_MODEL_LAST
 } virDomainTPMModel;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e152448cc6b8138334d0cbf455bad9ce0b1738d9..39513a726ef911a000927359dfc9fcce9e66b54a 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7760,9 +7760,9 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm,
 
     switch (tpm->version) {
     case VIR_DOMAIN_TPM_VERSION_1_2:
-        /* only TIS available for emulator */
+        /* TPM 1.2 + CRB do not work */
         if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
-            tpm->model != VIR_DOMAIN_TPM_MODEL_TIS) {
+            tpm->model == VIR_DOMAIN_TPM_MODEL_CRB) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("Unsupported interface %s for TPM 1.2"),
                            virDomainTPMModelTypeToString(tpm->model));
@@ -7797,6 +7797,7 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm,
     case VIR_DOMAIN_TPM_MODEL_CRB:
         flag = QEMU_CAPS_DEVICE_TPM_CRB;
         break;
+    case VIR_DOMAIN_TPM_MODEL_SPAPR:
     case VIR_DOMAIN_TPM_MODEL_LAST:
     default:
         virReportEnumRangeError(virDomainTPMModel, tpm->model);
@@ -9036,10 +9037,16 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDefPtr hostdev,
 
 
 static int
-qemuDomainTPMDefPostParse(virDomainTPMDefPtr tpm)
+qemuDomainTPMDefPostParse(virDomainTPMDefPtr tpm,
+                          virArch arch)
 {
-    if (tpm->model == VIR_DOMAIN_TPM_MODEL_DEFAULT)
-        tpm->model = VIR_DOMAIN_TPM_MODEL_TIS;
+    if (tpm->model == VIR_DOMAIN_TPM_MODEL_DEFAULT) {
+        if (ARCH_IS_PPC64(arch))
+            tpm->model = VIR_DOMAIN_TPM_MODEL_SPAPR;
+        else
+            tpm->model = VIR_DOMAIN_TPM_MODEL_TIS;
+    }
+
     return 0;
 }
 
@@ -9098,7 +9105,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
         break;
 
     case VIR_DOMAIN_DEVICE_TPM:
-        ret = qemuDomainTPMDefPostParse(dev->data.tpm);
+        ret = qemuDomainTPMDefPostParse(dev->data.tpm, def->os.arch);
         break;
 
     case VIR_DOMAIN_DEVICE_LEASE: