7:58 a.m.
QEMU has supported a "max" CPU model for many releases now, but somehow
we never got it wired up into libvirt.
"max" is useful for applications which don't care about live migration
and just want the best CPU model possible. Normally "host" would be used
but this only works for KVM. "max" is identical to "host" for KVM,
while
for TCG it exposes every feature TCG implements.
This "max" model will be a natural choice for something like libguestfs
and probably other apps too.
In libvirt we enable it with
<cpu mode="maximum"/>
Daniel P. Berrangé (5):
conf: define a new "maximum" CPU mode
conf: add reporting of "maximum" CPU mode in domain caps
cpu: wire up support for maximum CPU mode
qemu: probe for "-cpu max" support
qemu: wire up support for maximum CPU model
docs/formatdomain.rst | 24 +++++++++++++++++
docs/formatdomaincaps.html.in | 6 +++++
docs/schemas/domaincaps.rng | 13 +++++++++
src/conf/cpu_conf.c | 13 ++++++---
src/conf/cpu_conf.h | 1 +
src/conf/domain_capabilities.c | 15 +++++++++++
src/conf/domain_capabilities.h | 2 ++
src/cpu/cpu.c | 4 ++-
src/cpu/cpu_ppc64.c | 10 +++++--
src/cpu/cpu_x86.c | 3 ++-
src/qemu/qemu_capabilities.c | 27 +++++++++++++++++++
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 9 +++++--
src/qemu/qemu_domain.c | 10 ++++---
src/qemu/qemu_driver.c | 2 ++
src/qemu/qemu_process.c | 8 +++---
src/qemu/qemu_validate.c | 14 ++++++++--
tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 +
tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 +
tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 +
tests/domaincapsdata/empty.xml | 1 +
tests/domaincapsdata/libxl-xenfv.xml | 1 +
tests/domaincapsdata/libxl-xenpv.xml | 1 +
.../domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 1 +
.../domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_1.7.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 6 +++++
.../qemu_2.10.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 6 +++++
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 6 +++++
.../qemu_2.12.0-virt.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 6 +++++
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 +
.../qemu_2.6.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 6 +++++
tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 6 +++++
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 6 +++++
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 6 +++++
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 6 +++++
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 6 +++++
.../qemu_4.0.0-virt.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 6 +++++
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 6 +++++
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 6 +++++
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 6 +++++
.../qemu_4.2.0-virt.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 +++++
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 6 +++++
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 6 +++++
.../qemu_5.0.0-virt.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 6 +++++
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 6 +++++
tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 6 +++++
.../qemu_5.2.0-virt.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 6 +++++
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 6 +++++
tests/domaincapsdata/qemu_5.2.0.s390x.xml | 6 +++++
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 6 +++++
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 6 +++++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 6 +++++
.../caps_2.10.0.x86_64.xml | 1 +
.../caps_2.11.0.x86_64.xml | 1 +
.../caps_2.12.0.aarch64.xml | 1 +
.../caps_2.12.0.ppc64.xml | 1 +
.../caps_2.12.0.x86_64.xml | 1 +
.../caps_2.9.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 +
.../caps_3.0.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 +
.../caps_3.1.0.x86_64.xml | 1 +
.../caps_4.0.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 +
.../caps_4.0.0.x86_64.xml | 1 +
.../caps_4.1.0.x86_64.xml | 1 +
.../caps_4.2.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 +
.../caps_4.2.0.x86_64.xml | 1 +
.../caps_5.0.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 +
.../caps_5.0.0.x86_64.xml | 1 +
.../caps_5.1.0.x86_64.xml | 1 +
.../caps_5.2.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 +
.../caps_5.2.0.x86_64.xml | 1 +
.../caps_6.0.0.x86_64.xml | 1 +
.../cpu-cache-passthrough3.err | 2 +-
153 files changed, 575 insertions(+), 19 deletions(-)
--
2.29.2
7:58 a.m.
New subject: [libvirt PATCH 1/5] conf: define a new "maximum" CPU mode
For hardware virtualization this is functionally identical to the
existing host-passthrough mode so the same caveats apply.
For emulated guest this exposes the maximum featureset supported by
the emulator. Note that despite being emulated this is not guaranteed
to be migration safe, especially if different emulator software versions
are used on each host.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/formatdomain.rst | 24 ++++++++++++++++++++++++
src/conf/cpu_conf.c | 13 +++++++++----
src/conf/cpu_conf.h | 1 +
src/cpu/cpu.c | 1 +
src/qemu/qemu_capabilities.c | 1 +
src/qemu/qemu_command.c | 1 +
src/qemu/qemu_domain.c | 1 +
src/qemu/qemu_validate.c | 1 +
8 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 0f78aa3a8c..976770bdb6 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -1226,6 +1226,13 @@ following collection of elements. :since:`Since 0.7.5`
<feature policy='disable' name='lahf_lm'/>
...
+::
+
+ <cpu mode='maximum' migratable='off'>
+ <cache mode='passthrough'/>
+ <feature policy='disable' name='lahf_lm'/>
+ ...
+
In case no restrictions need to be put on CPU model and its features, a simpler
``cpu`` element can be used. :since:`Since 0.7.6`
@@ -1351,6 +1358,18 @@ In case no restrictions need to be put on CPU model and its
features, a simpler
another host safer: even with ``migratable='on'`` migration will be
dangerous unless both hosts are identical as described above.
+ ``maximum``
+ When running a guest with hardware virtualization this CPU model is
+ functionally identical to ``host-passthrough``, so refer to the docs
+ above.
+
+ When running a guest with CPU emulation, this CPU model will enable
+ the maximum set of features that the emulation engine is able to support.
+ Note that even with ``migratable='on'`` migration will be dangerous
+ unless both hosts are running identical versions of the emulation code.
+
+ :since:`Since 7.1.0` with the QEMU driver.
+
Both ``host-model`` and ``host-passthrough`` modes make sense when a domain
can run directly on the host CPUs (for example, domains with type ``kvm``).
The actual host CPU is irrelevant for domains with emulated virtual CPUs
@@ -1358,6 +1377,11 @@ In case no restrictions need to be put on CPU model and its
features, a simpler
``host-model`` may be implemented even for domains running on emulated CPUs
in which case the best CPU the hypervisor is able to emulate may be used
rather then trying to mimic the host CPU model.
+
+ If an application does not care about a specific CPU, just wants the
+ best featureset without a need for migration compatibility, the
+ ``maximum`` model is a good choice on hypervisors where it is available.
+
``model``
The content of the ``model`` element specifies CPU model requested by the
guest. The list of available CPU models and their definition can be found in
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index f98b0a0eb3..eb4bfbbcfa 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -44,6 +44,7 @@ VIR_ENUM_IMPL(virCPUMode,
"custom",
"host-model",
"host-passthrough",
+ "maximum",
);
VIR_ENUM_IMPL(virCPUMatch,
@@ -402,10 +403,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
if ((migratable = virXMLPropString(ctxt->node, "migratable"))) {
int val;
- if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
+ if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
+ def->mode != VIR_CPU_MODE_MAXIMUM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Attribute migratable is only allowed for "
- "host-passthrough CPU"));
+ "'host-passthrough' / 'maximum' CPU
mode"));
return -1;
}
@@ -500,7 +502,8 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
}
if (def->type == VIR_CPU_TYPE_GUEST &&
- def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
+ def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
+ def->mode != VIR_CPU_MODE_MAXIMUM) {
if ((fallback = virXPathString("string(./model[1]/@fallback)", ctxt)))
{
if ((def->fallback = virCPUFallbackTypeFromString(fallback)) < 0) {
@@ -727,7 +730,9 @@ virCPUDefFormatBufFull(virBufferPtr buf,
virCPUCheckTypeToString(def->check));
}
- if (def->mode == VIR_CPU_MODE_HOST_PASSTHROUGH && def->migratable)
{
+ if ((def->mode == VIR_CPU_MODE_HOST_PASSTHROUGH ||
+ def->mode == VIR_CPU_MODE_MAXIMUM) &&
+ def->migratable) {
virBufferAsprintf(&attributeBuf, " migratable='%s'",
virTristateSwitchTypeToString(def->migratable));
}
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index b744b06c2d..7ab198d370 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -44,6 +44,7 @@ typedef enum {
VIR_CPU_MODE_CUSTOM,
VIR_CPU_MODE_HOST_MODEL,
VIR_CPU_MODE_HOST_PASSTHROUGH,
+ VIR_CPU_MODE_MAXIMUM,
VIR_CPU_MODE_LAST
} virCPUMode;
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 44094bd0df..6ff88d6a9f 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -563,6 +563,7 @@ virCPUUpdate(virArch arch,
switch ((virCPUMode) guest->mode) {
case VIR_CPU_MODE_HOST_PASSTHROUGH:
+ case VIR_CPU_MODE_MAXIMUM:
return 0;
case VIR_CPU_MODE_HOST_MODEL:
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d41b4a4753..d0378f94bc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2334,6 +2334,7 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
cpus = virQEMUCapsGetAccel(qemuCaps, type)->cpuModels;
return cpus && cpus->ncpus > 0;
+ case VIR_CPU_MODE_MAXIMUM:
case VIR_CPU_MODE_LAST:
break;
}
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 92036d26c0..059563d92f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6356,6 +6356,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
virBufferAdd(buf, cpu->model, -1);
break;
+ case VIR_CPU_MODE_MAXIMUM:
case VIR_CPU_MODE_LAST:
break;
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0f09e321fb..d89aea340b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4151,6 +4151,7 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def,
def->cpu->check = VIR_CPU_CHECK_PARTIAL;
break;
+ case VIR_CPU_MODE_MAXIMUM:
case VIR_CPU_MODE_LAST:
break;
}
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 78e80b7919..bf4ac19104 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -396,6 +396,7 @@ qemuValidateDomainDefCpu(virQEMUDriverPtr driver,
* CUSTOM.
*/
break;
+ case VIR_CPU_MODE_MAXIMUM:
case VIR_CPU_MODE_CUSTOM:
case VIR_CPU_MODE_LAST:
break;
--
2.29.2
8:30 a.m.
New subject: [libvirt PATCH 1/5] conf: define a new "maximum" CPU mode
On Tue, Feb 09, 2021 at 01:58:57PM +0000, Daniel P. Berrangé wrote:
For hardware virtualization this is functionally identical to the
existing host-passthrough mode so the same caveats apply.
For emulated guest this exposes the maximum featureset supported by
the emulator. Note that despite being emulated this is not guaranteed
to be migration safe, especially if different emulator software versions
are used on each host.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/formatdomain.rst | 24 ++++++++++++++++++++++++
src/conf/cpu_conf.c | 13 +++++++++----
src/conf/cpu_conf.h | 1 +
src/cpu/cpu.c | 1 +
src/qemu/qemu_capabilities.c | 1 +
src/qemu/qemu_command.c | 1 +
src/qemu/qemu_domain.c | 1 +
src/qemu/qemu_validate.c | 1 +
8 files changed, 39 insertions(+), 4 deletions(-)
[...]
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index f98b0a0eb3..eb4bfbbcfa 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -402,10 +403,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
if ((migratable = virXMLPropString(ctxt->node, "migratable"))) {
int val;
- if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
+ if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
+ def->mode != VIR_CPU_MODE_MAXIMUM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Attribute migratable is only allowed for "
- "host-passthrough CPU"));
+ "'host-passthrough' / 'maximum' CPU
mode"));
Since you are modifying the error message I would reformat it to single
line.
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
4:39 a.m.
New subject: [libvirt PATCH 1/5] conf: define a new "maximum" CPU mode
On Tue, Feb 09, 2021 at 03:30:47PM +0100, Pavel Hrdina wrote:
On Tue, Feb 09, 2021 at 01:58:57PM +0000, Daniel P. Berrangé wrote:
> For hardware virtualization this is functionally identical to the
> existing host-passthrough mode so the same caveats apply.
>
> For emulated guest this exposes the maximum featureset supported by
> the emulator. Note that despite being emulated this is not guaranteed
> to be migration safe, especially if different emulator software versions
> are used on each host.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
> docs/formatdomain.rst | 24 ++++++++++++++++++++++++
> src/conf/cpu_conf.c | 13 +++++++++----
> src/conf/cpu_conf.h | 1 +
> src/cpu/cpu.c | 1 +
> src/qemu/qemu_capabilities.c | 1 +
> src/qemu/qemu_command.c | 1 +
> src/qemu/qemu_domain.c | 1 +
> src/qemu/qemu_validate.c | 1 +
> 8 files changed, 39 insertions(+), 4 deletions(-)
[...]
> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
> index f98b0a0eb3..eb4bfbbcfa 100644
> --- a/src/conf/cpu_conf.c
> +++ b/src/conf/cpu_conf.c
> @@ -402,10 +403,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
> if ((migratable = virXMLPropString(ctxt->node, "migratable"))) {
> int val;
>
> - if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
> + if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
> + def->mode != VIR_CPU_MODE_MAXIMUM) {
> virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> _("Attribute migratable is only allowed for "
> - "host-passthrough CPU"));
> + "'host-passthrough' / 'maximum'
CPU mode"));
Since you are modifying the error message I would reformat it to single
line.
That'd would make the line waaaaay longer than normal practice. I know
we don't need to strictly stick to 80 chars, but at the same time we
don't want things massively long.
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
4:53 a.m.
New subject: [libvirt PATCH 1/5] conf: define a new "maximum" CPU mode
On Wed, Feb 10, 2021 at 10:39:22AM +0000, Daniel P. Berrangé wrote:
On Tue, Feb 09, 2021 at 03:30:47PM +0100, Pavel Hrdina wrote:
> On Tue, Feb 09, 2021 at 01:58:57PM +0000, Daniel P. Berrangé wrote:
> > For hardware virtualization this is functionally identical to the
> > existing host-passthrough mode so the same caveats apply.
> >
> > For emulated guest this exposes the maximum featureset supported by
> > the emulator. Note that despite being emulated this is not guaranteed
> > to be migration safe, especially if different emulator software versions
> > are used on each host.
> >
> > Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> > ---
> > docs/formatdomain.rst | 24 ++++++++++++++++++++++++
> > src/conf/cpu_conf.c | 13 +++++++++----
> > src/conf/cpu_conf.h | 1 +
> > src/cpu/cpu.c | 1 +
> > src/qemu/qemu_capabilities.c | 1 +
> > src/qemu/qemu_command.c | 1 +
> > src/qemu/qemu_domain.c | 1 +
> > src/qemu/qemu_validate.c | 1 +
> > 8 files changed, 39 insertions(+), 4 deletions(-)
>
> [...]
>
> > diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
> > index f98b0a0eb3..eb4bfbbcfa 100644
> > --- a/src/conf/cpu_conf.c
> > +++ b/src/conf/cpu_conf.c
> > @@ -402,10 +403,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
> > if ((migratable = virXMLPropString(ctxt->node,
"migratable"))) {
> > int val;
> >
> > - if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
> > + if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
> > + def->mode != VIR_CPU_MODE_MAXIMUM) {
> > virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> > _("Attribute migratable is only allowed for
"
> > - "host-passthrough CPU"));
> > + "'host-passthrough' /
'maximum' CPU mode"));
>
> Since you are modifying the error message I would reformat it to single
> line.
That'd would make the line waaaaay longer than normal practice. I know
we don't need to strictly stick to 80 chars, but at the same time we
don't want things massively long.
I'm aware of that. We did not change all errors and we probably don't
have a syntax-check for that but there was an agreement while ago that
for error messages we can ignore the 80 chars limit [1].
Feel free to push it like it is, I just wanted to point out that and
personally I try to change errors to single line if I have to modify
them
Pavel
[1] <https://libvirt.org/coding-style.html#error-message-format>
> Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
5:01 a.m.
New subject: [libvirt PATCH 1/5] conf: define a new "maximum" CPU mode
On Wed, Feb 10, 2021 at 11:53:53AM +0100, Pavel Hrdina wrote:
On Wed, Feb 10, 2021 at 10:39:22AM +0000, Daniel P. Berrangé wrote:
> On Tue, Feb 09, 2021 at 03:30:47PM +0100, Pavel Hrdina wrote:
> > On Tue, Feb 09, 2021 at 01:58:57PM +0000, Daniel P. Berrangé wrote:
> > > For hardware virtualization this is functionally identical to the
> > > existing host-passthrough mode so the same caveats apply.
> > >
> > > For emulated guest this exposes the maximum featureset supported by
> > > the emulator. Note that despite being emulated this is not guaranteed
> > > to be migration safe, especially if different emulator software versions
> > > are used on each host.
> > >
> > > Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> > > ---
> > > docs/formatdomain.rst | 24 ++++++++++++++++++++++++
> > > src/conf/cpu_conf.c | 13 +++++++++----
> > > src/conf/cpu_conf.h | 1 +
> > > src/cpu/cpu.c | 1 +
> > > src/qemu/qemu_capabilities.c | 1 +
> > > src/qemu/qemu_command.c | 1 +
> > > src/qemu/qemu_domain.c | 1 +
> > > src/qemu/qemu_validate.c | 1 +
> > > 8 files changed, 39 insertions(+), 4 deletions(-)
> >
> > [...]
> >
> > > diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
> > > index f98b0a0eb3..eb4bfbbcfa 100644
> > > --- a/src/conf/cpu_conf.c
> > > +++ b/src/conf/cpu_conf.c
> > > @@ -402,10 +403,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
> > > if ((migratable = virXMLPropString(ctxt->node,
"migratable"))) {
> > > int val;
> > >
> > > - if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
> > > + if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
> > > + def->mode != VIR_CPU_MODE_MAXIMUM) {
> > > virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> > > _("Attribute migratable is only allowed
for "
> > > - "host-passthrough CPU"));
> > > + "'host-passthrough' /
'maximum' CPU mode"));
> >
> > Since you are modifying the error message I would reformat it to single
> > line.
>
> That'd would make the line waaaaay longer than normal practice. I know
> we don't need to strictly stick to 80 chars, but at the same time we
> don't want things massively long.
I'm aware of that. We did not change all errors and we probably don't
have a syntax-check for that but there was an agreement while ago that
for error messages we can ignore the 80 chars limit [1].
Within reason I think that's ok, but I think this example gets a bit
too long at nearly 120 chars
Feel free to push it like it is, I just wanted to point out that and
personally I try to change errors to single line if I have to modify
them
Pavel
[1] <https://libvirt.org/coding-style.html#error-message-format>
The example here was already under 80 chars even when on one
line.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
6:20 a.m.
New subject: [libvirt PATCH 1/5] conf: define a new "maximum" CPU mode
On Wed, Feb 10, 2021 at 11:01:24AM +0000, Daniel P. Berrangé wrote:
On Wed, Feb 10, 2021 at 11:53:53AM +0100, Pavel Hrdina wrote:
> On Wed, Feb 10, 2021 at 10:39:22AM +0000, Daniel P. Berrangé wrote:
> > On Tue, Feb 09, 2021 at 03:30:47PM +0100, Pavel Hrdina wrote:
> > > On Tue, Feb 09, 2021 at 01:58:57PM +0000, Daniel P. Berrangé wrote:
> > > > For hardware virtualization this is functionally identical to the
> > > > existing host-passthrough mode so the same caveats apply.
> > > >
> > > > For emulated guest this exposes the maximum featureset supported by
> > > > the emulator. Note that despite being emulated this is not
guaranteed
> > > > to be migration safe, especially if different emulator software
versions
> > > > are used on each host.
> > > >
> > > > Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> > > > ---
> > > > docs/formatdomain.rst | 24 ++++++++++++++++++++++++
> > > > src/conf/cpu_conf.c | 13 +++++++++----
> > > > src/conf/cpu_conf.h | 1 +
> > > > src/cpu/cpu.c | 1 +
> > > > src/qemu/qemu_capabilities.c | 1 +
> > > > src/qemu/qemu_command.c | 1 +
> > > > src/qemu/qemu_domain.c | 1 +
> > > > src/qemu/qemu_validate.c | 1 +
> > > > 8 files changed, 39 insertions(+), 4 deletions(-)
> > >
> > > [...]
> > >
> > > > diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
> > > > index f98b0a0eb3..eb4bfbbcfa 100644
> > > > --- a/src/conf/cpu_conf.c
> > > > +++ b/src/conf/cpu_conf.c
> > > > @@ -402,10 +403,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
> > > > if ((migratable = virXMLPropString(ctxt->node,
"migratable"))) {
> > > > int val;
> > > >
> > > > - if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
> > > > + if (def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH
&&
> > > > + def->mode != VIR_CPU_MODE_MAXIMUM) {
> > > > virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s",
> > > > _("Attribute migratable is only
allowed for "
> > > > - "host-passthrough CPU"));
> > > > + "'host-passthrough' /
'maximum' CPU mode"));
> > >
> > > Since you are modifying the error message I would reformat it to single
> > > line.
> >
> > That'd would make the line waaaaay longer than normal practice. I know
> > we don't need to strictly stick to 80 chars, but at the same time we
> > don't want things massively long.
>
> I'm aware of that. We did not change all errors and we probably don't
> have a syntax-check for that but there was an agreement while ago that
> for error messages we can ignore the 80 chars limit [1].
Within reason I think that's ok, but I think this example gets a bit
too long at nearly 120 chars
I figured that we don't care about the line being that long. The main
point about not splitting error messages is to help with git grep.
>
> Feel free to push it like it is, I just wanted to point out that and
> personally I try to change errors to single line if I have to modify
> them
>
> Pavel
>
> [1] <https://libvirt.org/coding-style.html#error-message-format>
The example here was already under 80 chars even when on one
line.
We should definitely improve the example to make it more obvious.
Pavel
7:58 a.m.
New subject: [libvirt PATCH 2/5] conf: add reporting of "maximum" CPU mode in domain caps
The data reported is the same as for "host-passthrough"
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/formatdomaincaps.html.in | 6 ++++++
docs/schemas/domaincaps.rng | 13 +++++++++++++
src/conf/domain_capabilities.c | 15 +++++++++++++++
src/conf/domain_capabilities.h | 2 ++
tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 +
tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 +
tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 +
tests/domaincapsdata/empty.xml | 1 +
tests/domaincapsdata/libxl-xenfv.xml | 1 +
tests/domaincapsdata/libxl-xenpv.xml | 1 +
tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.7.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 +
111 files changed, 143 insertions(+)
diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in
index 8df88f5355..2d417b6953 100644
--- a/docs/formatdomaincaps.html.in
+++ b/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>
diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
index a57ef715c3..83d93ee494 100644
--- a/docs/schemas/domaincaps.rng
+++ b/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">
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 8605216cf7..fc48cc3fba 100644
--- a/src/conf/domain_capabilities.c
+++ b/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) {
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index f454780185..128b91fc8d 100644
--- a/src/conf/domain_capabilities.h
+++ b/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;
};
diff --git a/tests/domaincapsdata/bhyve_basic.x86_64.xml
b/tests/domaincapsdata/bhyve_basic.x86_64.xml
index bdf2c4eee8..745f325531 100644
--- a/tests/domaincapsdata/bhyve_basic.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
b/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
index f998c457c1..bb11c02ae9 100644
--- a/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/bhyve_uefi.x86_64.xml
b/tests/domaincapsdata/bhyve_uefi.x86_64.xml
index 18f90023d5..dfd2360d74 100644
--- a/tests/domaincapsdata/bhyve_uefi.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/empty.xml b/tests/domaincapsdata/empty.xml
index 6c3f5f54fd..d3e2d89b60 100644
--- a/tests/domaincapsdata/empty.xml
+++ b/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>
diff --git a/tests/domaincapsdata/libxl-xenfv.xml b/tests/domaincapsdata/libxl-xenfv.xml
index 4efc137c97..cc5b3847e2 100644
--- a/tests/domaincapsdata/libxl-xenfv.xml
+++ b/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>
diff --git a/tests/domaincapsdata/libxl-xenpv.xml b/tests/domaincapsdata/libxl-xenpv.xml
index 70e598fe9e..325f1e50b3 100644
--- a/tests/domaincapsdata/libxl-xenpv.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml
b/tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml
index 3ed96a3ee7..76e33a180d 100644
--- a/tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml
index 3b3d89a643..a88af9605a 100644
--- a/tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.5.3.x86_64.xml
b/tests/domaincapsdata/qemu_1.5.3.x86_64.xml
index 20cd3a105a..1536c94e95 100644
--- a/tests/domaincapsdata/qemu_1.5.3.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml
index a4b26b46cb..5cc5b495a8 100644
--- a/tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml
index 6bff19bad5..4859ba4c33 100644
--- a/tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.6.0.x86_64.xml
b/tests/domaincapsdata/qemu_1.6.0.x86_64.xml
index 16417a13d2..df909cfa14 100644
--- a/tests/domaincapsdata/qemu_1.6.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.7.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_1.7.0-q35.x86_64.xml
index 559b49491e..7f74f98aa2 100644
--- a/tests/domaincapsdata/qemu_1.7.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.7.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_1.7.0-tcg.x86_64.xml
index 97e71bffff..07b020ef52 100644
--- a/tests/domaincapsdata/qemu_1.7.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_1.7.0.x86_64.xml
b/tests/domaincapsdata/qemu_1.7.0.x86_64.xml
index 472c073de9..5930a423cb 100644
--- a/tests/domaincapsdata/qemu_1.7.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml
index a87f5b2a63..9e515c295a 100644
--- a/tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml
index 192a505d77..add9fc06fb 100644
--- a/tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.1.1.x86_64.xml
b/tests/domaincapsdata/qemu_2.1.1.x86_64.xml
index 15adfe0ee8..ded8183399 100644
--- a/tests/domaincapsdata/qemu_2.1.1.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
index be99698f09..e0314996c9 100644
--- a/tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
index 31c096077d..3a1cec224d 100644
--- a/tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml
index bb509975ba..b8671f2733 100644
--- a/tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.10.0.aarch64.xml
b/tests/domaincapsdata/qemu_2.10.0.aarch64.xml
index f1f34d5024..25205b7208 100644
--- a/tests/domaincapsdata/qemu_2.10.0.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.10.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.10.0.ppc64.xml
index 2741a73237..d1a10c5f34 100644
--- a/tests/domaincapsdata/qemu_2.10.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.10.0.s390x.xml
b/tests/domaincapsdata/qemu_2.10.0.s390x.xml
index 2e81779ad3..e8b12be213 100644
--- a/tests/domaincapsdata/qemu_2.10.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_2.10.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.10.0.x86_64.xml
index 81bef600a9..f6db53e80d 100644
--- a/tests/domaincapsdata/qemu_2.10.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
index d11e499bef..742ea30a66 100644
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
index 3a6971584e..f077ca15e6 100644
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
index 684382d4c9..6e149f1fd2 100644
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
index 71ecbacacc..fb683a82eb 100644
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
index dbd1bd4b15..d0512678e0 100644
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
index 049bc7e2e0..d45c3cdcda 100644
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
index 58ebbe9cb8..8a6fbe9fe1 100644
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
index 5c96cc8d1e..05fbfef6e8 100644
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
index 1b12b9928f..310bef66c7 100644
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
index 4df87a9a2f..f5339dbc28 100644
--- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
index 81d5083959..456d13d8a0 100644
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml
index 23e103927e..3ae03de391 100644
--- a/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml
index 2a6296739c..461cc4c102 100644
--- a/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.4.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.4.0.x86_64.xml
index 7c6d78e510..e1af5b6622 100644
--- a/tests/domaincapsdata/qemu_2.4.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml
index bb8bd9c5c5..f46991ca27 100644
--- a/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml
index 8b022e9bd7..82edcbfac6 100644
--- a/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.5.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.5.0.x86_64.xml
index a89990a42e..57f9f9b41b 100644
--- a/tests/domaincapsdata/qemu_2.5.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml
index 251696a161..8bcd8f92ab 100644
--- a/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml
index 7937fad971..2a7b46f775 100644
--- a/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
index 95053e9cbe..14cab3f557 100644
--- a/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.6.0.aarch64.xml
b/tests/domaincapsdata/qemu_2.6.0.aarch64.xml
index 223e944c8a..f84e648a15 100644
--- a/tests/domaincapsdata/qemu_2.6.0.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.6.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.6.0.ppc64.xml
index c97f232028..7f9372a359 100644
--- a/tests/domaincapsdata/qemu_2.6.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.6.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.6.0.x86_64.xml
index f95f8fb46a..4eeec1a22b 100644
--- a/tests/domaincapsdata/qemu_2.6.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml
index 1e6c47f2d6..537941561b 100644
--- a/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml
index 8b7c2ce8e6..79f5fba212 100644
--- a/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.7.0.s390x.xml
b/tests/domaincapsdata/qemu_2.7.0.s390x.xml
index ff3dd4939b..f76564a9bc 100644
--- a/tests/domaincapsdata/qemu_2.7.0.s390x.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.7.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.7.0.x86_64.xml
index da1b10c41b..1dd19dfc37 100644
--- a/tests/domaincapsdata/qemu_2.7.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml
index 0a7493d86d..e0bb1b1eee 100644
--- a/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
index 100e8e059c..1829fbda60 100644
--- a/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.8.0.s390x.xml
b/tests/domaincapsdata/qemu_2.8.0.s390x.xml
index 47b1aa46f7..2c075d7cdb 100644
--- a/tests/domaincapsdata/qemu_2.8.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_2.8.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.8.0.x86_64.xml
index 6fa754c18a..5f55b0730d 100644
--- a/tests/domaincapsdata/qemu_2.8.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
index 3df3c3738e..440529443c 100644
--- a/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
index 08bb5fbad7..77bf8f4c52 100644
--- a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.9.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.9.0.ppc64.xml
index 3776b6ed9c..2523d6ec6b 100644
--- a/tests/domaincapsdata/qemu_2.9.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_2.9.0.s390x.xml
b/tests/domaincapsdata/qemu_2.9.0.s390x.xml
index cf7e7781cc..d5b58a786d 100644
--- a/tests/domaincapsdata/qemu_2.9.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
index a80ef28488..50ef469308 100644
--- a/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
index 5b6e884403..72bc877529 100644
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
index 1c650406c2..9354167ff7 100644
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
index 6250af9e67..d8d8147bf4 100644
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
index dfec6c5c19..af9a8ddd4b 100644
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
index 56830014ea..6561a9695c 100644
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index a75c577539..d57f1c78b3 100644
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index a7fde52d64..be3d54d87e 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
index 46226466d5..0f5be3a16f 100644
--- a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 984be10833..859f973a40 100644
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index 566b8ab281..b873149375 100644
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index cc19a61316..7a793ef8f9 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
index b77a7e67bc..e9eb19e39d 100644
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
index 72ed2c90c5..43a492508f 100644
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
index 4b1ec16992..44d6cd5c2e 100644
--- a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
index 3ac97b0625..7730f801ec 100644
--- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index 99d4a00a6a..a06a9fdc79 100644
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 39050a2b7d..5081f5175e 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index dd2b28fe43..717b6b1b5a 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 1fc14a7dd6..1094ff4685 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index a57529ee03..d76e5a9a18 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index e19f59b9d2..b90d300c42 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 2d362f1582..814b2cf3f5 100644
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index 04bfba5196..2af62f7c07 100644
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 304b06b14e..9523743b18 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index 7931dd4130..b5d92836d5 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/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'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 6013d01e54..682225719d 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 4a30b558c0..e376a36df0 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 18516adb71..7aa9dbdf0c 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index 5fdc8d45d2..10ca10ae7d 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index 4a897d5e1e..524e483834 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index bedfae90e0..e2339d7600 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index abaa54d493..49a8481f24 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index 39452be343..b654c741f4 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index cbecc55a77..8033951a6f 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
index 034951ecf8..f475f05c48 100644
--- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
+++ b/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>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index d7477951b6..3a4a2fc071 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.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'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 5a5232751d..8f9e620b04 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.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'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 63546dc0a5..44e93d11d5 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.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</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index ccb95e6eac..1f837587f7 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.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'>cortex-a9</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index 4a897d5e1e..524e483834 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.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'>cortex-a9</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index fb1aeae15c..f121524f2a 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.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>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index efe999e4a2..e146dfb769 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.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'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index efc21244b3..331117c39c 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.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'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index f216a8af33..819c5dde97 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.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'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index d52814f9ee..d4b9e48275 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.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>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index c5a11d03b4..1661a48934 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.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'>EPYC-Rome</model>
<vendor>AMD</vendor>
--
2.29.2
8:19 a.m.
New subject: [libvirt PATCH 2/5] conf: add reporting of "maximum" CPU mode in domain caps
On Tue, Feb 09, 2021 at 01:58:58PM +0000, Daniel P. Berrangé wrote:
+ <mode name='maximum'
supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
Hmmm - that "supported" attribute is something I hadn't noticed
before. Does this mean <mode name='maximum' supported='no'> is
possible in qemu capabilities? A quick scan of the libguestfs code
seems to show we don't cope with that.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html
8:26 a.m.
New subject: [libvirt PATCH 2/5] conf: add reporting of "maximum" CPU mode in domain caps
On Tue, Feb 09, 2021 at 02:19:21PM +0000, Richard W.M. Jones wrote:
On Tue, Feb 09, 2021 at 01:58:58PM +0000, Daniel P. Berrangé wrote:
> + <mode name='maximum' supported='yes'>
> + <enum name='maximumMigratable'>
> + <value>on</value>
> + <value>off</value>
> + </enum>
> + </mode>
> <mode name='host-model' supported='yes'>
Hmmm - that "supported" attribute is something I hadn't noticed
before. Does this mean <mode name='maximum' supported='no'> is
possible in qemu capabilities? A quick scan of the libguestfs code
seems to show we don't cope with that.
It will be possible for QEMU versions prior to 2.9.0, as they dont
support "-cpu max". Some architectures may not support this too.
At least ppc64, aarch64 and x86-64 and s390 do.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
8:42 a.m.
New subject: [libvirt PATCH 2/5] conf: add reporting of "maximum" CPU mode in domain caps
On Tue, Feb 09, 2021 at 01:58:58PM +0000, Daniel P. Berrangé wrote:
The data reported is the same as for "host-passthrough"
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/formatdomaincaps.html.in | 6 ++++++
docs/schemas/domaincaps.rng | 13 +++++++++++++
src/conf/domain_capabilities.c | 15 +++++++++++++++
src/conf/domain_capabilities.h | 2 ++
tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 +
tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 +
tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 +
tests/domaincapsdata/empty.xml | 1 +
tests/domaincapsdata/libxl-xenfv.xml | 1 +
tests/domaincapsdata/libxl-xenpv.xml | 1 +
tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.7.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 +
111 files changed, 143 insertions(+)
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
7:58 a.m.
New subject: [libvirt PATCH 3/5] cpu: wire up support for maximum CPU mode
The logic applied in the ppc64 case isn't quite correct, as the
interpretation of maximum mode depends on whether hardware virt
is used or not. This is information the CPU driver doesn't have.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/cpu/cpu.c | 3 ++-
src/cpu/cpu_ppc64.c | 10 ++++++++--
src/cpu/cpu_x86.c | 3 ++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 6ff88d6a9f..dfedf5bbf0 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -884,7 +884,8 @@ virCPUTranslate(virArch arch,
return -1;
if (cpu->mode == VIR_CPU_MODE_HOST_MODEL ||
- cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH)
+ cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH ||
+ cpu->mode == VIR_CPU_MODE_MAXIMUM)
return 0;
if (virCPUModelIsAllowed(cpu->model, models))
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index d71d147207..3e34b14f79 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -474,8 +474,14 @@ ppc64Compute(virCPUDefPtr host,
G_GNUC_FALLTHROUGH;
case VIR_CPU_MODE_HOST_PASSTHROUGH:
- /* host-model and host-passthrough:
- * the guest CPU is the same as the host */
+ case VIR_CPU_MODE_MAXIMUM:
+ /* host-model, host-passthrough & maximum:
+ * the guest CPU is the same as the host.
+ *
+ * Note for maximum, with non hardware virt
+ * the guest CPU is actually arbitrarily defined by
+ * the emulator, so this isn't strictly correct.
+ */
guest_model = ppc64ModelCopy(host_model);
break;
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 2422e258ec..fe423f38f9 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -3050,7 +3050,8 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
virCPUDataPtr dataEnabled,
virCPUDataPtr dataDisabled)
{
- bool hostPassthrough = cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH;
+ bool hostPassthrough = (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH ||
+ cpu->mode == VIR_CPU_MODE_MAXIMUM);
virCPUx86MapPtr map;
g_autoptr(virCPUx86Model) model = NULL;
g_autoptr(virCPUx86Model) modelDisabled = NULL;
--
2.29.2
8:44 a.m.
New subject: [libvirt PATCH 3/5] cpu: wire up support for maximum CPU mode
On Tue, Feb 09, 2021 at 01:58:59PM +0000, Daniel P. Berrangé wrote:
The logic applied in the ppc64 case isn't quite correct, as the
interpretation of maximum mode depends on whether hardware virt
is used or not. This is information the CPU driver doesn't have.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/cpu/cpu.c | 3 ++-
src/cpu/cpu_ppc64.c | 10 ++++++++--
src/cpu/cpu_x86.c | 3 ++-
3 files changed, 12 insertions(+), 4 deletions(-)
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
7:59 a.m.
New subject: [libvirt PATCH 4/5] qemu: probe for "-cpu max" support
This is a special CPU model similar to "-cpu host", so won't use our
normal CPU model detection logic.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 11 +++++++++++
src/qemu/qemu_capabilities.h | 1 +
2 files changed, 12 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d0378f94bc..ecfb313d0a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -614,6 +614,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 390 */
"vhost-user-blk",
+ "cpu-max",
);
@@ -2984,12 +2985,22 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
virQEMUCapsAccelPtr accel,
qemuMonitorPtr mon)
{
+ qemuMonitorCPUDefsPtr defs = accel->cpuModels;
+ size_t i;
+
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
return 0;
if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &accel->cpuModels)
< 0)
return -1;
+ for (i = 0; i < defs->ncpus; i++) {
+ if (STREQ_NULLABLE(defs->cpus[i].name, "max")) {
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX);
+ break;
+ }
+ }
+
return 0;
}
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 8cb5673042..79d443adfb 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -594,6 +594,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 390 */
QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */
+ QEMU_CAPS_CPU_MAX, /* -cpu max */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
--
2.29.2
10:23 a.m.
New subject: [libvirt PATCH 4/5] qemu: probe for "-cpu max" support
On Tue, Feb 09, 2021 at 01:59:00PM +0000, Daniel P. Berrangé wrote:
This is a special CPU model similar to "-cpu host", so
won't use our
normal CPU model detection logic.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 11 +++++++++++
src/qemu/qemu_capabilities.h | 1 +
2 files changed, 12 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d0378f94bc..ecfb313d0a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -614,6 +614,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 390 */
"vhost-user-blk",
+ "cpu-max",
);
@@ -2984,12 +2985,22 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
virQEMUCapsAccelPtr accel,
qemuMonitorPtr mon)
{
+ qemuMonitorCPUDefsPtr defs = accel->cpuModels;
accel->cpuModels is NULL here ... [0]
+ size_t i;
+
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
return 0;
if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &accel->cpuModels)
< 0)
return -1;
+ for (i = 0; i < defs->ncpus; i++) {
[0] ... so here it will crash.
+ if (STREQ_NULLABLE(defs->cpus[i].name, "max"))
{
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX);
+ break;
+ }
+ }
+
Do we trust QEMU that if accel=kvm supports cpu-max that accel=tcg
supports it as well and is that true on all architectures?
Pavel
10:25 a.m.
New subject: [libvirt PATCH 4/5] qemu: probe for "-cpu max" support
On Tue, Feb 09, 2021 at 05:23:35PM +0100, Pavel Hrdina wrote:
On Tue, Feb 09, 2021 at 01:59:00PM +0000, Daniel P. Berrangé wrote:
> This is a special CPU model similar to "-cpu host", so won't use our
> normal CPU model detection logic.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
> src/qemu/qemu_capabilities.c | 11 +++++++++++
> src/qemu/qemu_capabilities.h | 1 +
> 2 files changed, 12 insertions(+)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index d0378f94bc..ecfb313d0a 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -614,6 +614,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
>
> /* 390 */
> "vhost-user-blk",
> + "cpu-max",
> );
>
>
> @@ -2984,12 +2985,22 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
> virQEMUCapsAccelPtr accel,
> qemuMonitorPtr mon)
> {
> + qemuMonitorCPUDefsPtr defs = accel->cpuModels;
accel->cpuModels is NULL here ... [0]
> + size_t i;
> +
> if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
> return 0;
>
> if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch,
&accel->cpuModels) < 0)
> return -1;
>
> + for (i = 0; i < defs->ncpus; i++) {
[0] ... so here it will crash.
> + if (STREQ_NULLABLE(defs->cpus[i].name, "max")) {
> + virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX);
> + break;
> + }
> + }
> +
Do we trust QEMU that if accel=kvm supports cpu-max that accel=tcg
supports it as well and is that true on all architectures?
Yes, it would be considered a bug if that wasn't the case, because the
whole point of "max" is that it works for KVM and TCG.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
10:35 a.m.
New subject: [libvirt PATCH 4/5] qemu: probe for "-cpu max" support
On Tue, Feb 09, 2021 at 04:25:06PM +0000, Daniel P. Berrangé wrote:
On Tue, Feb 09, 2021 at 05:23:35PM +0100, Pavel Hrdina wrote:
> On Tue, Feb 09, 2021 at 01:59:00PM +0000, Daniel P. Berrangé wrote:
> > This is a special CPU model similar to "-cpu host", so won't use
our
> > normal CPU model detection logic.
> >
> > Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> > ---
> > src/qemu/qemu_capabilities.c | 11 +++++++++++
> > src/qemu/qemu_capabilities.h | 1 +
> > 2 files changed, 12 insertions(+)
> >
> > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> > index d0378f94bc..ecfb313d0a 100644
> > --- a/src/qemu/qemu_capabilities.c
> > +++ b/src/qemu/qemu_capabilities.c
> > @@ -614,6 +614,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
> >
> > /* 390 */
> > "vhost-user-blk",
> > + "cpu-max",
> > );
> >
> >
> > @@ -2984,12 +2985,22 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr
qemuCaps,
> > virQEMUCapsAccelPtr accel,
> > qemuMonitorPtr mon)
> > {
> > + qemuMonitorCPUDefsPtr defs = accel->cpuModels;
>
> accel->cpuModels is NULL here ... [0]
>
> > + size_t i;
> > +
> > if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
> > return 0;
> >
> > if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch,
&accel->cpuModels) < 0)
> > return -1;
> >
> > + for (i = 0; i < defs->ncpus; i++) {
>
> [0] ... so here it will crash.
>
> > + if (STREQ_NULLABLE(defs->cpus[i].name, "max")) {
> > + virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX);
> > + break;
> > + }
> > + }
> > +
>
> Do we trust QEMU that if accel=kvm supports cpu-max that accel=tcg
> supports it as well and is that true on all architectures?
Yes, it would be considered a bug if that wasn't the case, because the
whole point of "max" is that it works for KVM and TCG.
OK, in that case if you move the fix for the crash from previous patch
here
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
7:59 a.m.
New subject: [libvirt PATCH 5/5] qemu: wire up support for maximum CPU model
The "max" model can be treated the same way as "host" model in
general.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 17 ++++++++++++++++-
src/qemu/qemu_command.c | 10 +++++++---
src/qemu/qemu_domain.c | 11 +++++++----
src/qemu/qemu_driver.c | 2 ++
src/qemu/qemu_process.c | 8 +++++---
src/qemu/qemu_validate.c | 13 +++++++++++--
tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 7 ++++++-
.../domaincapsdata/qemu_2.12.0-virt.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 7 ++++++-
.../domaincapsdata/qemu_4.0.0-virt.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 7 ++++++-
.../domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 7 ++++++-
.../domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 7 ++++++-
.../domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.2.0.s390x.xml | 7 ++++++-
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 7 ++++++-
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 ++++++-
.../qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 +
.../caps_2.12.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 +
.../qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 +
.../qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 +
.../qemuxml2argvdata/cpu-cache-passthrough3.err | 2 +-
94 files changed, 431 insertions(+), 73 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ecfb313d0a..58e28c3bd1 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2336,6 +2336,8 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
return cpus && cpus->ncpus > 0;
case VIR_CPU_MODE_MAXIMUM:
+ return virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MAX);
+
case VIR_CPU_MODE_LAST:
break;
}
@@ -2985,7 +2987,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
virQEMUCapsAccelPtr accel,
qemuMonitorPtr mon)
{
- qemuMonitorCPUDefsPtr defs = accel->cpuModels;
+ qemuMonitorCPUDefsPtr defs;
size_t i;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
@@ -2994,6 +2996,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &accel->cpuModels)
< 0)
return -1;
+ defs = accel->cpuModels;
for (i = 0; i < defs->ncpus; i++) {
if (STREQ_NULLABLE(defs->cpus[i].name, "max")) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX);
@@ -5977,6 +5980,18 @@ virQEMUCapsFillDomainCPUCaps(virQEMUCapsPtr qemuCaps,
VIR_TRISTATE_SWITCH_OFF);
}
+ if (virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, domCaps->virttype,
+ VIR_CPU_MODE_MAXIMUM,
+ domCaps->machine)) {
+ domCaps->cpu.maximum = true;
+
+ domCaps->cpu.maximumMigratable.report = true;
+ VIR_DOMAIN_CAPS_ENUM_SET(domCaps->cpu.maximumMigratable,
+ VIR_TRISTATE_SWITCH_ON);
+ VIR_DOMAIN_CAPS_ENUM_SET(domCaps->cpu.maximumMigratable,
+ VIR_TRISTATE_SWITCH_OFF);
+ }
+
if (virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, domCaps->virttype,
VIR_CPU_MODE_HOST_MODEL,
domCaps->machine)) {
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 059563d92f..f0333d4f1a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6316,7 +6316,11 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
switch ((virCPUMode) cpu->mode) {
case VIR_CPU_MODE_HOST_PASSTHROUGH:
- virBufferAddLit(buf, "host");
+ case VIR_CPU_MODE_MAXIMUM:
+ if (cpu->mode == VIR_CPU_MODE_MAXIMUM)
+ virBufferAddLit(buf, "max");
+ else
+ virBufferAddLit(buf, "host");
if (def->os.arch == VIR_ARCH_ARMV7L &&
driver->hostarch == VIR_ARCH_AARCH64) {
@@ -6356,7 +6360,6 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
virBufferAdd(buf, cpu->model, -1);
break;
- case VIR_CPU_MODE_MAXIMUM:
case VIR_CPU_MODE_LAST:
break;
}
@@ -6601,7 +6604,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
}
if (hostOff &&
- def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH &&
+ (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH ||
+ def->cpu->mode == VIR_CPU_MODE_MAXIMUM) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_CACHE))
virBufferAddLit(&buf, ",host-cache-info=off");
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d89aea340b..53b4fb5f4f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4049,12 +4049,14 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def,
break;
case VIR_CPU_CACHE_MODE_PASSTHROUGH:
- if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
+ if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
+ def->cpu->mode != VIR_CPU_MODE_MAXIMUM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("CPU cache mode '%s' can only be used with
"
- "'%s' CPUs"),
+ "'%s' / '%s' CPUs"),
virCPUCacheModeTypeToString(cache->mode),
- virCPUModeTypeToString(VIR_CPU_MODE_HOST_PASSTHROUGH));
+ virCPUModeTypeToString(VIR_CPU_MODE_HOST_PASSTHROUGH),
+ virCPUModeTypeToString(VIR_CPU_MODE_MAXIMUM));
return -1;
}
@@ -4136,6 +4138,7 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def,
switch ((virCPUMode) def->cpu->mode) {
case VIR_CPU_MODE_HOST_PASSTHROUGH:
+ case VIR_CPU_MODE_MAXIMUM:
def->cpu->check = VIR_CPU_CHECK_NONE;
break;
@@ -4151,7 +4154,6 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def,
def->cpu->check = VIR_CPU_CHECK_PARTIAL;
break;
- case VIR_CPU_MODE_MAXIMUM:
case VIR_CPU_MODE_LAST:
break;
}
@@ -6304,6 +6306,7 @@ qemuDomainObjCheckCPUTaint(virQEMUDriverPtr driver,
switch (obj->def->cpu->mode) {
case VIR_CPU_MODE_HOST_PASSTHROUGH:
+ case VIR_CPU_MODE_MAXIMUM:
if (incomingMigration)
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HOST_CPU, logCtxt);
break;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c34af6b7d1..b0d907fbb3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12314,6 +12314,8 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn,
if (!cpu->model) {
if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) {
cpu->model = g_strdup("host");
+ } else if (cpu->mode == VIR_CPU_MODE_MAXIMUM) {
+ cpu->model = g_strdup("max");
} else {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("cpu parameter is missing a model name"));
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 30cfa4d485..8d21e45218 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6156,8 +6156,9 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
if (virCPUConvertLegacy(hostarch, def->cpu) < 0)
return -1;
- /* nothing to update for host-passthrough */
- if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
+ /* nothing to update for host-passthrough / maximum */
+ if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
+ def->cpu->mode != VIR_CPU_MODE_MAXIMUM) {
g_autoptr(virDomainCapsCPUModels) cpuModels = NULL;
if (def->cpu->check == VIR_CPU_CHECK_PARTIAL &&
@@ -8055,7 +8056,8 @@ qemuProcessRefreshCPUMigratability(virQEMUDriverPtr driver,
bool migratable;
int rc;
- if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH)
+ if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
+ def->cpu->mode != VIR_CPU_MODE_MAXIMUM)
return 0;
/* If the cpu.migratable capability is present, the migratable attribute
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index bf4ac19104..62a915e946 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -255,10 +255,11 @@ qemuValidateDomainDefFeatures(const virDomainDef *def,
case VIR_DOMAIN_FEATURE_KVM:
if (def->kvm_features[VIR_DOMAIN_KVM_DEDICATED] == VIR_TRISTATE_SWITCH_ON
&&
- (!def->cpu || def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH))
{
+ (!def->cpu || (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH
&&
+ def->cpu->mode != VIR_CPU_MODE_MAXIMUM))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("kvm-hint-dedicated=on is only applicable "
- "for cpu host-passthrough"));
+ "for cpu host-passthrough / maximum"));
return -1;
}
break;
@@ -396,7 +397,15 @@ qemuValidateDomainDefCpu(virQEMUDriverPtr driver,
* CUSTOM.
*/
break;
+
case VIR_CPU_MODE_MAXIMUM:
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MAX)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("maximum CPU is not supported by QEMU binary"));
+ return -1;
+ }
+ break;
+
case VIR_CPU_MODE_CUSTOM:
case VIR_CPU_MODE_LAST:
break;
diff --git a/tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
index e0314996c9..06507fdbd6 100644
--- a/tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
index 3a1cec224d..83f1b8eeb3 100644
--- a/tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_2.10.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.10.0.x86_64.xml
index f6db53e80d..1402425134 100644
--- a/tests/domaincapsdata/qemu_2.10.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.10.0.x86_64.xml
@@ -33,7 +33,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
index 742ea30a66..df11d98164 100644
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
index f077ca15e6..dd4b9eb3a5 100644
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
index fb683a82eb..bed878437b 100644
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
@@ -33,7 +33,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
index d0512678e0..d23323e896 100644
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
index d45c3cdcda..b7ed014bcc 100644
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
index 8a6fbe9fe1..6fb16ea733 100644
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
@@ -32,7 +32,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
index 05fbfef6e8..890354eb5f 100644
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
index 310bef66c7..cbd2452163 100644
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <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'>POWER8</model>
</mode>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
index 456d13d8a0..ac3a707d08 100644
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
index 440529443c..797b970040 100644
--- a/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
index 77bf8f4c52..b47c426f1b 100644
--- a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
index 50ef469308..7716e9d381 100644
--- a/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
@@ -33,7 +33,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
index 72bc877529..648244d37a 100644
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
index 9354167ff7..fde3f445a3 100644
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
index d8d8147bf4..7b8a2ab484 100644
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <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'>POWER8</model>
</mode>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
index 6561a9695c..898c191ab7 100644
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index d57f1c78b3..97912f8119 100644
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index be3d54d87e..02c9ce1d38 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
index 0f5be3a16f..a3c1d7be5d 100644
--- a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <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'>POWER8</model>
</mode>
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 859f973a40..2819a22ee0 100644
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index b873149375..d17068003d 100644
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index 7a793ef8f9..e65b8c21a3 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
index e9eb19e39d..282a6b50da 100644
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
@@ -32,7 +32,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
index 43a492508f..a84b0d7a7a 100644
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
diff --git a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
index 44d6cd5c2e..15a536f21c 100644
--- a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <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'>POWER8</model>
</mode>
diff --git a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
index 7730f801ec..5a8f0eaf69 100644
--- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>z14.2-base</model>
<feature policy='require' name='aen'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index a06a9fdc79..e11d68f2ee 100644
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 5081f5175e..f3784936fb 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index 717b6b1b5a..d759d00c61 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-IBPB</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 1094ff4685..3578e27c11 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index d76e5a9a18..8083dd2aeb 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index b90d300c42..ec001884b7 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-IBPB</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 814b2cf3f5..2ad2936d59 100644
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
@@ -32,7 +32,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index 2af62f7c07..72739fd752 100644
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 9523743b18..69cbd260cf 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <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'>POWER8</model>
</mode>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index b5d92836d5..17b28d84d1 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>gen15a-base</model>
<feature policy='require' name='aen'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 682225719d..be1be2dcae 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index e376a36df0..590742b8d1 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 7aa9dbdf0c..37aaa6f3da 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index 10ca10ae7d..b762c7108f 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -32,7 +32,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>cortex-a9</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index 524e483834..c9561c6d92 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>cortex-a9</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index e2339d7600..fd088bd2d5 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <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'>POWER8</model>
</mode>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 49a8481f24..16f3459c48 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index b654c741f4..41c59755df 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 8033951a6f..9afba50265 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 3a4a2fc071..ab3a7474d3 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 8f9e620b04..0ac7b1240f 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 44e93d11d5..7fcbb8c0f2 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index 1f837587f7..a5b063e7f8 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -32,7 +32,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>cortex-a9</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index 524e483834..c9561c6d92 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>cortex-a9</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index f121524f2a..93e020302e 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <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'>POWER8</model>
</mode>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index e146dfb769..d54f88fc10 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -30,7 +30,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>gen15a-base</model>
<feature policy='require' name='aen'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 331117c39c..35dca37b28 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index 819c5dde97..ae0d4a6264 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -35,7 +35,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index d4b9e48275..bd2c51f34b 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -29,7 +29,12 @@
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 1661a48934..e104a6b2d8 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -34,7 +34,12 @@
<value>off</value>
</enum>
</mode>
- <mode name='maximum' supported='no'/>
+ <mode name='maximum' supported='yes'>
+ <enum name='maximumMigratable'>
+ <value>on</value>
+ <value>off</value>
+ </enum>
+ </mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 2fe1888535..579b88c17f 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -193,6 +193,7 @@
<flag name='fsdev.createmode'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='cpu-max'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 56024cfa5d..2c475d73bc 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -200,6 +200,7 @@
<flag name='fsdev.createmode'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='cpu-max'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100288</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 3ff1bf3ff8..d4dad8d8b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -167,6 +167,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 9311bf66db..f441354054 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -168,6 +168,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index df0ce08da6..d54e305e2e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -211,6 +211,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index d984ad3066..37406cb4a9 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -186,6 +186,7 @@
<flag name='migration-param.downtime'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='cpu-max'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100247</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index dc0e8d637e..28cc662bfb 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -170,6 +170,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>2012050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 2ea912eaad..09bdbf7fc7 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -217,6 +217,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index b05f16983c..11d8d668de 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -175,6 +175,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>3000091</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 8a892a5da3..7c7216826b 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -220,6 +220,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>3000092</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index c28ada94fb..c44d5c6ddf 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -181,6 +181,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index a15edd87de..7094752b29 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -189,6 +189,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 4a10deea01..8cc3a51eeb 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -145,6 +145,7 @@
<flag name='migration-param.xbzrle-cache-size'/>
<flag name='fsdev.createmode'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index c580d29374..23a150348d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -226,6 +226,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 26eb3786e8..792ea9e9e9 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -233,6 +233,7 @@
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4001000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 4c149e79bb..20549834eb 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -194,6 +194,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4001050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index a0019f2a20..58c73f0a98 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -195,6 +195,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4001050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 41db85be6b..9bfdb2ce63 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -156,6 +156,7 @@
<flag name='blockdev-hostdev-scsi'/>
<flag name='fsdev.createmode'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 976eaf347b..10dc5d562e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -242,6 +242,7 @@
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>4002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index b9963bbd7e..3e8c87ece3 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -204,6 +204,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 46edacd44b..49479c215f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -213,6 +213,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index f5bcc9ed83..99155d9097 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -249,6 +249,7 @@
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index f7d0be69cb..9e1fa172df 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -251,6 +251,7 @@
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5001000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 6b40141f15..1f015c2da1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -208,6 +208,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 298139cdd7..bc94e50e59 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -215,6 +215,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index b59404230c..8ca989facb 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -163,6 +163,7 @@
<flag name='netdev.vhost-vdpa'/>
<flag name='fsdev.createmode'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 52a755ffc8..c85362e1db 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -252,6 +252,7 @@
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 0cb94e02e8..0f2467609c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -253,6 +253,7 @@
<flag name='virtio-pmem-pci'/>
<flag name='vhost-user-fs.bootindex'/>
<flag name='vhost-user-blk'/>
+ <flag name='cpu-max'/>
<version>5002050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough3.err
b/tests/qemuxml2argvdata/cpu-cache-passthrough3.err
index 2d64cda5e5..6581f143d6 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough3.err
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough3.err
@@ -1 +1 @@
-unsupported configuration: CPU cache mode 'passthrough' can only be used with
'host-passthrough' CPUs
+unsupported configuration: CPU cache mode 'passthrough' can only be used with
'host-passthrough' / 'maximum' CPUs
--
2.29.2
8:21 a.m.
New subject: [libvirt PATCH 5/5] qemu: wire up support for maximum CPU model
Patch series looks fine to me, and we can certainly use this feature.
One question I have about it: Does this apply to all architectures
equally, or will we need to detect it from capabilities? I mean to
say, if this was added to libvirt version X, then I might mandate that
you have to use libvirt >= X and not bother detecting it (as the
feature is so useful). But if it applies only on some architectures
then we'd have to detect it anyway.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/
8:27 a.m.
New subject: [libvirt PATCH 5/5] qemu: wire up support for maximum CPU model
On Tue, Feb 09, 2021 at 02:21:32PM +0000, Richard W.M. Jones wrote:
Patch series looks fine to me, and we can certainly use this feature.
One question I have about it: Does this apply to all architectures
equally, or will we need to detect it from capabilities? I mean to
say, if this was added to libvirt version X, then I might mandate that
you have to use libvirt >= X and not bother detecting it (as the
feature is so useful). But if it applies only on some architectures
then we'd have to detect it anyway.
Most but not all QEMU architectures. riscv64 is a notable one that
lacks "-cpu max" in QEMU. For that matter, it may well lack
"-cpu host" too from what i see ?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
10:33 a.m.
New subject: [libvirt PATCH 5/5] qemu: wire up support for maximum CPU model
On Tue, Feb 09, 2021 at 01:59:01PM +0000, Daniel P. Berrangé wrote:
The "max" model can be treated the same way as
"host" model in general.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
94 files changed, 431 insertions(+), 73 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ecfb313d0a..58e28c3bd1 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2336,6 +2336,8 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
return cpus && cpus->ncpus > 0;
case VIR_CPU_MODE_MAXIMUM:
+ return virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MAX);
+
case VIR_CPU_MODE_LAST:
break;
}
@@ -2985,7 +2987,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
virQEMUCapsAccelPtr accel,
qemuMonitorPtr mon)
{
- qemuMonitorCPUDefsPtr defs = accel->cpuModels;
+ qemuMonitorCPUDefsPtr defs;
size_t i;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
@@ -2994,6 +2996,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &accel->cpuModels)
< 0)
return -1;
+ defs = accel->cpuModels;
And there is the fix for the crash from previous patch, so please do it
directly there.
for (i = 0; i < defs->ncpus; i++) {
if (STREQ_NULLABLE(defs->cpus[i].name, "max")) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX);
@@ -5977,6 +5980,18 @@ virQEMUCapsFillDomainCPUCaps(virQEMUCapsPtr qemuCaps,
VIR_TRISTATE_SWITCH_OFF);
}
+ if (virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, domCaps->virttype,
+ VIR_CPU_MODE_MAXIMUM,
+ domCaps->machine)) {
+ domCaps->cpu.maximum = true;
+
+ domCaps->cpu.maximumMigratable.report = true;
+ VIR_DOMAIN_CAPS_ENUM_SET(domCaps->cpu.maximumMigratable,
+ VIR_TRISTATE_SWITCH_ON);
+ VIR_DOMAIN_CAPS_ENUM_SET(domCaps->cpu.maximumMigratable,
+ VIR_TRISTATE_SWITCH_OFF);
+ }
+
if (virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, domCaps->virttype,
VIR_CPU_MODE_HOST_MODEL,
domCaps->machine)) {
[...]
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index bf4ac19104..62a915e946 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -255,10 +255,11 @@ qemuValidateDomainDefFeatures(const virDomainDef *def,
case VIR_DOMAIN_FEATURE_KVM:
if (def->kvm_features[VIR_DOMAIN_KVM_DEDICATED] == VIR_TRISTATE_SWITCH_ON
&&
- (!def->cpu || def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH))
{
+ (!def->cpu || (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH
&&
+ def->cpu->mode != VIR_CPU_MODE_MAXIMUM))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("kvm-hint-dedicated=on is only applicable "
- "for cpu host-passthrough"));
+ "for cpu host-passthrough / maximum"));
return -1;
}
break;
@@ -396,7 +397,15 @@ qemuValidateDomainDefCpu(virQEMUDriverPtr driver,
* CUSTOM.
*/
break;
+
case VIR_CPU_MODE_MAXIMUM:
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MAX)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("maximum CPU is not supported by QEMU binary"));
s/by QEMU/by this QEMU/
+ return -1;
+ }
+ break;
+
case VIR_CPU_MODE_CUSTOM:
case VIR_CPU_MODE_LAST:
break;
Otherwise looks good but it would need some changes if we do not trust
QEMU to behave the same way for kvm and tcg.
Pavel
10:37 a.m.
New subject: [libvirt PATCH 5/5] qemu: wire up support for maximum CPU model
On Tue, Feb 09, 2021 at 05:33:28PM +0100, Pavel Hrdina wrote:
On Tue, Feb 09, 2021 at 01:59:01PM +0000, Daniel P. Berrangé wrote:
> The "max" model can be treated the same way as "host" model in
general.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
> 94 files changed, 431 insertions(+), 73 deletions(-)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index ecfb313d0a..58e28c3bd1 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -2336,6 +2336,8 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
> return cpus && cpus->ncpus > 0;
>
> case VIR_CPU_MODE_MAXIMUM:
> + return virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MAX);
> +
> case VIR_CPU_MODE_LAST:
> break;
> }
> @@ -2985,7 +2987,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
> virQEMUCapsAccelPtr accel,
> qemuMonitorPtr mon)
> {
> - qemuMonitorCPUDefsPtr defs = accel->cpuModels;
> + qemuMonitorCPUDefsPtr defs;
> size_t i;
>
> if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS))
> @@ -2994,6 +2996,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
> if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch,
&accel->cpuModels) < 0)
> return -1;
>
> + defs = accel->cpuModels;
And there is the fix for the crash from previous patch, so please do it
directly there.
> for (i = 0; i < defs->ncpus; i++) {
> if (STREQ_NULLABLE(defs->cpus[i].name, "max")) {
> virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX);
> @@ -5977,6 +5980,18 @@ virQEMUCapsFillDomainCPUCaps(virQEMUCapsPtr qemuCaps,
> VIR_TRISTATE_SWITCH_OFF);
> }
>
> + if (virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, domCaps->virttype,
> + VIR_CPU_MODE_MAXIMUM,
> + domCaps->machine)) {
> + domCaps->cpu.maximum = true;
> +
> + domCaps->cpu.maximumMigratable.report = true;
> + VIR_DOMAIN_CAPS_ENUM_SET(domCaps->cpu.maximumMigratable,
> + VIR_TRISTATE_SWITCH_ON);
> + VIR_DOMAIN_CAPS_ENUM_SET(domCaps->cpu.maximumMigratable,
> + VIR_TRISTATE_SWITCH_OFF);
> + }
> +
> if (virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, domCaps->virttype,
> VIR_CPU_MODE_HOST_MODEL,
> domCaps->machine)) {
[...]
> diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
> index bf4ac19104..62a915e946 100644
> --- a/src/qemu/qemu_validate.c
> +++ b/src/qemu/qemu_validate.c
> @@ -255,10 +255,11 @@ qemuValidateDomainDefFeatures(const virDomainDef *def,
>
> case VIR_DOMAIN_FEATURE_KVM:
> if (def->kvm_features[VIR_DOMAIN_KVM_DEDICATED] ==
VIR_TRISTATE_SWITCH_ON &&
> - (!def->cpu || def->cpu->mode !=
VIR_CPU_MODE_HOST_PASSTHROUGH)) {
> + (!def->cpu || (def->cpu->mode !=
VIR_CPU_MODE_HOST_PASSTHROUGH &&
> + def->cpu->mode != VIR_CPU_MODE_MAXIMUM))) {
> virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> _("kvm-hint-dedicated=on is only applicable
"
> - "for cpu host-passthrough"));
> + "for cpu host-passthrough / maximum"));
> return -1;
> }
> break;
> @@ -396,7 +397,15 @@ qemuValidateDomainDefCpu(virQEMUDriverPtr driver,
> * CUSTOM.
> */
> break;
> +
> case VIR_CPU_MODE_MAXIMUM:
> + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MAX)) {
> + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> + _("maximum CPU is not supported by QEMU
binary"));
s/by QEMU/by this QEMU/
> + return -1;
> + }
> + break;
> +
> case VIR_CPU_MODE_CUSTOM:
> case VIR_CPU_MODE_LAST:
> break;
Otherwise looks good but it would need some changes if we do not trust
QEMU to behave the same way for kvm and tcg.
Pavel
No chages needed for the kvm vs tcg question so with the issues fixed
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
1372
days inactive
1373
days old
21 comments
3 participants
participants (3)
-
Daniel P. Berrangé -
Pavel Hrdina -
Richard W.M. Jones