April 2025 - Devel - libvirt List Archives

[PATCH v2 0/3] Prefer noipa attribute over noinline
by Michal Privoznik 29 Apr '25

29 Apr '25

v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/IETW… diff to v1: - The macro is renamed to ATTRIBUTE_MOCKABLE - The python script is subsequently renamed to mockable-attribute.py Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1791517164 As discussed with Daniel on my v1 series, this is definitely v11.4.0 material, i.e. AFTER the release. Michal Prívozník (3): internal: Introduce ATTRIBUTE_MOCKABLE src: s/G_NO_INLINE/ATTRIBUTE_MOCKABLE/ scripts: Adapt mock-noinline.py to ATTRIBUTE_MOCKABLE build-aux/syntax-check.mk | 4 ++-- docs/coding-style.rst | 2 +- scripts/cocci-macro-file.h | 1 + scripts/meson.build | 2 +- ...mock-noinline.py => mockable-attribute.py} | 8 +++---- src/cpu/cpu.h | 2 +- src/hypervisor/domain_interface.h | 2 +- src/internal.h | 22 +++++++++++++++++++ src/libxl/libxl_capabilities.h | 2 +- src/qemu/qemu_capabilities.h | 4 ++-- src/qemu/qemu_capspriv.h | 2 +- src/qemu/qemu_command.h | 6 ++--- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_monitor_priv.h | 2 +- src/qemu/qemu_process.h | 6 ++--- src/rpc/virnetsocket.h | 4 ++-- src/util/vircgroupv2devices.h | 2 +- src/util/vircommand.h | 2 +- src/util/virdevmapper.h | 2 +- src/util/virfile.h | 20 ++++++++--------- src/util/virfirewalld.h | 2 +- src/util/virhashcode.h | 2 +- src/util/virhostcpu.h | 8 +++---- src/util/virhostmem.h | 2 +- src/util/virhostuptime.h | 2 +- src/util/viridentitypriv.h | 2 +- src/util/virmacaddr.h | 2 +- src/util/virnetdev.h | 12 +++++----- src/util/virnetdevbandwidth.h | 2 +- src/util/virnetdevip.h | 2 +- src/util/virnetdevmacvlan.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.h | 6 ++--- src/util/virnuma.h | 18 +++++++-------- src/util/virpci.h | 2 +- src/util/virprocess.h | 6 ++--- src/util/virrandom.h | 4 ++-- src/util/virscsi.h | 2 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.h | 2 +- src/util/virutil.h | 16 +++++++------- src/util/viruuid.h | 4 ++-- 46 files changed, 115 insertions(+), 92 deletions(-) rename scripts/{mock-noinline.py => mockable-attribute.py} (91%) -- 2.49.0

2 6

[PATCH 0/2] Make mock-noinline.py work again
by Michal Privoznik 28 Apr '25

28 Apr '25

*** BLURB HERE *** Michal Prívozník (2): util: Add missing G_NO_INLINE annotation scripts: Fix reading list of files in mock-noinline.py scripts/mock-noinline.py | 3 ++- src/util/virfirewalld.h | 2 +- src/util/virhostcpu.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) -- 2.49.0

3 5

[PATCH] qemu: Add GTK display with OpenGL support
by Kirill Shchetiniuk 28 Apr '25

28 Apr '25

From: Kirill Shchetiniuk <kshcheti(a)redhat.com> Introduce GTK display support with OpenGL for the QEMU driver. - Add new XML options for GTK display type. - Include capability flags for the QEMU driver. Note: The `QEMU_CAPS_GTK_GL` flag cannot yet be checked, so device definition validation is incomplete. A placeholder is left for future implementation, when the GTK along with OpenGL capability check would be available in QEMU. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/570 Signed-off-by: Kirill Shchetiniuk <kshcheti(a)redhat.com> --- src/conf/domain_conf.c | 79 ++++++++++++++++++- src/conf/domain_conf.h | 8 ++ src/conf/schemas/domaincommon.rng | 28 +++++++ src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 39 ++++++++- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 2 + src/qemu/qemu_extdevice.c | 2 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 8 ++ src/qemu/qemu_validate.c | 16 ++++ src/security/virt-aa-helper.c | 6 ++ src/vmx/vmx.c | 1 + tests/domaincapsdata/qemu_10.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.2.0.ppc.xml | 1 + .../qemu_8.2.0-tcg-virt.loongarch64.xml | 1 + .../qemu_8.2.0-virt.aarch64.xml | 1 + .../qemu_8.2.0-virt.loongarch64.xml | 1 + tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_8.2.0.armv7l.xml | 1 + tests/domaincapsdata/qemu_9.0.0.sparc.xml | 1 + tests/domaincapsdata/qemu_9.1.0.s390x.xml | 1 + tests/domaincapsdata/qemu_9.2.0.s390x.xml | 1 + .../caps_10.0.0_s390x.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_8.2.0_aarch64.xml | 1 + .../caps_8.2.0_armv7l.xml | 1 + .../caps_8.2.0_loongarch64.xml | 1 + .../qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 + .../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 + .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 + 36 files changed, 218 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 542d6ade91..73550f7fcf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -960,6 +960,7 @@ VIR_ENUM_IMPL(virDomainGraphics, "spice", "egl-headless", "dbus", + "gtk", ); VIR_ENUM_IMPL(virDomainGraphicsListen, @@ -2054,6 +2055,12 @@ void virDomainGraphicsDefFree(virDomainGraphicsDef *def) g_free(def->data.dbus.rendernode); break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + g_free(def->data.gtk.display); + g_free(def->data.gtk.xauth); + g_free(def->data.gtk.rendernode); + break; + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -12199,6 +12206,39 @@ virDomainGraphicsDefParseXMLDBus(virDomainGraphicsDef *def, } +static int +virDomainGraphicsDefParseXMLGTK(virDomainGraphicsDef *def, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + xmlNodePtr glNode; + virTristateBool fullscreen; + + ctxt->node = node; + + if (virXMLPropTristateBool(node, "fullscreen", VIR_XML_PROP_NONE, + &fullscreen) < 0) + return -1; + + virTristateBoolToBool(fullscreen, &def->data.gtk.fullscreen); + def->data.gtk.xauth = virXMLPropString(node, "xauth"); + def->data.gtk.display = virXMLPropString(node, "display"); + + if ((glNode = virXPathNode("./gl", ctxt))) { + def->data.gtk.rendernode = virXMLPropString(glNode, + "rendernode"); + + if (virXMLPropTristateBool(glNode, "enable", + VIR_XML_PROP_REQUIRED, + &def->data.gtk.gl) < 0) + return -1; + } + + return 0; +} + + virDomainGraphicsDef * virDomainGraphicsDefNew(virDomainXMLOption *xmlopt) { @@ -12275,6 +12315,10 @@ virDomainGraphicsDefParseXML(virDomainXMLOption *xmlopt, if (virDomainGraphicsDefParseXMLDBus(def, node, ctxt) < 0) goto error; break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + if (virDomainGraphicsDefParseXMLGTK(def, node, ctxt) < 0) + goto error; + break; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -27118,6 +27162,23 @@ virDomainGraphicsDefFormatDBus(virBuffer *attrBuf, virDomainGraphicsDefFormatAudio(childBuf, def->data.dbus.audioId); } +static void +virDomainGraphicsDefFormatGTK(virBuffer *attrBuf, + virBuffer *childBuf, + virDomainGraphicsDef *def) +{ + virBufferEscapeString(attrBuf, " display='%s'", def->data.gtk.display); + + virBufferEscapeString(attrBuf, " xauth='%s'", def->data.gtk.xauth); + + if (def->data.gtk.fullscreen) + virBufferAddLit(attrBuf, " fullscreen='yes'"); + + virDomainGraphicsDefFormatGL(childBuf, def->data.gtk.gl, + def->data.gtk.rendernode); +} + + static int virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDef *def, @@ -27166,6 +27227,10 @@ virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDefFormatDBus(&attrBuf, &childBuf, def); break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + virDomainGraphicsDefFormatGTK(&attrBuf, &childBuf, def); + break; + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -31949,6 +32014,11 @@ virDomainGraphicsDefHasOpenGL(const virDomainDef *def) if (graphics->data.dbus.gl == VIR_TRISTATE_BOOL_YES) return true; + continue; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + if (graphics->data.gtk.gl == VIR_TRISTATE_BOOL_YES) + return true; + continue; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; @@ -31966,7 +32036,8 @@ virDomainGraphicsSupportsRenderNode(const virDomainGraphicsDef *graphics) if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE || graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS || - graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_DBUS) + graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_DBUS || + graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_GTK) ret = true; return ret; @@ -31988,6 +32059,9 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics) case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: ret = graphics->data.dbus.rendernode; break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + ret = graphics->data.gtk.rendernode; + break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_VNC: case VIR_DOMAIN_GRAPHICS_TYPE_RDP: @@ -32012,6 +32086,9 @@ virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics) if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_DBUS && graphics->data.dbus.gl != VIR_TRISTATE_BOOL_YES) return false; + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_GTK && + graphics->data.gtk.gl != VIR_TRISTATE_BOOL_YES) + return false; if (virDomainGraphicsGetRenderNode(graphics)) return false; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 58b97a2b54..f4f06db8a8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1896,6 +1896,7 @@ typedef enum { VIR_DOMAIN_GRAPHICS_TYPE_SPICE, VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS, VIR_DOMAIN_GRAPHICS_TYPE_DBUS, + VIR_DOMAIN_GRAPHICS_TYPE_GTK, VIR_DOMAIN_GRAPHICS_TYPE_LAST } virDomainGraphicsType; @@ -2083,6 +2084,13 @@ struct _virDomainGraphicsDef { unsigned int audioId; bool fromConfig; /* true if the @address is config file originated */ } dbus; + struct { + char *display; + char *xauth; + bool fullscreen; + char *rendernode; + virTristateBool gl; + } gtk; } data; /* nListens, listens, and *port are only useful if type is vnc, * rdp, or spice. They've been extracted from the union only to diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index 5597d5a66b..61c1d3ad97 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -4593,6 +4593,34 @@ </element> </optional> </group> + <group> + <attribute name="type"> + <value>gtk</value> + </attribute> + <optional> + <attribute name="display"> + <text/> + </attribute> + </optional> + <optional> + <attribute name="xauth"> + <text/> + </attribute> + </optional> + <optional> + <attribute name="fullscreen"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <element name="gl"> + <attribute name="enable"> + <ref name="virYesNo"/> + </attribute> + <empty/> + </element> + </optional> + </group> </choice> </element> </define> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a804335c85..de7ce95499 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -732,6 +732,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 475 */ "virtio-scsi.iothread-mapping", /* QEMU_CAPS_VIRTIO_SCSI_IOTHREAD_MAPPING */ + "gtk", /* QEMU_CAPS_GTK */ + "gtk-gl", /* QEMU_CAPS_GTK_GL */ ); @@ -1602,6 +1604,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, { "query-cpu-model-expansion/ret-type/deprecated-props", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS }, { "migrate-incoming/arg-type/exit-on-error", QEMU_CAPS_MIGRATE_INCOMING_EXIT_ON_ERROR }, + { "query-display-options/ret-type/type/^gtk", QEMU_CAPS_GTK }, }; typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; @@ -6499,6 +6502,8 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUDriverConfig *cfg, VIR_DOMAIN_GRAPHICS_TYPE_RDP); } } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_GTK)) + VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_GTK); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ea7c14daa9..f4ab1a821f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -713,6 +713,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 475 */ QEMU_CAPS_VIRTIO_SCSI_IOTHREAD_MAPPING, /* virtio-scsi supports per-virtqueue iothread mapping */ + QEMU_CAPS_GTK, /* support for GTK graphics is compiled into qemu */ + QEMU_CAPS_GTK_GL, /* support OpenGL for gtk graphics */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e6d308534f..e97992ff56 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8483,6 +8483,34 @@ qemuBuildGraphicsDBusCommandLine(virDomainDef *def, } +static int +qemuBuildGraphicsGTKCommandLine(virQEMUDriverConfig *cfg G_GNUC_UNUSED, + virCommand *cmd, + virDomainGraphicsDef *graphics) +{ + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; + + if (graphics->data.gtk.xauth) + virCommandAddEnvPair(cmd, "XAUTHORITY", graphics->data.gtk.xauth); + if (graphics->data.gtk.display) + virCommandAddEnvPair(cmd, "DISPLAY", graphics->data.gtk.display); + if (graphics->data.gtk.fullscreen) + virCommandAddArg(cmd, "-full-screen"); + + virCommandAddArg(cmd, "-display"); + virBufferAddLit(&opt, "gtk"); + + if (graphics->data.gtk.gl != VIR_TRISTATE_BOOL_ABSENT) + virBufferAsprintf(&opt, ",gl=%s", + virTristateSwitchTypeToString(graphics->data.gtk.gl)); + + virCommandAddArgBuffer(cmd, &opt); + + return 0; +} + + + static int qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg, virCommand *cmd, @@ -8523,6 +8551,11 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg, if (qemuBuildGraphicsDBusCommandLine(def, cmd, graphics) < 0) return -1; + break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + if (qemuBuildGraphicsGTKCommandLine(cfg, cmd, graphics) < 0) + return -1; + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: break; @@ -10076,6 +10109,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, int egl_headless = 0; int dbus = 0; int rdp = 0; + int gtk = 0; if (!driver->privileged) { /* If we have no cgroups then we can have no tunings that @@ -10126,13 +10160,16 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: ++rdp; break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + ++gtk; + break; case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } } - if (sdl > 1 || vnc > 1 || spice > 1 || egl_headless > 1 || dbus > 1 || rdp > 1) { + if (sdl > 1 || vnc > 1 || spice > 1 || egl_headless > 1 || dbus > 1 || rdp > 1 || gtk > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("only 1 graphics device of each type (sdl, vnc, spice, headless, dbus, rdp) is supported")); return -1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 52da234343..f96c926424 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4104,6 +4104,7 @@ qemuDomainDefSuggestDefaultAudioBackend(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: break; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: default: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a34d6f1437..da22681053 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14837,6 +14837,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Can only open VNC, SPICE or D-Bus p2p graphics backends, not %1$s"), virDomainGraphicsTypeToString(vm->def->graphics[idx]->type)); @@ -14908,6 +14909,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Can only open VNC, SPICE or D-Bus p2p graphics backends, not %1$s"), virDomainGraphicsTypeToString(vm->def->graphics[idx]->type)); diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 31c7a14156..f6888acf2f 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -256,6 +256,7 @@ qemuExtDevicesStart(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: default: continue; @@ -339,6 +340,7 @@ qemuExtDevicesStop(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: default: continue; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5326aba281..d67c407309 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4688,6 +4688,7 @@ qemuDomainChangeGraphics(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to change config on '%1$s' graphics type"), type); break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1af91c5909..b61240b653 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3005,6 +3005,7 @@ qemuProcessInitPasswords(virQEMUDriver *driver, cfg->rdpUsername, cfg->rdpPassword, asyncJob); break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: @@ -5065,6 +5066,7 @@ qemuProcessGraphicsReservePorts(virDomainGraphicsDef *graphics, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -5109,6 +5111,7 @@ qemuProcessGraphicsAllocatePorts(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -5280,6 +5283,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -5359,6 +5363,9 @@ qemuProcessGraphicsSetupRenderNode(virDomainGraphicsDef *graphics, case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: rendernode = &graphics->data.dbus.rendernode; break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + rendernode = &graphics->data.gtk.rendernode; + break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_VNC: case VIR_DOMAIN_GRAPHICS_TYPE_RDP: @@ -5571,6 +5578,7 @@ qemuProcessStartValidateGraphics(virDomainObj *vm) case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b2c3c9e2f6..be92785d71 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4523,6 +4523,17 @@ qemuValidateDomainDeviceDefRDPGraphics(const virDomainGraphicsDef *graphics) } +static int +qemuValidateDomainDeviceDefGTKGraphics(const virDomainGraphicsDef *graphics G_GNUC_UNUSED, + virQEMUCaps *qemuCaps G_GNUC_UNUSED) +{ + /* TODO: OpenGL check */ + /* For now it's not possible to check if gtk-gl capability is available in QEMU */ + /* Add cappability check later when will be possible to gather the capability from QEMU */ + return 0; +} + + static int qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics, const virDomainDef *def, @@ -4600,6 +4611,11 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics, return -1; break; + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: + if (qemuValidateDomainDeviceDefGTKGraphics(graphics, qemuCaps) < 0) + return -1; + + break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e3802c18be..d3de4ea4d1 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1037,6 +1037,12 @@ get_files(vahControl * ctl) "r") != 0) goto cleanup; + if (ctl->def->ngraphics == 1 && + ctl->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_GTK) + if (vah_add_file(&buf, ctl->def->graphics[0]->data.gtk.xauth, + "r") != 0) + goto cleanup; + for (i = 0; i < ctl->def->nhostdevs; i++) if (ctl->def->hostdevs[i]) { virDomainHostdevDef *dev = ctl->def->hostdevs[i]; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 0dd03c1a88..74d90ec77a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3527,6 +3527,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + case VIR_DOMAIN_GRAPHICS_TYPE_GTK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported graphics type '%1$s'"), virDomainGraphicsTypeToString(def->graphics[i]->type)); diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml index d66240307e..a81db8e950 100644 --- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml @@ -256,6 +256,7 @@ <value>rdp</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 52c73d10a4..e840a0e488 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -77,6 +77,7 @@ <value>sdl</value> <value>vnc</value> <value>egl-headless</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index ca0bc6f0b5..235e851e86 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -70,6 +70,7 @@ <graphics supported='yes'> <enum name='type'> <value>vnc</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml index 21dbe730c5..ae379b863e 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -69,6 +69,7 @@ <value>spice</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml index 18979cf280..3ac273e119 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml @@ -75,6 +75,7 @@ <value>rdp</value> <value>spice</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml index ce17865e24..98346d23d3 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml @@ -123,6 +123,7 @@ <value>rdp</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml index 8f4ebbc107..b6d0f4d455 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml @@ -79,6 +79,7 @@ <value>rdp</value> <value>spice</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml index ce17865e24..98346d23d3 100644 --- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml @@ -123,6 +123,7 @@ <value>rdp</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml index ee653c0c49..77d90635cd 100644 --- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml +++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml @@ -73,6 +73,7 @@ <value>spice</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_9.0.0.sparc.xml b/tests/domaincapsdata/qemu_9.0.0.sparc.xml index c7862f5842..396b40e221 100644 --- a/tests/domaincapsdata/qemu_9.0.0.sparc.xml +++ b/tests/domaincapsdata/qemu_9.0.0.sparc.xml @@ -64,6 +64,7 @@ <value>spice</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml index b73e0d0688..e6345ebffb 100644 --- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -208,6 +208,7 @@ <value>rdp</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsdata/qemu_9.2.0.s390x.xml index 605a3af5c7..3dac7c0462 100644 --- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml @@ -208,6 +208,7 @@ <value>rdp</value> <value>egl-headless</value> <value>dbus</value> + <value>gtk</value> </enum> </graphics> <video supported='yes'> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index be2e91ed92..078f5cea12 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -133,6 +133,7 @@ <flag name='migrate-incoming.exit-on-error'/> <flag name='virtio-mem-ccw'/> <flag name='shim'/> + <flag name='gtk'/> <version>9002050</version> <microcodeVersion>39100285</microcodeVersion> <package>v9.2.0-1203-gd6430c17d7</package> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index d78c239372..6dc012bcff 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -149,6 +149,7 @@ <flag name='usb-mtp'/> <flag name='netdev.user'/> <flag name='acpi-erst'/> + <flag name='gtk'/> <version>7000000</version> <microcodeVersion>42900243</microcodeVersion> <package>v7.0.0</package> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index d6edb65e96..97728e0141 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -150,6 +150,7 @@ <flag name='usb-mtp'/> <flag name='netdev.user'/> <flag name='acpi-erst'/> + <flag name='gtk'/> <version>7001000</version> <microcodeVersion>42900244</microcodeVersion> <package>v7.1.0</package> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index fe318e0a52..bf9a38e123 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -145,6 +145,7 @@ <flag name='usb-mtp'/> <flag name='netdev.user'/> <flag name='acpi-erst'/> + <flag name='gtk'/> <version>7002000</version> <microcodeVersion>0</microcodeVersion> <package>qemu-7.2.0-6.fc37</package> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index 837502c336..d21b2cfddb 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -160,6 +160,7 @@ <flag name='virtio-sound'/> <flag name='netdev.user'/> <flag name='acpi-erst'/> + <flag name='gtk'/> <version>8002000</version> <microcodeVersion>61700246</microcodeVersion> <package>v8.2.0</package> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index f062f31abc..14013d1c1e 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -167,6 +167,7 @@ <flag name='virtio-sound'/> <flag name='netdev.user'/> <flag name='acpi-erst'/> + <flag name='gtk'/> <version>8002000</version> <microcodeVersion>0</microcodeVersion> <package>qemu-8.2.0-7.fc39</package> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 2a37631381..37e8dbe371 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -150,6 +150,7 @@ <flag name='virtio-sound'/> <flag name='netdev.user'/> <flag name='acpi-erst'/> + <flag name='gtk'/> <version>8002000</version> <microcodeVersion>106300246</microcodeVersion> <package>v8.2.0</package> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 38835ba0cb..703ec9a5a8 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -70,6 +70,7 @@ <flag name='blockjob.backing-mask-protocol'/> <flag name='display-reload'/> <flag name='netdev.user'/> + <flag name='gtk'/> <version>9000000</version> <microcodeVersion>0</microcodeVersion> <package>qemu-9.0.0-1.fc40</package> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index 0d566d13d5..d046779f9a 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -125,6 +125,7 @@ <flag name='netdev.user'/> <flag name='query-cpu-model-expansion.deprecated-props'/> <flag name='migrate-incoming.exit-on-error'/> + <flag name='gtk'/> <version>9001000</version> <microcodeVersion>39100246</microcodeVersion> <package>v9.1.0</package> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index e1323f9b72..9b201aca19 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -128,6 +128,7 @@ <flag name='netdev-stream-reconnect-miliseconds'/> <flag name='query-cpu-model-expansion.deprecated-props'/> <flag name='migrate-incoming.exit-on-error'/> + <flag name='gtk'/> <version>9002000</version> <microcodeVersion>39100247</microcodeVersion> <package>v9.2.0</package> -- 2.49.0

2 6

[PATCH 0/3] Preper noipa attribute over noinline
by Michal Privoznik 28 Apr '25

28 Apr '25

Somewhat green-ish pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1790043585 Jobs that failed are unrelated. Thing is, our upstream pipeline started failing on Rawhide + gcc because of IPA. The unfortunate part is, noinline does not guarantee the function is mockable. The fortunate part is, GCC has noipa attribute which is even advocated for in its documentation. Given we are after the freeze and this is potentially hazardous, I'm okay if this is merged after the release. Michal Prívozník (3): internal: Introduce ATTRIBUTE_NOIPA src: s/G_NO_INLINE/ATTRIBUTE_NOIPA/ scripts: Adapt mock-noinline.py to ATTRIBUTE_NOIPA build-aux/syntax-check.mk | 4 ++-- docs/coding-style.rst | 2 +- scripts/cocci-macro-file.h | 1 + scripts/meson.build | 2 +- scripts/{mock-noinline.py => mock-noipa.py} | 6 +++--- src/cpu/cpu.h | 2 +- src/hypervisor/domain_interface.h | 2 +- src/internal.h | 21 +++++++++++++++++++++ src/libxl/libxl_capabilities.h | 2 +- src/qemu/qemu_capabilities.h | 4 ++-- src/qemu/qemu_capspriv.h | 2 +- src/qemu/qemu_command.h | 6 +++--- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_monitor_priv.h | 2 +- src/qemu/qemu_process.h | 6 +++--- src/rpc/virnetsocket.h | 4 ++-- src/util/vircgroupv2devices.h | 2 +- src/util/vircommand.h | 2 +- src/util/virdevmapper.h | 2 +- src/util/virfile.h | 20 ++++++++++---------- src/util/virfirewalld.h | 2 +- src/util/virhashcode.h | 2 +- src/util/virhostcpu.h | 8 ++++---- src/util/virhostmem.h | 2 +- src/util/virhostuptime.h | 2 +- src/util/viridentitypriv.h | 2 +- src/util/virmacaddr.h | 2 +- src/util/virnetdev.h | 12 ++++++------ src/util/virnetdevbandwidth.h | 2 +- src/util/virnetdevip.h | 2 +- src/util/virnetdevmacvlan.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.h | 6 +++--- src/util/virnuma.h | 18 +++++++++--------- src/util/virpci.h | 2 +- src/util/virprocess.h | 6 +++--- src/util/virrandom.h | 4 ++-- src/util/virscsi.h | 2 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.h | 2 +- src/util/virutil.h | 16 ++++++++-------- src/util/viruuid.h | 4 ++-- 46 files changed, 113 insertions(+), 91 deletions(-) rename scripts/{mock-noinline.py => mock-noipa.py} (93%) -- 2.49.0

2 5

[PATCH] domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0)
by Peter Krempa 28 Apr '25

28 Apr '25

From: Peter Krempa <pkrempa(a)redhat.com> The files were forgotten after the previous bump to use qemu-5.2 as minimum. The data for qemu-5.2, qemu-6.0, and qemu-6.1 was already removed when bumping to qemu-6.2. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 329 ----------------- .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 274 --------------- .../qemu_4.2.0-virt.aarch64.xml | 206 ----------- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 206 ----------- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 174 --------- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 280 --------------- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 329 ----------------- .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 331 ------------------ .../qemu_5.0.0-tcg-virt.riscv64.xml | 159 --------- .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 276 --------------- .../qemu_5.0.0-virt.aarch64.xml | 219 ------------ .../qemu_5.0.0-virt.riscv64.xml | 162 --------- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 219 ------------ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 181 ---------- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 331 ------------------ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 263 -------------- .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 276 --------------- tests/domaincapsdata/qemu_5.1.0.sparc.xml | 145 -------- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 263 -------------- 19 files changed, 4623 deletions(-) delete mode 100644 tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_4.2.0.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_4.2.0.ppc64.xml delete mode 100644 tests/domaincapsdata/qemu_4.2.0.s390x.xml delete mode 100644 tests/domaincapsdata/qemu_4.2.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0.ppc64.xml delete mode 100644 tests/domaincapsdata/qemu_5.0.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_5.1.0.sparc.xml delete mode 100644 tests/domaincapsdata/qemu_5.1.0.x86_64.xml diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml deleted file mode 100644 index e5ffe3934d..0000000000 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ /dev/null @@ -1,329 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-q35-4.2</machine> - <arch>x86_64</arch> - <vcpu max='288'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>yes</value> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>on</value> - <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='forbid'>Skylake-Client-IBRS</model> - <vendor>Intel</vendor> - <maxphysaddr mode='passthrough' limit='64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='mpx'/> - <feature policy='require' name='clflushopt'/> - <feature policy='require' name='umip'/> - <feature policy='require' name='md-clear'/> - <feature policy='require' name='stibp'/> - <feature policy='require' name='arch-capabilities'/> - <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='skip-l1dfl-vmentry'/> - <feature policy='require' name='pschange-mc-no'/> - <feature policy='require' name='vmx-ins-outs'/> - <feature policy='require' name='vmx-true-ctls'/> - <feature policy='require' name='vmx-store-lma'/> - <feature policy='require' name='vmx-activity-hlt'/> - <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> - <feature policy='require' name='vmx-apicv-xapic'/> - <feature policy='require' name='vmx-ept'/> - <feature policy='require' name='vmx-desc-exit'/> - <feature policy='require' name='vmx-rdtscp-exit'/> - <feature policy='require' name='vmx-apicv-x2apic'/> - <feature policy='require' name='vmx-vpid'/> - <feature policy='require' name='vmx-wbinvd-exit'/> - <feature policy='require' name='vmx-unrestricted-guest'/> - <feature policy='require' name='vmx-rdrand-exit'/> - <feature policy='require' name='vmx-invpcid-exit'/> - <feature policy='require' name='vmx-vmfunc'/> - <feature policy='require' name='vmx-shadow-vmcs'/> - <feature policy='require' name='vmx-rdseed-exit'/> - <feature policy='require' name='vmx-pml'/> - <feature policy='require' name='vmx-xsaves'/> - <feature policy='require' name='vmx-ept-execonly'/> - <feature policy='require' name='vmx-page-walk-4'/> - <feature policy='require' name='vmx-ept-2mb'/> - <feature policy='require' name='vmx-ept-1gb'/> - <feature policy='require' name='vmx-invept'/> - <feature policy='require' name='vmx-eptad'/> - <feature policy='require' name='vmx-invept-single-context'/> - <feature policy='require' name='vmx-invept-all-context'/> - <feature policy='require' name='vmx-invvpid'/> - <feature policy='require' name='vmx-invvpid-single-addr'/> - <feature policy='require' name='vmx-invvpid-all-context'/> - <feature policy='require' name='vmx-intr-exit'/> - <feature policy='require' name='vmx-nmi-exit'/> - <feature policy='require' name='vmx-vnmi'/> - <feature policy='require' name='vmx-preemption-timer'/> - <feature policy='require' name='vmx-vintr-pending'/> - <feature policy='require' name='vmx-tsc-offset'/> - <feature policy='require' name='vmx-hlt-exit'/> - <feature policy='require' name='vmx-invlpg-exit'/> - <feature policy='require' name='vmx-mwait-exit'/> - <feature policy='require' name='vmx-rdpmc-exit'/> - <feature policy='require' name='vmx-rdtsc-exit'/> - <feature policy='require' name='vmx-cr3-load-noexit'/> - <feature policy='require' name='vmx-cr3-store-noexit'/> - <feature policy='require' name='vmx-cr8-load-exit'/> - <feature policy='require' name='vmx-cr8-store-exit'/> - <feature policy='require' name='vmx-flexpriority'/> - <feature policy='require' name='vmx-vnmi-pending'/> - <feature policy='require' name='vmx-movdr-exit'/> - <feature policy='require' name='vmx-io-exit'/> - <feature policy='require' name='vmx-io-bitmap'/> - <feature policy='require' name='vmx-mtf'/> - <feature policy='require' name='vmx-msr-bitmap'/> - <feature policy='require' name='vmx-monitor-exit'/> - <feature policy='require' name='vmx-pause-exit'/> - <feature policy='require' name='vmx-secondary-ctls'/> - <feature policy='require' name='vmx-exit-nosave-debugctl'/> - <feature policy='require' name='vmx-exit-ack-intr'/> - <feature policy='require' name='vmx-exit-save-pat'/> - <feature policy='require' name='vmx-exit-load-pat'/> - <feature policy='require' name='vmx-exit-save-efer'/> - <feature policy='require' name='vmx-exit-load-efer'/> - <feature policy='require' name='vmx-exit-save-preemption-timer'/> - <feature policy='require' name='vmx-entry-noload-debugctl'/> - <feature policy='require' name='vmx-entry-ia32e-mode'/> - <feature policy='require' name='vmx-entry-load-pat'/> - <feature policy='require' name='vmx-entry-load-efer'/> - <feature policy='require' name='vmx-eptp-switching'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='yes' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='yes' vendor='Intel'>coreduo</model> - <model usable='yes' vendor='Intel'>core2duo</model> - <model usable='no' vendor='AMD'>athlon</model> - <model usable='yes' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client</model> - <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='no' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='yes' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX</model> - <model usable='yes' vendor='Intel'>Haswell-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell</model> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC</model> - <model usable='no' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX</model> - <model usable='yes' vendor='Intel'>Broadwell-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml deleted file mode 100644 index a849e8f156..0000000000 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ /dev/null @@ -1,274 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>qemu</domain> - <machine>pc-i440fx-4.2</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' 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_G3</model> - <vendor>AMD</vendor> - <feature policy='require' name='pclmuldq'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='ssse3'/> - <feature policy='require' name='sse4.1'/> - <feature policy='require' name='sse4.2'/> - <feature policy='require' name='movbe'/> - <feature policy='require' name='aes'/> - <feature policy='require' name='xsave'/> - <feature policy='require' name='rdrand'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='arat'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='bmi1'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='bmi2'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='mpx'/> - <feature policy='require' name='adx'/> - <feature policy='require' name='smap'/> - <feature policy='require' name='pcommit'/> - <feature policy='require' name='clflushopt'/> - <feature policy='require' name='clwb'/> - <feature policy='require' name='pku'/> - <feature policy='require' name='la57'/> - <feature policy='require' name='xsaveopt'/> - <feature policy='require' name='xgetbv1'/> - <feature policy='require' name='cr8legacy'/> - <feature policy='require' name='mmxext'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='3dnowext'/> - <feature policy='require' name='3dnow'/> - <feature policy='require' name='npt'/> - <feature policy='disable' name='misalignsse'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='yes' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='yes' vendor='Intel'>coreduo</model> - <model usable='yes' vendor='Intel'>core2duo</model> - <model usable='yes' vendor='AMD'>athlon</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> - <model usable='no' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='no' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='no' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='no' vendor='Intel'>Nehalem-IBRS</model> - <model usable='no' vendor='Intel'>Nehalem</model> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='no' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Haswell-noTSX</model> - <model usable='no' vendor='Intel'>Haswell-IBRS</model> - <model usable='no' vendor='Intel'>Haswell</model> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC</model> - <model usable='no' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml deleted file mode 100644 index a7c2e0baee..0000000000 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ /dev/null @@ -1,206 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-aarch64</path> - <domain>kvm</domain> - <machine>virt-4.2</machine> - <arch>aarch64</arch> - <vcpu max='512'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <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='no'/> - <mode name='custom' supported='yes'> - <model usable='unknown' vendor='unknown'>pxa262</model> - <model usable='unknown' vendor='unknown'>pxa270-a0</model> - <model usable='unknown' vendor='unknown'>arm1136</model> - <model usable='unknown' vendor='unknown'>cortex-a15</model> - <model usable='unknown' vendor='unknown'>pxa260</model> - <model usable='unknown' vendor='unknown'>arm1136-r2</model> - <model usable='unknown' vendor='unknown'>pxa261</model> - <model usable='unknown' vendor='unknown'>pxa255</model> - <model usable='unknown' vendor='unknown'>cortex-a72</model> - <model usable='unknown' vendor='unknown'>cortex-m33</model> - <model usable='unknown' vendor='unknown'>arm926</model> - <model usable='unknown' vendor='unknown'>cortex-r5f</model> - <model usable='unknown' vendor='unknown'>arm11mpcore</model> - <model usable='unknown' vendor='unknown'>pxa250</model> - <model usable='unknown' vendor='unknown'>ti925t</model> - <model usable='unknown' vendor='unknown'>cortex-a57</model> - <model usable='unknown' vendor='unknown'>sa1110</model> - <model usable='unknown' vendor='unknown'>arm1176</model> - <model usable='unknown' vendor='unknown'>cortex-a53</model> - <model usable='unknown' vendor='unknown'>sa1100</model> - <model usable='unknown' vendor='unknown'>pxa270-c5</model> - <model usable='unknown' vendor='unknown'>cortex-a9</model> - <model usable='unknown' vendor='unknown'>cortex-a8</model> - <model usable='unknown' vendor='unknown'>cortex-a7</model> - <model usable='unknown' vendor='unknown'>pxa270-c0</model> - <model usable='unknown' vendor='unknown'>arm1026</model> - <model usable='unknown' vendor='unknown'>pxa270-b1</model> - <model usable='unknown' vendor='unknown'>cortex-m3</model> - <model usable='unknown' vendor='unknown'>max</model> - <model usable='unknown' vendor='unknown'>cortex-m4</model> - <model usable='unknown' vendor='unknown'>pxa270-b0</model> - <model usable='unknown' vendor='unknown'>arm946</model> - <model usable='unknown' vendor='unknown'>cortex-m0</model> - <model usable='unknown' vendor='unknown'>cortex-r5</model> - <model usable='unknown' vendor='unknown'>pxa270-a1</model> - <model usable='unknown' vendor='unknown'>pxa270</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='no'/> - <redirdev supported='no'/> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='yes'> - <enum name='version'> - <value>3</value> - </enum> - </gic> - <vmcoreinfo supported='yes'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml deleted file mode 100644 index a7c2e0baee..0000000000 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ /dev/null @@ -1,206 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-aarch64</path> - <domain>kvm</domain> - <machine>virt-4.2</machine> - <arch>aarch64</arch> - <vcpu max='512'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <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='no'/> - <mode name='custom' supported='yes'> - <model usable='unknown' vendor='unknown'>pxa262</model> - <model usable='unknown' vendor='unknown'>pxa270-a0</model> - <model usable='unknown' vendor='unknown'>arm1136</model> - <model usable='unknown' vendor='unknown'>cortex-a15</model> - <model usable='unknown' vendor='unknown'>pxa260</model> - <model usable='unknown' vendor='unknown'>arm1136-r2</model> - <model usable='unknown' vendor='unknown'>pxa261</model> - <model usable='unknown' vendor='unknown'>pxa255</model> - <model usable='unknown' vendor='unknown'>cortex-a72</model> - <model usable='unknown' vendor='unknown'>cortex-m33</model> - <model usable='unknown' vendor='unknown'>arm926</model> - <model usable='unknown' vendor='unknown'>cortex-r5f</model> - <model usable='unknown' vendor='unknown'>arm11mpcore</model> - <model usable='unknown' vendor='unknown'>pxa250</model> - <model usable='unknown' vendor='unknown'>ti925t</model> - <model usable='unknown' vendor='unknown'>cortex-a57</model> - <model usable='unknown' vendor='unknown'>sa1110</model> - <model usable='unknown' vendor='unknown'>arm1176</model> - <model usable='unknown' vendor='unknown'>cortex-a53</model> - <model usable='unknown' vendor='unknown'>sa1100</model> - <model usable='unknown' vendor='unknown'>pxa270-c5</model> - <model usable='unknown' vendor='unknown'>cortex-a9</model> - <model usable='unknown' vendor='unknown'>cortex-a8</model> - <model usable='unknown' vendor='unknown'>cortex-a7</model> - <model usable='unknown' vendor='unknown'>pxa270-c0</model> - <model usable='unknown' vendor='unknown'>arm1026</model> - <model usable='unknown' vendor='unknown'>pxa270-b1</model> - <model usable='unknown' vendor='unknown'>cortex-m3</model> - <model usable='unknown' vendor='unknown'>max</model> - <model usable='unknown' vendor='unknown'>cortex-m4</model> - <model usable='unknown' vendor='unknown'>pxa270-b0</model> - <model usable='unknown' vendor='unknown'>arm946</model> - <model usable='unknown' vendor='unknown'>cortex-m0</model> - <model usable='unknown' vendor='unknown'>cortex-r5</model> - <model usable='unknown' vendor='unknown'>pxa270-a1</model> - <model usable='unknown' vendor='unknown'>pxa270</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='no'/> - <redirdev supported='no'/> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='yes'> - <enum name='version'> - <value>3</value> - </enum> - </gic> - <vmcoreinfo supported='yes'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml deleted file mode 100644 index 2c41777e73..0000000000 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ /dev/null @@ -1,174 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-ppc64</path> - <domain>kvm</domain> - <machine>pseries-4.2</machine> - <arch>ppc64</arch> - <vcpu max='1024'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'/> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <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'>POWER8</model> - <maxphysaddr mode='passthrough' limit='64'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='unknown' vendor='IBM'>POWER9</model> - <model usable='unknown' vendor='IBM'>POWER8</model> - <model usable='unknown' vendor='IBM'>POWER7</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>spapr-tpm-proxy</value> - </enum> - <enum name='backendModel'/> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='no'/> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='no'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml deleted file mode 100644 index 809ce9c903..0000000000 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ /dev/null @@ -1,280 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-s390x</path> - <domain>kvm</domain> - <machine>s390-ccw-virtio-4.2</machine> - <arch>s390x</arch> - <vcpu max='248'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'/> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <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='forbid'>gen15a-base</model> - <feature policy='require' name='aen'/> - <feature policy='require' name='cmmnt'/> - <feature policy='require' name='vxpdeh'/> - <feature policy='require' name='aefsi'/> - <feature policy='require' name='csske'/> - <feature policy='require' name='mepoch'/> - <feature policy='require' name='msa9'/> - <feature policy='require' name='msa8'/> - <feature policy='require' name='msa7'/> - <feature policy='require' name='msa6'/> - <feature policy='require' name='msa5'/> - <feature policy='require' name='msa4'/> - <feature policy='require' name='msa3'/> - <feature policy='require' name='msa2'/> - <feature policy='require' name='msa1'/> - <feature policy='require' name='sthyi'/> - <feature policy='require' name='edat'/> - <feature policy='require' name='ri'/> - <feature policy='require' name='deflate'/> - <feature policy='require' name='edat2'/> - <feature policy='require' name='etoken'/> - <feature policy='require' name='vx'/> - <feature policy='require' name='ipter'/> - <feature policy='require' name='mepochptff'/> - <feature policy='require' name='ap'/> - <feature policy='require' name='vxeh'/> - <feature policy='require' name='vxpd'/> - <feature policy='require' name='esop'/> - <feature policy='require' name='msa9_pckmo'/> - <feature policy='require' name='vxeh2'/> - <feature policy='require' name='esort'/> - <feature policy='require' name='apqi'/> - <feature policy='require' name='apft'/> - <feature policy='require' name='iep'/> - <feature policy='require' name='apqci'/> - <feature policy='require' name='cte'/> - <feature policy='require' name='bpb'/> - <feature policy='require' name='gs'/> - <feature policy='require' name='ppa15'/> - <feature policy='require' name='zpci'/> - <feature policy='require' name='sea_esop2'/> - <feature policy='require' name='te'/> - <feature policy='require' name='cmm'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='IBM'>z800-base</model> - <model usable='yes' vendor='IBM'>z890.2-base</model> - <model usable='yes' vendor='IBM'>z9EC.2</model> - <model usable='yes' vendor='IBM'>z13.2</model> - <model usable='yes' vendor='IBM'>z9BC-base</model> - <model usable='yes' vendor='IBM'>z990.5-base</model> - <model usable='yes' vendor='IBM'>z890.2</model> - <model usable='yes' vendor='IBM'>z890</model> - <model usable='yes' vendor='IBM'>z9BC</model> - <model usable='yes' vendor='IBM'>z13</model> - <model usable='yes' vendor='IBM'>z196</model> - <model usable='yes' vendor='IBM'>z13s</model> - <model usable='yes' vendor='IBM'>z990.3</model> - <model usable='yes' vendor='IBM'>z13s-base</model> - <model usable='yes' vendor='IBM'>z9EC</model> - <model usable='yes' vendor='IBM'>gen15a</model> - <model usable='yes' vendor='IBM'>z14ZR1-base</model> - <model usable='yes' vendor='IBM'>z14.2-base</model> - <model usable='yes' vendor='IBM'>z900.3-base</model> - <model usable='yes' vendor='IBM'>z13.2-base</model> - <model usable='yes' vendor='IBM'>z196.2-base</model> - <model usable='yes' vendor='IBM'>zBC12-base</model> - <model usable='yes' vendor='IBM'>z9BC.2-base</model> - <model usable='yes' vendor='IBM'>z900.2-base</model> - <model usable='yes' vendor='IBM'>z9EC.3</model> - <model usable='yes' vendor='IBM'>zEC12</model> - <model usable='yes' vendor='IBM'>z900</model> - <model usable='yes' vendor='IBM'>z114-base</model> - <model usable='yes' vendor='IBM'>zEC12-base</model> - <model usable='yes' vendor='IBM'>z10EC.2</model> - <model usable='yes' vendor='IBM'>z10EC-base</model> - <model usable='yes' vendor='IBM'>z900.3</model> - <model usable='yes' vendor='IBM'>z14ZR1</model> - <model usable='yes' vendor='IBM'>z10BC</model> - <model usable='yes' vendor='IBM'>z10BC.2-base</model> - <model usable='yes' vendor='IBM'>z990.2</model> - <model usable='yes' vendor='IBM'>z9BC.2</model> - <model usable='yes' vendor='IBM'>z990</model> - <model usable='yes' vendor='IBM'>z14</model> - <model usable='yes' vendor='IBM'>gen15b-base</model> - <model usable='yes' vendor='IBM'>z990.4</model> - <model usable='yes' vendor='unknown'>max</model> - <model usable='yes' vendor='IBM'>z10EC.2-base</model> - <model usable='yes' vendor='IBM'>gen15a-base</model> - <model usable='yes' vendor='IBM'>z800</model> - <model usable='yes' vendor='IBM'>zEC12.2</model> - <model usable='yes' vendor='IBM'>z10EC</model> - <model usable='yes' vendor='IBM'>z990.2-base</model> - <model usable='yes' vendor='IBM'>z900-base</model> - <model usable='yes' vendor='IBM'>z10BC.2</model> - <model usable='yes' vendor='IBM'>z9EC-base</model> - <model usable='yes' vendor='IBM'>z9EC.3-base</model> - <model usable='yes' vendor='IBM'>z114</model> - <model usable='yes' vendor='IBM'>z890.3</model> - <model usable='yes' vendor='IBM'>z196-base</model> - <model usable='yes' vendor='IBM'>z9EC.2-base</model> - <model usable='yes' vendor='IBM'>z196.2</model> - <model usable='yes' vendor='IBM'>z14.2</model> - <model usable='yes' vendor='IBM'>z990-base</model> - <model usable='yes' vendor='IBM'>z900.2</model> - <model usable='yes' vendor='IBM'>z890-base</model> - <model usable='yes' vendor='IBM'>z10EC.3</model> - <model usable='yes' vendor='IBM'>z14-base</model> - <model usable='yes' vendor='IBM'>z990.4-base</model> - <model usable='yes' vendor='IBM'>z10EC.3-base</model> - <model usable='yes' vendor='IBM'>z10BC-base</model> - <model usable='yes' vendor='IBM'>z13-base</model> - <model usable='yes' vendor='IBM'>z990.3-base</model> - <model usable='yes' vendor='IBM'>zEC12.2-base</model> - <model usable='yes' vendor='IBM'>zBC12</model> - <model usable='yes' vendor='IBM'>z890.3-base</model> - <model usable='yes' vendor='IBM'>z990.5</model> - <model usable='yes' vendor='IBM'>gen15b</model> - <model usable='no' vendor='unknown'>qemu</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>virtio</value> - <value>none</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='no'/> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='no'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <s390-pv supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml deleted file mode 100644 index 32ba46ebbc..0000000000 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ /dev/null @@ -1,329 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-i440fx-4.2</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>on</value> - <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='forbid'>Skylake-Client-IBRS</model> - <vendor>Intel</vendor> - <maxphysaddr mode='passthrough' limit='64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='mpx'/> - <feature policy='require' name='clflushopt'/> - <feature policy='require' name='umip'/> - <feature policy='require' name='md-clear'/> - <feature policy='require' name='stibp'/> - <feature policy='require' name='arch-capabilities'/> - <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='skip-l1dfl-vmentry'/> - <feature policy='require' name='pschange-mc-no'/> - <feature policy='require' name='vmx-ins-outs'/> - <feature policy='require' name='vmx-true-ctls'/> - <feature policy='require' name='vmx-store-lma'/> - <feature policy='require' name='vmx-activity-hlt'/> - <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> - <feature policy='require' name='vmx-apicv-xapic'/> - <feature policy='require' name='vmx-ept'/> - <feature policy='require' name='vmx-desc-exit'/> - <feature policy='require' name='vmx-rdtscp-exit'/> - <feature policy='require' name='vmx-apicv-x2apic'/> - <feature policy='require' name='vmx-vpid'/> - <feature policy='require' name='vmx-wbinvd-exit'/> - <feature policy='require' name='vmx-unrestricted-guest'/> - <feature policy='require' name='vmx-rdrand-exit'/> - <feature policy='require' name='vmx-invpcid-exit'/> - <feature policy='require' name='vmx-vmfunc'/> - <feature policy='require' name='vmx-shadow-vmcs'/> - <feature policy='require' name='vmx-rdseed-exit'/> - <feature policy='require' name='vmx-pml'/> - <feature policy='require' name='vmx-xsaves'/> - <feature policy='require' name='vmx-ept-execonly'/> - <feature policy='require' name='vmx-page-walk-4'/> - <feature policy='require' name='vmx-ept-2mb'/> - <feature policy='require' name='vmx-ept-1gb'/> - <feature policy='require' name='vmx-invept'/> - <feature policy='require' name='vmx-eptad'/> - <feature policy='require' name='vmx-invept-single-context'/> - <feature policy='require' name='vmx-invept-all-context'/> - <feature policy='require' name='vmx-invvpid'/> - <feature policy='require' name='vmx-invvpid-single-addr'/> - <feature policy='require' name='vmx-invvpid-all-context'/> - <feature policy='require' name='vmx-intr-exit'/> - <feature policy='require' name='vmx-nmi-exit'/> - <feature policy='require' name='vmx-vnmi'/> - <feature policy='require' name='vmx-preemption-timer'/> - <feature policy='require' name='vmx-vintr-pending'/> - <feature policy='require' name='vmx-tsc-offset'/> - <feature policy='require' name='vmx-hlt-exit'/> - <feature policy='require' name='vmx-invlpg-exit'/> - <feature policy='require' name='vmx-mwait-exit'/> - <feature policy='require' name='vmx-rdpmc-exit'/> - <feature policy='require' name='vmx-rdtsc-exit'/> - <feature policy='require' name='vmx-cr3-load-noexit'/> - <feature policy='require' name='vmx-cr3-store-noexit'/> - <feature policy='require' name='vmx-cr8-load-exit'/> - <feature policy='require' name='vmx-cr8-store-exit'/> - <feature policy='require' name='vmx-flexpriority'/> - <feature policy='require' name='vmx-vnmi-pending'/> - <feature policy='require' name='vmx-movdr-exit'/> - <feature policy='require' name='vmx-io-exit'/> - <feature policy='require' name='vmx-io-bitmap'/> - <feature policy='require' name='vmx-mtf'/> - <feature policy='require' name='vmx-msr-bitmap'/> - <feature policy='require' name='vmx-monitor-exit'/> - <feature policy='require' name='vmx-pause-exit'/> - <feature policy='require' name='vmx-secondary-ctls'/> - <feature policy='require' name='vmx-exit-nosave-debugctl'/> - <feature policy='require' name='vmx-exit-ack-intr'/> - <feature policy='require' name='vmx-exit-save-pat'/> - <feature policy='require' name='vmx-exit-load-pat'/> - <feature policy='require' name='vmx-exit-save-efer'/> - <feature policy='require' name='vmx-exit-load-efer'/> - <feature policy='require' name='vmx-exit-save-preemption-timer'/> - <feature policy='require' name='vmx-entry-noload-debugctl'/> - <feature policy='require' name='vmx-entry-ia32e-mode'/> - <feature policy='require' name='vmx-entry-load-pat'/> - <feature policy='require' name='vmx-entry-load-efer'/> - <feature policy='require' name='vmx-eptp-switching'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='yes' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='yes' vendor='Intel'>coreduo</model> - <model usable='yes' vendor='Intel'>core2duo</model> - <model usable='no' vendor='AMD'>athlon</model> - <model usable='yes' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client</model> - <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='no' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='yes' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX</model> - <model usable='yes' vendor='Intel'>Haswell-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell</model> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC</model> - <model usable='no' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX</model> - <model usable='yes' vendor='Intel'>Broadwell-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml deleted file mode 100644 index 70bd7bc46e..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ /dev/null @@ -1,331 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-q35-5.0</machine> - <arch>x86_64</arch> - <vcpu max='288'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>yes</value> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>on</value> - <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='forbid'>Skylake-Client-IBRS</model> - <vendor>Intel</vendor> - <maxphysaddr mode='passthrough' limit='64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='mpx'/> - <feature policy='require' name='clflushopt'/> - <feature policy='require' name='umip'/> - <feature policy='require' name='md-clear'/> - <feature policy='require' name='stibp'/> - <feature policy='require' name='arch-capabilities'/> - <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='skip-l1dfl-vmentry'/> - <feature policy='require' name='pschange-mc-no'/> - <feature policy='require' name='vmx-ins-outs'/> - <feature policy='require' name='vmx-true-ctls'/> - <feature policy='require' name='vmx-store-lma'/> - <feature policy='require' name='vmx-activity-hlt'/> - <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> - <feature policy='require' name='vmx-apicv-xapic'/> - <feature policy='require' name='vmx-ept'/> - <feature policy='require' name='vmx-desc-exit'/> - <feature policy='require' name='vmx-rdtscp-exit'/> - <feature policy='require' name='vmx-apicv-x2apic'/> - <feature policy='require' name='vmx-vpid'/> - <feature policy='require' name='vmx-wbinvd-exit'/> - <feature policy='require' name='vmx-unrestricted-guest'/> - <feature policy='require' name='vmx-rdrand-exit'/> - <feature policy='require' name='vmx-invpcid-exit'/> - <feature policy='require' name='vmx-vmfunc'/> - <feature policy='require' name='vmx-shadow-vmcs'/> - <feature policy='require' name='vmx-rdseed-exit'/> - <feature policy='require' name='vmx-pml'/> - <feature policy='require' name='vmx-xsaves'/> - <feature policy='require' name='vmx-ept-execonly'/> - <feature policy='require' name='vmx-page-walk-4'/> - <feature policy='require' name='vmx-ept-2mb'/> - <feature policy='require' name='vmx-ept-1gb'/> - <feature policy='require' name='vmx-invept'/> - <feature policy='require' name='vmx-eptad'/> - <feature policy='require' name='vmx-invept-single-context'/> - <feature policy='require' name='vmx-invept-all-context'/> - <feature policy='require' name='vmx-invvpid'/> - <feature policy='require' name='vmx-invvpid-single-addr'/> - <feature policy='require' name='vmx-invvpid-all-context'/> - <feature policy='require' name='vmx-intr-exit'/> - <feature policy='require' name='vmx-nmi-exit'/> - <feature policy='require' name='vmx-vnmi'/> - <feature policy='require' name='vmx-preemption-timer'/> - <feature policy='require' name='vmx-vintr-pending'/> - <feature policy='require' name='vmx-tsc-offset'/> - <feature policy='require' name='vmx-hlt-exit'/> - <feature policy='require' name='vmx-invlpg-exit'/> - <feature policy='require' name='vmx-mwait-exit'/> - <feature policy='require' name='vmx-rdpmc-exit'/> - <feature policy='require' name='vmx-rdtsc-exit'/> - <feature policy='require' name='vmx-cr3-load-noexit'/> - <feature policy='require' name='vmx-cr3-store-noexit'/> - <feature policy='require' name='vmx-cr8-load-exit'/> - <feature policy='require' name='vmx-cr8-store-exit'/> - <feature policy='require' name='vmx-flexpriority'/> - <feature policy='require' name='vmx-vnmi-pending'/> - <feature policy='require' name='vmx-movdr-exit'/> - <feature policy='require' name='vmx-io-exit'/> - <feature policy='require' name='vmx-io-bitmap'/> - <feature policy='require' name='vmx-mtf'/> - <feature policy='require' name='vmx-msr-bitmap'/> - <feature policy='require' name='vmx-monitor-exit'/> - <feature policy='require' name='vmx-pause-exit'/> - <feature policy='require' name='vmx-secondary-ctls'/> - <feature policy='require' name='vmx-exit-nosave-debugctl'/> - <feature policy='require' name='vmx-exit-ack-intr'/> - <feature policy='require' name='vmx-exit-save-pat'/> - <feature policy='require' name='vmx-exit-load-pat'/> - <feature policy='require' name='vmx-exit-save-efer'/> - <feature policy='require' name='vmx-exit-load-efer'/> - <feature policy='require' name='vmx-exit-save-preemption-timer'/> - <feature policy='require' name='vmx-entry-noload-debugctl'/> - <feature policy='require' name='vmx-entry-ia32e-mode'/> - <feature policy='require' name='vmx-entry-load-pat'/> - <feature policy='require' name='vmx-entry-load-efer'/> - <feature policy='require' name='vmx-eptp-switching'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='yes' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='yes' vendor='Intel'>coreduo</model> - <model usable='yes' vendor='Intel'>core2duo</model> - <model usable='no' vendor='AMD'>athlon</model> - <model usable='yes' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client</model> - <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='no' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='yes' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX</model> - <model usable='yes' vendor='Intel'>Haswell-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell</model> - <model usable='no' vendor='AMD'>EPYC-Rome</model> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC</model> - <model usable='no' vendor='Hygon'>Dhyana</model> - <model usable='no' vendor='Intel'>Cooperlake</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX</model> - <model usable='yes' vendor='Intel'>Broadwell-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml deleted file mode 100644 index c487d467ef..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml +++ /dev/null @@ -1,159 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-riscv64</path> - <domain>qemu</domain> - <machine>virt</machine> - <arch>riscv64</arch> - <vcpu max='8'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'/> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </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> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='no'/> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='no'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml deleted file mode 100644 index d69ea76a78..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ /dev/null @@ -1,276 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>qemu</domain> - <machine>pc-i440fx-5.0</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' 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_G3</model> - <vendor>AMD</vendor> - <feature policy='require' name='pclmuldq'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='ssse3'/> - <feature policy='require' name='sse4.1'/> - <feature policy='require' name='sse4.2'/> - <feature policy='require' name='movbe'/> - <feature policy='require' name='aes'/> - <feature policy='require' name='xsave'/> - <feature policy='require' name='rdrand'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='arat'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='bmi1'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='bmi2'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='mpx'/> - <feature policy='require' name='adx'/> - <feature policy='require' name='smap'/> - <feature policy='require' name='pcommit'/> - <feature policy='require' name='clflushopt'/> - <feature policy='require' name='clwb'/> - <feature policy='require' name='pku'/> - <feature policy='require' name='la57'/> - <feature policy='require' name='xsaveopt'/> - <feature policy='require' name='xgetbv1'/> - <feature policy='require' name='cr8legacy'/> - <feature policy='require' name='mmxext'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='3dnowext'/> - <feature policy='require' name='3dnow'/> - <feature policy='require' name='npt'/> - <feature policy='disable' name='misalignsse'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='yes' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='yes' vendor='Intel'>coreduo</model> - <model usable='yes' vendor='Intel'>core2duo</model> - <model usable='yes' vendor='AMD'>athlon</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='no' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='no' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='no' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='no' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Haswell-noTSX</model> - <model usable='no' vendor='Intel'>Haswell-IBRS</model> - <model usable='no' vendor='Intel'>Haswell</model> - <model usable='no' vendor='AMD'>EPYC-Rome</model> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC</model> - <model usable='no' vendor='Hygon'>Dhyana</model> - <model usable='no' vendor='Intel'>Cooperlake</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml deleted file mode 100644 index 2466dda755..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ /dev/null @@ -1,219 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-aarch64</path> - <domain>kvm</domain> - <machine>virt-5.0</machine> - <arch>aarch64</arch> - <vcpu max='512'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <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='no'/> - <mode name='custom' supported='yes'> - <model usable='unknown' vendor='unknown'>cortex-a9</model> - <model usable='unknown' vendor='unknown'>pxa250</model> - <model usable='unknown' vendor='unknown'>pxa270-a1</model> - <model usable='unknown' vendor='unknown'>arm946</model> - <model usable='unknown' vendor='unknown'>pxa270-c0</model> - <model usable='unknown' vendor='unknown'>max</model> - <model usable='unknown' vendor='unknown'>arm1026</model> - <model usable='unknown' vendor='unknown'>pxa260</model> - <model usable='unknown' vendor='unknown'>pxa270-b1</model> - <model usable='unknown' vendor='unknown'>cortex-a57</model> - <model usable='unknown' vendor='unknown'>pxa255</model> - <model usable='unknown' vendor='unknown'>cortex-r5</model> - <model usable='unknown' vendor='unknown'>arm1136</model> - <model usable='unknown' vendor='unknown'>cortex-a7</model> - <model usable='unknown' vendor='unknown'>pxa261</model> - <model usable='unknown' vendor='unknown'>pxa270-c5</model> - <model usable='unknown' vendor='unknown'>cortex-m3</model> - <model usable='unknown' vendor='unknown'>arm1176</model> - <model usable='unknown' vendor='unknown'>sa1100</model> - <model usable='unknown' vendor='unknown'>cortex-a53</model> - <model usable='unknown' vendor='unknown'>ti925t</model> - <model usable='unknown' vendor='unknown'>cortex-m33</model> - <model usable='unknown' vendor='unknown'>cortex-a8</model> - <model usable='unknown' vendor='unknown'>arm926</model> - <model usable='unknown' vendor='unknown'>cortex-a72</model> - <model usable='unknown' vendor='unknown'>pxa270</model> - <model usable='unknown' vendor='unknown'>pxa270-a0</model> - <model usable='unknown' vendor='unknown'>cortex-m4</model> - <model usable='unknown' vendor='unknown'>cortex-m7</model> - <model usable='unknown' vendor='unknown'>cortex-a15</model> - <model usable='unknown' vendor='unknown'>arm11mpcore</model> - <model usable='unknown' vendor='unknown'>cortex-r5f</model> - <model usable='unknown' vendor='unknown'>cortex-m0</model> - <model usable='unknown' vendor='unknown'>sa1110</model> - <model usable='unknown' vendor='unknown'>arm1136-r2</model> - <model usable='unknown' vendor='unknown'>pxa270-b0</model> - <model usable='unknown' vendor='unknown'>pxa262</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='no'/> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='yes'> - <enum name='version'> - <value>3</value> - </enum> - </gic> - <vmcoreinfo supported='yes'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml deleted file mode 100644 index b0e4aafcd5..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml +++ /dev/null @@ -1,162 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-riscv64</path> - <domain>kvm</domain> - <machine>virt</machine> - <arch>riscv64</arch> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'/> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>off</value> - </enum> - </mode> - <mode name='maximum' supported='no'/> - <mode name='host-model' supported='no'/> - <mode name='custom' supported='no'/> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='no'/> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='no'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml deleted file mode 100644 index 2466dda755..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ /dev/null @@ -1,219 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-aarch64</path> - <domain>kvm</domain> - <machine>virt-5.0</machine> - <arch>aarch64</arch> - <vcpu max='512'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <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='no'/> - <mode name='custom' supported='yes'> - <model usable='unknown' vendor='unknown'>cortex-a9</model> - <model usable='unknown' vendor='unknown'>pxa250</model> - <model usable='unknown' vendor='unknown'>pxa270-a1</model> - <model usable='unknown' vendor='unknown'>arm946</model> - <model usable='unknown' vendor='unknown'>pxa270-c0</model> - <model usable='unknown' vendor='unknown'>max</model> - <model usable='unknown' vendor='unknown'>arm1026</model> - <model usable='unknown' vendor='unknown'>pxa260</model> - <model usable='unknown' vendor='unknown'>pxa270-b1</model> - <model usable='unknown' vendor='unknown'>cortex-a57</model> - <model usable='unknown' vendor='unknown'>pxa255</model> - <model usable='unknown' vendor='unknown'>cortex-r5</model> - <model usable='unknown' vendor='unknown'>arm1136</model> - <model usable='unknown' vendor='unknown'>cortex-a7</model> - <model usable='unknown' vendor='unknown'>pxa261</model> - <model usable='unknown' vendor='unknown'>pxa270-c5</model> - <model usable='unknown' vendor='unknown'>cortex-m3</model> - <model usable='unknown' vendor='unknown'>arm1176</model> - <model usable='unknown' vendor='unknown'>sa1100</model> - <model usable='unknown' vendor='unknown'>cortex-a53</model> - <model usable='unknown' vendor='unknown'>ti925t</model> - <model usable='unknown' vendor='unknown'>cortex-m33</model> - <model usable='unknown' vendor='unknown'>cortex-a8</model> - <model usable='unknown' vendor='unknown'>arm926</model> - <model usable='unknown' vendor='unknown'>cortex-a72</model> - <model usable='unknown' vendor='unknown'>pxa270</model> - <model usable='unknown' vendor='unknown'>pxa270-a0</model> - <model usable='unknown' vendor='unknown'>cortex-m4</model> - <model usable='unknown' vendor='unknown'>cortex-m7</model> - <model usable='unknown' vendor='unknown'>cortex-a15</model> - <model usable='unknown' vendor='unknown'>arm11mpcore</model> - <model usable='unknown' vendor='unknown'>cortex-r5f</model> - <model usable='unknown' vendor='unknown'>cortex-m0</model> - <model usable='unknown' vendor='unknown'>sa1110</model> - <model usable='unknown' vendor='unknown'>arm1136-r2</model> - <model usable='unknown' vendor='unknown'>pxa270-b0</model> - <model usable='unknown' vendor='unknown'>pxa262</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='no'/> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='yes'> - <enum name='version'> - <value>3</value> - </enum> - </gic> - <vmcoreinfo supported='yes'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml deleted file mode 100644 index c66d0645fc..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ /dev/null @@ -1,181 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-ppc64</path> - <domain>kvm</domain> - <machine>pseries-5.0</machine> - <arch>ppc64</arch> - <vcpu max='1024'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'/> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <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'>POWER8</model> - <maxphysaddr mode='passthrough' limit='64'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='unknown' vendor='IBM'>POWER10</model> - <model usable='unknown' vendor='IBM'>POWER9</model> - <model usable='unknown' vendor='IBM'>POWER8</model> - <model usable='unknown' vendor='IBM'>POWER7</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-spapr</value> - <value>spapr-tpm-proxy</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='no'/> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='no'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml deleted file mode 100644 index c57d4f3283..0000000000 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ /dev/null @@ -1,331 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-i440fx-5.0</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>on</value> - <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='forbid'>Skylake-Client-IBRS</model> - <vendor>Intel</vendor> - <maxphysaddr mode='passthrough' limit='64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='mpx'/> - <feature policy='require' name='clflushopt'/> - <feature policy='require' name='umip'/> - <feature policy='require' name='md-clear'/> - <feature policy='require' name='stibp'/> - <feature policy='require' name='arch-capabilities'/> - <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='skip-l1dfl-vmentry'/> - <feature policy='require' name='pschange-mc-no'/> - <feature policy='require' name='vmx-ins-outs'/> - <feature policy='require' name='vmx-true-ctls'/> - <feature policy='require' name='vmx-store-lma'/> - <feature policy='require' name='vmx-activity-hlt'/> - <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> - <feature policy='require' name='vmx-apicv-xapic'/> - <feature policy='require' name='vmx-ept'/> - <feature policy='require' name='vmx-desc-exit'/> - <feature policy='require' name='vmx-rdtscp-exit'/> - <feature policy='require' name='vmx-apicv-x2apic'/> - <feature policy='require' name='vmx-vpid'/> - <feature policy='require' name='vmx-wbinvd-exit'/> - <feature policy='require' name='vmx-unrestricted-guest'/> - <feature policy='require' name='vmx-rdrand-exit'/> - <feature policy='require' name='vmx-invpcid-exit'/> - <feature policy='require' name='vmx-vmfunc'/> - <feature policy='require' name='vmx-shadow-vmcs'/> - <feature policy='require' name='vmx-rdseed-exit'/> - <feature policy='require' name='vmx-pml'/> - <feature policy='require' name='vmx-xsaves'/> - <feature policy='require' name='vmx-ept-execonly'/> - <feature policy='require' name='vmx-page-walk-4'/> - <feature policy='require' name='vmx-ept-2mb'/> - <feature policy='require' name='vmx-ept-1gb'/> - <feature policy='require' name='vmx-invept'/> - <feature policy='require' name='vmx-eptad'/> - <feature policy='require' name='vmx-invept-single-context'/> - <feature policy='require' name='vmx-invept-all-context'/> - <feature policy='require' name='vmx-invvpid'/> - <feature policy='require' name='vmx-invvpid-single-addr'/> - <feature policy='require' name='vmx-invvpid-all-context'/> - <feature policy='require' name='vmx-intr-exit'/> - <feature policy='require' name='vmx-nmi-exit'/> - <feature policy='require' name='vmx-vnmi'/> - <feature policy='require' name='vmx-preemption-timer'/> - <feature policy='require' name='vmx-vintr-pending'/> - <feature policy='require' name='vmx-tsc-offset'/> - <feature policy='require' name='vmx-hlt-exit'/> - <feature policy='require' name='vmx-invlpg-exit'/> - <feature policy='require' name='vmx-mwait-exit'/> - <feature policy='require' name='vmx-rdpmc-exit'/> - <feature policy='require' name='vmx-rdtsc-exit'/> - <feature policy='require' name='vmx-cr3-load-noexit'/> - <feature policy='require' name='vmx-cr3-store-noexit'/> - <feature policy='require' name='vmx-cr8-load-exit'/> - <feature policy='require' name='vmx-cr8-store-exit'/> - <feature policy='require' name='vmx-flexpriority'/> - <feature policy='require' name='vmx-vnmi-pending'/> - <feature policy='require' name='vmx-movdr-exit'/> - <feature policy='require' name='vmx-io-exit'/> - <feature policy='require' name='vmx-io-bitmap'/> - <feature policy='require' name='vmx-mtf'/> - <feature policy='require' name='vmx-msr-bitmap'/> - <feature policy='require' name='vmx-monitor-exit'/> - <feature policy='require' name='vmx-pause-exit'/> - <feature policy='require' name='vmx-secondary-ctls'/> - <feature policy='require' name='vmx-exit-nosave-debugctl'/> - <feature policy='require' name='vmx-exit-ack-intr'/> - <feature policy='require' name='vmx-exit-save-pat'/> - <feature policy='require' name='vmx-exit-load-pat'/> - <feature policy='require' name='vmx-exit-save-efer'/> - <feature policy='require' name='vmx-exit-load-efer'/> - <feature policy='require' name='vmx-exit-save-preemption-timer'/> - <feature policy='require' name='vmx-entry-noload-debugctl'/> - <feature policy='require' name='vmx-entry-ia32e-mode'/> - <feature policy='require' name='vmx-entry-load-pat'/> - <feature policy='require' name='vmx-entry-load-efer'/> - <feature policy='require' name='vmx-eptp-switching'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='yes' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='yes' vendor='Intel'>coreduo</model> - <model usable='yes' vendor='Intel'>core2duo</model> - <model usable='no' vendor='AMD'>athlon</model> - <model usable='yes' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='yes' vendor='Intel'>Skylake-Client</model> - <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='no' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='yes' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell-noTSX</model> - <model usable='yes' vendor='Intel'>Haswell-IBRS</model> - <model usable='yes' vendor='Intel'>Haswell</model> - <model usable='no' vendor='AMD'>EPYC-Rome</model> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC</model> - <model usable='no' vendor='Hygon'>Dhyana</model> - <model usable='no' vendor='Intel'>Cooperlake</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell-noTSX</model> - <model usable='yes' vendor='Intel'>Broadwell-IBRS</model> - <model usable='yes' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml deleted file mode 100644 index f276f0b735..0000000000 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ /dev/null @@ -1,263 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-q35-5.1</machine> - <arch>x86_64</arch> - <vcpu max='288'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>yes</value> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>on</value> - <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='forbid'>EPYC-Rome</model> - <vendor>AMD</vendor> - <maxphysaddr mode='passthrough' limit='64'/> - <feature policy='require' name='x2apic'/> - <feature policy='require' name='tsc-deadline'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='stibp'/> - <feature policy='require' name='arch-capabilities'/> - <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> - <feature policy='require' name='cmp_legacy'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='amd-ssbd'/> - <feature policy='require' name='virt-ssbd'/> - <feature policy='require' name='rdctl-no'/> - <feature policy='require' name='skip-l1dfl-vmentry'/> - <feature policy='require' name='mds-no'/> - <feature policy='require' name='pschange-mc-no'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='no' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='no' vendor='Intel'>coreduo</model> - <model usable='no' vendor='Intel'>core2duo</model> - <model usable='no' vendor='AMD'>athlon</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='yes' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='no' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='no' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Haswell-noTSX</model> - <model usable='no' vendor='Intel'>Haswell-IBRS</model> - <model usable='no' vendor='Intel'>Haswell</model> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='no' vendor='Intel'>Cooperlake</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml deleted file mode 100644 index eea710a054..0000000000 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ /dev/null @@ -1,276 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>qemu</domain> - <machine>pc-i440fx-5.1</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' 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_G3</model> - <vendor>AMD</vendor> - <feature policy='require' name='pclmuldq'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='ssse3'/> - <feature policy='require' name='sse4.1'/> - <feature policy='require' name='sse4.2'/> - <feature policy='require' name='movbe'/> - <feature policy='require' name='aes'/> - <feature policy='require' name='xsave'/> - <feature policy='require' name='rdrand'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='arat'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='bmi1'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='bmi2'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='mpx'/> - <feature policy='require' name='adx'/> - <feature policy='require' name='smap'/> - <feature policy='require' name='pcommit'/> - <feature policy='require' name='clflushopt'/> - <feature policy='require' name='clwb'/> - <feature policy='require' name='pku'/> - <feature policy='require' name='la57'/> - <feature policy='require' name='xsaveopt'/> - <feature policy='require' name='xgetbv1'/> - <feature policy='require' name='cr8legacy'/> - <feature policy='require' name='mmxext'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='3dnowext'/> - <feature policy='require' name='3dnow'/> - <feature policy='require' name='npt'/> - <feature policy='disable' name='misalignsse'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='yes' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='yes' vendor='Intel'>coreduo</model> - <model usable='yes' vendor='Intel'>core2duo</model> - <model usable='yes' vendor='AMD'>athlon</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='no' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='no' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='no' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='no' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Haswell-noTSX</model> - <model usable='no' vendor='Intel'>Haswell-IBRS</model> - <model usable='no' vendor='Intel'>Haswell</model> - <model usable='no' vendor='AMD'>EPYC-Rome</model> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC</model> - <model usable='no' vendor='Hygon'>Dhyana</model> - <model usable='no' vendor='Intel'>Cooperlake</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml deleted file mode 100644 index a471a937d7..0000000000 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ /dev/null @@ -1,145 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-sparc</path> - <domain>kvm</domain> - <machine>SS-5</machine> - <arch>sparc</arch> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'/> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>off</value> - </enum> - </mode> - <mode name='maximum' supported='no'/> - <mode name='host-model' supported='no'/> - <mode name='custom' supported='no'/> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - </enum> - <enum name='model'> - <value>virtio</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>none</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'/> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - </enum> - </filesystem> - <tpm supported='no'/> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'/> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='no'/> - <genid supported='no'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml deleted file mode 100644 index 56e30cc302..0000000000 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ /dev/null @@ -1,263 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-i440fx-5.1</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <iothreads supported='yes'/> - <os supported='yes'> - <enum name='firmware'> - <value>bios</value> - <value>efi</value> - </enum> - <loader supported='yes'> - <value>/obviously/fake/firmware1.fd</value> - <value>/obviously/fake/firmware2.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - <enum name='secure'> - <value>no</value> - </enum> - </loader> - </os> - <cpu> - <mode name='host-passthrough' supported='yes'> - <enum name='hostPassthroughMigratable'> - <value>on</value> - <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='forbid'>EPYC-Rome</model> - <vendor>AMD</vendor> - <maxphysaddr mode='passthrough' limit='64'/> - <feature policy='require' name='x2apic'/> - <feature policy='require' name='tsc-deadline'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='stibp'/> - <feature policy='require' name='arch-capabilities'/> - <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> - <feature policy='require' name='cmp_legacy'/> - <feature policy='require' name='invtsc'/> - <feature policy='require' name='amd-ssbd'/> - <feature policy='require' name='virt-ssbd'/> - <feature policy='require' name='rdctl-no'/> - <feature policy='require' name='skip-l1dfl-vmentry'/> - <feature policy='require' name='mds-no'/> - <feature policy='require' name='pschange-mc-no'/> - </mode> - <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>qemu64</model> - <model usable='yes' vendor='unknown'>qemu32</model> - <model usable='no' vendor='AMD'>phenom</model> - <model usable='yes' vendor='unknown'>pentium3</model> - <model usable='yes' vendor='unknown'>pentium2</model> - <model usable='yes' vendor='unknown'>pentium</model> - <model usable='no' vendor='Intel'>n270</model> - <model usable='yes' vendor='unknown'>kvm64</model> - <model usable='yes' vendor='unknown'>kvm32</model> - <model usable='no' vendor='Intel'>coreduo</model> - <model usable='no' vendor='Intel'>core2duo</model> - <model usable='no' vendor='AMD'>athlon</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Snowridge</model> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Server</model> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> - <model usable='no' vendor='Intel'>Skylake-Client</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='AMD'>Opteron_G5</model> - <model usable='no' vendor='AMD'>Opteron_G4</model> - <model usable='yes' vendor='AMD'>Opteron_G3</model> - <model usable='yes' vendor='AMD'>Opteron_G2</model> - <model usable='yes' vendor='AMD'>Opteron_G1</model> - <model usable='no' vendor='Intel'>Nehalem-IBRS</model> - <model usable='yes' vendor='Intel'>Nehalem</model> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> - <model usable='no' vendor='Intel'>IvyBridge</model> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Server</model> - <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model> - <model usable='no' vendor='Intel'>Icelake-Client</model> - <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Haswell-noTSX</model> - <model usable='no' vendor='Intel'>Haswell-IBRS</model> - <model usable='no' vendor='Intel'>Haswell</model> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='no' vendor='Intel'>Cooperlake</model> - <model usable='yes' vendor='Intel'>Conroe</model> - <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model> - <model usable='no' vendor='Intel'>Cascadelake-Server</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> - <model usable='no' vendor='Intel'>Broadwell</model> - <model usable='yes' vendor='unknown'>486</model> - </mode> - </cpu> - <memoryBacking supported='yes'> - <enum name='sourceType'> - <value>file</value> - <value>anonymous</value> - <value>memfd</value> - </enum> - </memoryBacking> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - <value>sata</value> - </enum> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - <value>egl-headless</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - <value>virtio</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>vfio</value> - </enum> - </hostdev> - <rng supported='yes'> - <enum name='model'> - <value>virtio</value> - <value>virtio-transitional</value> - <value>virtio-non-transitional</value> - </enum> - <enum name='backendModel'> - <value>random</value> - <value>egd</value> - <value>builtin</value> - </enum> - </rng> - <filesystem supported='yes'> - <enum name='driverType'> - <value>path</value> - <value>handle</value> - <value>virtiofs</value> - </enum> - </filesystem> - <tpm supported='yes'> - <enum name='model'> - <value>tpm-tis</value> - <value>tpm-crb</value> - </enum> - <enum name='backendModel'> - <value>passthrough</value> - <value>emulator</value> - <value>external</value> - </enum> - <enum name='backendVersion'> - <value>1.2</value> - </enum> - </tpm> - <redirdev supported='yes'> - <enum name='bus'> - <value>usb</value> - </enum> - </redirdev> - <channel supported='yes'> - <enum name='type'> - <value>pty</value> - <value>unix</value> - <value>spicevmc</value> - </enum> - </channel> - <crypto supported='yes'> - <enum name='model'> - <value>virtio</value> - </enum> - <enum name='type'> - <value>qemu</value> - </enum> - <enum name='backendModel'> - <value>builtin</value> - </enum> - </crypto> - <interface supported='yes'> - <enum name='backendType'> - <value>default</value> - </enum> - </interface> - </devices> - <features> - <gic supported='no'/> - <vmcoreinfo supported='yes'/> - <genid supported='yes'/> - <backingStoreInput supported='yes'/> - <backup supported='no'/> - <async-teardown supported='no'/> - <sev supported='no'/> - <sgx supported='no'/> - <launchSecurity supported='no'/> - </features> -</domainCapabilities> -- 2.49.0

2 1

[PATCH] qemucapabilitiesdata: Enable GTK graphics for 'caps_10.0.0_x86_64'
by Peter Krempa 28 Apr '25

28 Apr '25

From: Peter Krempa <pkrempa(a)redhat.com> The common x86_64 test output was usually built without GTK as I've had that in my build script for a long time. Enable it now as GTK UI is enabled by many distros and upcoming patches plan to add support to libvirt as well. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies index c2fd4f8d3d..6b2a2c2af7 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies @@ -5581,6 +5581,10 @@ "name": "142", "tag": "type", "variants": [ + { + "case": "gtk", + "type": "422" + }, { "case": "curses", "type": "424" @@ -13701,6 +13705,9 @@ { "name": "none" }, + { + "name": "gtk" + }, { "name": "sdl" }, @@ -13721,6 +13728,7 @@ "values": [ "default", "none", + "gtk", "sdl", "egl-headless", "curses", -- 2.49.0

2 1

Entering freeze for libvirt-11.3.0
by Jiri Denemark 28 Apr '25

28 Apr '25

I have just tagged v11.3.0-rc1 in the repository and pushed signed tarballs to https://download.libvirt.org/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 0

[PATCH] po/zh_CN.po: Fix some translation issues
by liu.song13＠zte.com.cn 28 Apr '25

28 Apr '25

From: QiangWei Zhang <zhang.qiangwei(a)zte.com.cn> Swap the order of the two objects to ensure that the logic of the two objects translated into Chinese is correct. Signed-off-by: QiangWei Zhang <zhang.qiangwei(a)zte.com.cn> --- po/zh_CN.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index bf04782f88..73f7aa0549 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5802,11 +5802,11 @@ msgstr "�� '%1$s' ��" #, c-format msgid "Domain '%1$s' created from %2$s\n" -msgstr "�� %1$s �� '%2$s'\n" +msgstr "�� %2$s �� '%1$s'\n" #, c-format msgid "Domain '%1$s' defined from %2$s\n" -msgstr "�� %1$s �� '%2$s'\n" +msgstr "�� %2$s �� '%1$s'\n" #, c-format msgid "Domain '%1$s' destroyed\n" @@ -8770,7 +8770,7 @@ msgstr "�� '%1$s' �� 0 ��" #, c-format msgid "Failed to unbind PCI device '%1$s' from %2$s" -msgstr "�� %1$s �� PCI �� '%2$s' ��" +msgstr "�� %2$s �� PCI �� '%1$s' ��" #, c-format msgid "Failed to undefine bridge interface %1$s" @@ -9798,7 +9798,7 @@ msgstr "�� %1$s XML ��\n" #, c-format msgid "Interface %1$s defined from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Interface %1$s destroyed\n" @@ -12240,11 +12240,11 @@ msgstr "�� %1$s XML ��\n" #, c-format msgid "Network %1$s created from %2$s\n" -msgstr "��%1$s��%2$s\n" +msgstr "��%2$s��%1$s\n" #, c-format msgid "Network %1$s defined from %2$s\n" -msgstr "�� %1$s��%2$s\n" +msgstr "�� %2$s��%1$s\n" #, c-format msgid "Network %1$s destroyed\n" @@ -12325,7 +12325,7 @@ msgstr "�� %1$s XML ��\n" #, c-format msgid "Network filter %1$s defined from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Network filter %1$s undefined\n" @@ -12340,7 +12340,7 @@ msgstr "��%1$s" #, c-format msgid "Network filter binding on %1$s created from %2$s\n" -msgstr "��%1$s �� %2$s ��\n" +msgstr "��%2$s �� %1$s ��\n" #, c-format msgid "Network filter binding on %1$s deleted\n" @@ -12376,7 +12376,7 @@ msgstr "��: %1$s" #, c-format msgid "Network port %1$s created from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Network port %1$s deleted\n" @@ -12805,7 +12805,7 @@ msgstr "��" #, c-format msgid "Node device %1$s created from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Node device '%1$s' defined from '%2$s'\n" @@ -13609,7 +13609,7 @@ msgstr "�� %1$s\n" #, c-format msgid "Pool %1$s created from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Pool %1$s defined\n" @@ -13617,7 +13617,7 @@ msgstr "�� %1$s\n" #, c-format msgid "Pool %1$s defined from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Pool %1$s deleted\n" @@ -20571,7 +20571,7 @@ msgstr "��" #, c-format msgid "Vol %1$s cloned from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Vol %1$s created\n" @@ -20579,7 +20579,7 @@ msgstr "�� %1$s ��\n" #, c-format msgid "Vol %1$s created from %2$s\n" -msgstr "�� %1$s �� %2$s\n" +msgstr "�� %2$s �� %1$s\n" #, c-format msgid "Vol %1$s created from input vol %2$s\n" -- 2.27.0

3 2

[PATCH] qemuxmlactivetest: Don't segfault when capability XMLs are invalid
by Peter Krempa 25 Apr '25

25 Apr '25

From: Peter Krempa <pkrempa(a)redhat.com> This is purely a devel-time problem in the test suite. 'qemuxmlactivetest' invokes the whole test worker twice, once for inactive output and second time for active. Now 'testQemuInfoInitArgs' returns a failure if the XML is invalid and the test is skipped. On another invocation though it returns 0 if 'testQemuInfoSetArgs' was not invoked meanwhile and thus makes it seem it succeeded which leads to a crash in the code assuming that some pointers are valid. Use same interlocking as 'qemuxmlconftest' to skip the second invocation on failure of the first one. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemuxmlactivetest.c | 67 +++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/tests/qemuxmlactivetest.c b/tests/qemuxmlactivetest.c index b132b91623..de2b1e48eb 100644 --- a/tests/qemuxmlactivetest.c +++ b/tests/qemuxmlactivetest.c @@ -87,6 +87,45 @@ testRunStatus(const char *name, } +static int +testqemuActiveXML2XMLCommonPrepare(testQemuInfo *info) +{ + if (info->prepared) + return 0; + + if (testQemuInfoInitArgs((testQemuInfo *) info) < 0) + goto error; + + virFileCacheClear(driver.qemuCapsCache); + + if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) + goto error; + + if (!(info->def = virDomainDefParseFile(info->infile, + driver.xmlopt, NULL, + info->parseFlags))) + goto error; + + if (!virDomainDefCheckABIStability(info->def, info->def, driver.xmlopt)) { + VIR_TEST_DEBUG("ABI stability check failed on %s", info->infile); + goto error; + } + + /* make sure that the XML definition looks active, by setting an ID + * as otherwise the XML formatter will simply assume that it's inactive */ + if (info->def->id == -1) + info->def->id = 1337; + + info->prepared = true; + return 0; + + error: + info->prep_skip = true; + info->prepared = true; + return -1; +} + + static int testqemuActiveXML2XMLCommon(testQemuInfo *info, bool live) @@ -95,31 +134,11 @@ testqemuActiveXML2XMLCommon(testQemuInfo *info, const char *outfile = info->out_xml_active; unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE; - /* Prepare the test data and parse the input just once */ - if (!info->def) { - if (testQemuInfoInitArgs((testQemuInfo *) info) < 0) - return -1; - - virFileCacheClear(driver.qemuCapsCache); + if (info->prep_skip) + return EXIT_AM_SKIP; - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) - return -1; - - if (!(info->def = virDomainDefParseFile(info->infile, - driver.xmlopt, NULL, - info->parseFlags))) - return -1; - - if (!virDomainDefCheckABIStability(info->def, info->def, driver.xmlopt)) { - VIR_TEST_DEBUG("ABI stability check failed on %s", info->infile); - return -1; - } - - /* make sure that the XML definition looks active, by setting an ID - * as otherwise the XML formatter will simply assume that it's inactive */ - if (info->def->id == -1) - info->def->id = 1337; - } + if (testqemuActiveXML2XMLCommonPrepare(info) < 0) + return -1; if (!live) { format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE; -- 2.49.0

2 1

[PATCH] conf: Fix handling of vlan with one tagged vlan id
by Leigh Brown 24 Apr '25

24 Apr '25

Yanqiu Zhang reported [1] that when a vlan is defined with a single vlan id and native mode set to tagged, the vlan was not setup correctly using the standard Linux bridge functionality. This is due a conflict between the XML validation and the bridge functionality. The XML validation will allow a single vlan id to be configured with native mode set to tagged without setting the vlan mode to trunked. If the vlan is explicitly set to "trunk='no'" then the validation will correctly reject the configuration. Rather than force the user to specify "trunk='yes'", update the code to infer trunk='yes' if a single vlan id is configured with native mode set to a non-default value. It already infers trunk='yes' if more than one vlan id is specified. Reported-by: Yanqiu Zhang <yanqzhan(a)redhat.com> Closes: https://gitlab.com/libvirt/libvirt/-/issues/767 [1] Signed-off-by: Leigh Brown <leigh(a)solinno.co.uk> --- src/conf/netdev_vlan_conf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 1ac66aec54..300d0d8e86 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -87,12 +87,13 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlan *def) def->nTags = nTags; - /* now that we know how many tags there are, look for an explicit - * trunk setting. + /* In case the trunk attribute is not specified, infer it from + * the number of tags or use of native vlan mode. */ - if (nTags > 1) + if (nTags > 1 || def->nativeMode != 0) def->trunk = true; + /* Look for and validate an explicit trunk setting. */ ctxt->node = node; if ((trunk = virXPathString("string(./@trunk)", ctxt)) != NULL) { def->trunk = STRCASEEQ(trunk, "yes"); -- 2.49.0

1 0