conf: add reporting of "maximum" CPU mode in domain caps

The data reported is the same as for "host-passthrough"

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

docs/formatdomaincaps.html.in

@@ -207,6 +207,12 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='yes'>
+      <enum name='maximumMigratable'>
+        <value>on</value>
+        <value>off</value>
+      </enum>
+    </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
       <vendor>Intel</vendor>

docs/schemas/domaincaps.rng

@@ -88,6 +88,7 @@
   <define name="cpu">
     <element name="cpu">
       <ref name="cpuHost"/>
+      <ref name="cpuMax"/>
       <ref name="cpuHostModel"/>
       <ref name="cpuCustom"/>
     </element>
@@ -105,6 +106,18 @@
     </element>
   </define>
 
+  <define name="cpuMax">
+    <element name="mode">
+      <attribute name="name">
+        <value>maximum</value>
+      </attribute>
+      <ref name="supported"/>
+      <optional>
+        <ref name="enum"/>
+      </optional>
+    </element>
+  </define>
+
   <define name="cpuHostModel">
     <element name="mode">
       <attribute name="name">

src/conf/domain_capabilities.c

@@ -415,6 +415,21 @@ virDomainCapsCPUFormat(virBufferPtr buf,
         virBufferAddLit(buf, "/>\n");
     }
 
+    virBufferAsprintf(buf, "<mode name='%s' supported='%s'",
+                      virCPUModeTypeToString(VIR_CPU_MODE_MAXIMUM),
+                      cpu->maximum ? "yes" : "no");
+
+    if (cpu->maximum && cpu->maximumMigratable.report) {
+        virBufferAddLit(buf, ">\n");
+        virBufferAdjustIndent(buf, 2);
+        ENUM_PROCESS(cpu, maximumMigratable,
+                     virTristateSwitchTypeToString);
+        virBufferAdjustIndent(buf, -2);
+        virBufferAddLit(buf, "</mode>\n");
+    } else {
+        virBufferAddLit(buf, "/>\n");
+    }
+
     virBufferAsprintf(buf, "<mode name='%s' ",
                       virCPUModeTypeToString(VIR_CPU_MODE_HOST_MODEL));
     if (cpu->hostModel) {

src/conf/domain_capabilities.h

@@ -166,6 +166,8 @@ typedef virDomainCapsCPU *virDomainCapsCPUPtr;
 struct _virDomainCapsCPU {
     bool hostPassthrough;
     virDomainCapsEnum hostPassthroughMigratable;
+    bool maximum;
+    virDomainCapsEnum maximumMigratable;
     virCPUDefPtr hostModel;
     virDomainCapsCPUModelsPtr custom;
 };

tests/domaincapsdata/bhyve_basic.x86_64.xml

@@ -8,6 +8,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>

tests/domaincapsdata/bhyve_fbuf.x86_64.xml

@@ -17,6 +17,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>

tests/domaincapsdata/bhyve_uefi.x86_64.xml

@@ -17,6 +17,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>

tests/domaincapsdata/empty.xml

@@ -5,6 +5,7 @@
   <arch>x86_64</arch>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>

tests/domaincapsdata/libxl-xenfv.xml

@@ -20,6 +20,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>

tests/domaincapsdata/libxl-xenpv.xml

@@ -10,6 +10,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>

tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.5.3.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.6.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.7.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.7.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_1.7.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.1.1.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Haswell-noTSX</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G4</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml

@@ -32,6 +32,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_2.10.0.aarch64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_2.10.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_2.10.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>z14-base</model>
       <feature policy='require' name='aen'/>

tests/domaincapsdata/qemu_2.10.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Haswell-noTSX</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_2.11.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>z14-base</model>
       <feature policy='require' name='aen'/>

tests/domaincapsdata/qemu_2.11.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Haswell-noTSX</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml

@@ -32,6 +32,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_2.12.0.aarch64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_2.12.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_2.12.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>z14-base</model>
       <feature policy='require' name='aen'/>

tests/domaincapsdata/qemu_2.12.0.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Haswell-noTSX</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.4.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.5.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml

@@ -32,6 +32,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_2.6.0.aarch64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_2.6.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_2.6.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.7.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>

tests/domaincapsdata/qemu_2.7.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.8.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>zEC12.2-base</model>
       <feature policy='require' name='aefsi'/>

tests/domaincapsdata/qemu_2.8.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>

tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G4</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_2.9.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_2.9.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>z13.2-base</model>
       <feature policy='require' name='aefsi'/>

tests/domaincapsdata/qemu_2.9.0.x86_64.xml

@@ -33,6 +33,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_3.0.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_3.0.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>z14-base</model>
       <feature policy='require' name='aen'/>

tests/domaincapsdata/qemu_3.0.0.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_3.1.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_3.1.0.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml

@@ -32,6 +32,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_4.0.0.aarch64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_4.0.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_4.0.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>z14.2-base</model>
       <feature policy='require' name='aen'/>

tests/domaincapsdata/qemu_4.0.0.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC-IBPB</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_4.1.0.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC-IBPB</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml

@@ -32,6 +32,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_4.2.0.aarch64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>pxa262</model>

tests/domaincapsdata/qemu_4.2.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_4.2.0.s390x.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen15a-base</model>
       <feature policy='require' name='aen'/>

tests/domaincapsdata/qemu_4.2.0.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml

@@ -32,6 +32,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>cortex-a9</model>

tests/domaincapsdata/qemu_5.0.0.aarch64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
       <model usable='unknown'>cortex-a9</model>

tests/domaincapsdata/qemu_5.0.0.ppc64.xml

@@ -30,6 +30,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>POWER8</model>
     </mode>

tests/domaincapsdata/qemu_5.0.0.x86_64.xml

@@ -34,6 +34,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>

tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml

@@ -35,6 +35,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml

@@ -29,6 +29,7 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='no'/>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>

tests/domaincapsdata/qemu_5.1.0.sparc.xml

@@ -29,6 +29,7 @@
         <value>off</value>
       </enum>
     </mode>
+    <mode name='maximum' supported='no'/>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='no'/>
   </cpu>