- Devel - libvirt List Archives

Feature proposal: Add page-per-vq flag to the 'driver' element of virtio devices
by Gavi Teitz 19 Apr '21

19 Apr '21

Hi, The page-per-vq flag is important for vdpa with vhost-user performance [1]. Currently there is no way in libvirt to set it in the xml page-per-vq except with qemu args, like so: <devices> <interface type='vhostuser'> <mac address='fa:16:3e:92:6d:79'/> <source type='unix' path='/var/lib/vhost_sockets/sock7f9a971a-cf3' mode='server'/> <model type='virtio'/> <driver queues='4' rx_queue_size='512' tx_queue_size='512'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> </devices> <qemu:commandline> <qemu:arg value='-set'/> <qemu:arg value='device.net0.page-per-vq=on'/> </qemu:commandline> However, this is not an approach which can be used for hotplug devices, as qemu:commandline arguments cannot be used for them, and is therefore not suitable for production. We propose to add the flag to the ' driver' element of virtio devices, as this is an attribute related to the virtio transport [2]. This will enable configuring virtio devices with the page-per-vq flag without relying on qemu:commandline arguments. Are there any issues that would prevent this feature from being accepted? Thanks, Gavi [1] - http://doc.dpdk.org/guides/sample_app_ug/vdpa.html - look for page-per-vq [2] - https://libvirt.org/formatdomain.html#virtio-related-options

3 3

[PATCH] add the ability to disable transport authentication (like esxi et al)
by simonmartin76 19 Apr '21

19 Apr '21

Signed-off-by: Simon Martin <simonmartin76(a)protonmail.com> --- src/hyperv/hyperv_driver.c | 5 +++++ src/hyperv/hyperv_util.c | 11 +++++++++++ src/hyperv/hyperv_util.h | 1 + 3 files changed, 17 insertions(+) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 17f5be1f0d..67e6e09f2d 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1728,6 +1728,11 @@ hypervInitConnection(virConnectPtr conn, hypervPrivate *priv, /* FIXME: Currently only basic authentication is supported */ wsman_transport_set_auth_method(priv->client, "basic"); + if (priv->parsedUri->noVerify) { + wsman_transport_set_verify_peer(priv->client, 0); + wsman_transport_set_verify_host(priv->client, 0); + } + return 0; } diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index d8a6e6cf5c..40e1540dfe 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -38,6 +38,7 @@ int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) { int result = -1; + int noVerify; size_t i; if (parsedUri == NULL || *parsedUri != NULL) { @@ -63,6 +64,16 @@ hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) (*parsedUri)->transport); goto cleanup; } + } else if (STRCASEEQ(queryParam->name, "no_verify")) { + if (virStrToLong_i(queryParam->value, NULL, 10, &noVerify) < 0 || + (noVerify != 0 && noVerify != 1)) { + virReportError(VIR_ERR_INVALID_ARG, + _("Query parameter 'no_verify' has unexpected value " + "'%s' (should be 0 or 1)"), queryParam->value); + goto cleanup; + } + + (*parsedUri)->noVerify = noVerify != 0; } else { VIR_WARN("Ignoring unexpected query parameter '%s'", queryParam->name); diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h index 67d698450d..a0604d6830 100644 --- a/src/hyperv/hyperv_util.h +++ b/src/hyperv/hyperv_util.h @@ -28,6 +28,7 @@ typedef struct _hypervParsedUri hypervParsedUri; struct _hypervParsedUri { char *transport; + bool noVerify; }; int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri); -- 2.17.1 Sent with ProtonMail Secure Email.

2 1

[libvirt PATCH] qemu_block: fix copy&paste typo in SSH protocol
by Pavel Hrdina 19 Apr '21

19 Apr '21

Fixes: caf71b64fe6989116316b966fda119cd3e47f485 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 6845e25176..a972e1e368 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -965,7 +965,7 @@ qemuBlockStorageSourceGetSshProps(virStorageSource *src) if (src->nhosts != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("sheepdog protocol accepts only one host")); + _("ssh protocol accepts only one host")); return NULL; } -- 2.30.2

2 1

[libvirt PATCH 0/2] introduce 'restrictive' mode in numatune
by Martin Kletzander 19 Apr '21

19 Apr '21

Resent patches with some fixes v5: https://listman.redhat.com/archives/libvir-list/2021-April/msg00450.html Luyao Zhong (2): conf, docs, schema: Add support for 'restrictive' mode in numatune qemu: Add support for 'restrictive' mode in numatune docs/formatdomain.rst | 7 +++- docs/schemas/domaincommon.rng | 2 + include/libvirt/libvirt-domain.h | 1 + src/conf/numa_conf.c | 9 ++++ src/qemu/qemu_command.c | 6 ++- src/qemu/qemu_process.c | 32 +++++++++++++++ src/util/virnuma.c | 3 ++ .../numatune-memnode-invalid-mode.err | 1 + .../numatune-memnode-invalid-mode.xml | 33 +++++++++++++++ ...emnode-restrictive-mode.x86_64-latest.args | 38 +++++++++++++++++ .../numatune-memnode-restrictive-mode.xml | 41 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + ...memnode-restrictive-mode.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 14 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.xml create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml create mode 120000 tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml -- 2.31.1

3 5

[PATCH] lxc: Format --handshakefd for controller cmd fully
by Michal Privoznik 19 Apr '21

19 Apr '21

The command line argument is called --hanshakefd (check out lxc_controller.c:main()). But the command line builder puts only --handshake. This works, because there is no other argument sharing the prefix. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index b2a7f105a9..ac635efe7a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1002,7 +1002,7 @@ virLXCProcessBuildControllerCmd(virLXCDriver *driver, virCommandAddArgPair(cmd, "--security", virSecurityManagerGetModel(driver->securityManager)); - virCommandAddArg(cmd, "--handshake"); + virCommandAddArg(cmd, "--handshakefd"); virCommandAddArgFormat(cmd, "%d", handshakefd); for (i = 0; veths && veths[i]; i++) -- 2.26.3

3 3

[PATCH 00/25] conf: domain: Refactor virDomainDiskDefParseXML
by Peter Krempa 19 Apr '21

19 Apr '21

Split out all default setting and validation code into appropriate functions and convert the XML parser to contemporary helpers. Peter Krempa (25): virXMLParseHelper: Add root XML node name validation capability util: xml: Introduce virXMLParseStringCtxtRoot conf: domain: Introduce virDomainDiskDefParseSource qemu: driver: Use virDomainDiskDefParseSource in qemuDomainBlockCopy conf: domain: Introduce an internal variant of virDomainDiskDefNew conf: domain: Split out source validation part from virDomainDiskDefParseValidate conf: domain: Split out parsing of source data from <disk> XML parser conf: domain: Remove VIR_DOMAIN_DEF_PARSE_DISK_SOURCE parser flag virDomainDiskDefValidate: Consolidate conditions conf: Move code from virDomainDiskDefParseValidate to virDomainDiskDefValidate conf: Move disk vendor and product pritability check to domain_validate conf: Move checks from virDomainDiskDefPostParse to virDomainDiskDefValidate conf: Move disk target 'ioemu:' stripping to virDomainDiskDefPostParse conf: domain: Introduce VIR_DOMAIN_DISK_BUS_NONE vmx: Mark CDROM disk elements as read-only conf: domain: Move default setting from virDomainDiskDefParseXML to virDomainDiskDefPostParse conf: domain: Move checks from virDomainDiskDefParseXML to virDomainDiskDefValidate conf: domain: Convert virDomainDiskDef's 'removable' to virTristateSwitch conf: domain: Convert virDomainDiskDef's 'rawio' to virTristateBool conf: domain: Convert virDomainDiskDef's 'sgio' to virDomainDeviceSGIO conf: domain: Convert virDomainDiskDef's 'model' to virDomainDiskModel conf: domain: Convert virDomainDiskDef's 'snapshot' to unsigned int conf: domain: Convert virDomainDiskDef's 'bus' to virDomainDiskBus conf: domain: Convert virDomainDiskDef's 'device' to virDomainDiskDevice conf: domain: Refactor virDomainDiskDefParseXML src/bhyve/bhyve_command.c | 12 + src/bhyve/bhyve_domain.c | 12 + src/conf/domain_conf.c | 715 ++++++------------ src/conf/domain_conf.h | 32 +- src/conf/domain_validate.c | 245 +++++- src/conf/domain_validate.h | 2 + src/conf/storage_conf.c | 16 +- src/hyperv/hyperv_driver.c | 18 + src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 11 + src/qemu/qemu_alias.c | 1 + src/qemu/qemu_command.c | 6 + src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_hotplug.c | 2 + src/qemu/qemu_validate.c | 3 + src/util/virxml.c | 18 +- src/util/virxml.h | 17 +- src/vbox/vbox_common.c | 1 + src/vmx/vmx.c | 4 + src/vz/vz_sdk.c | 22 +- src/vz/vz_utils.c | 8 + .../vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 1 + .../vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 1 + .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 1 + .../vmx2xml-cdrom-ide-raw-device.xml | 1 + .../vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 1 + .../vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 1 + .../vmx2xml-cdrom-scsi-passthru.xml | 1 + .../vmx2xml-cdrom-scsi-raw-auto-detect.xml | 1 + .../vmx2xml-cdrom-scsi-raw-device.xml | 1 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 3 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 1 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 1 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 1 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml | 1 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 1 + .../vmx2xml-fusion-in-the-wild-1.xml | 1 + .../vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml | 1 + .../vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 1 + 43 files changed, 645 insertions(+), 534 deletions(-) -- 2.30.2

2 26

[PATCH 0/3] vircgroup: Fix virCgroupKillRecursive() wrt nested controllers
by Michal Privoznik 19 Apr '21

19 Apr '21

See 3/3 for explanation. Michal Prívozník (3): vircgroup: Debug print all arguments of virCgroupKillRecursiveInternal() vircgroupbackend: Extend error messages in VIR_CGROUP_BACKEND_CALL() vircgroup: Fix virCgroupKillRecursive() wrt nested controllers src/util/vircgroup.c | 29 +++++++++++++++++++++++++---- src/util/vircgroupbackend.c | 1 - src/util/vircgroupbackend.h | 8 ++++++-- src/util/vircgrouppriv.h | 1 - src/util/vircgroupv1.c | 7 +------ src/util/vircgroupv2.c | 7 +------ 6 files changed, 33 insertions(+), 20 deletions(-) -- 2.26.3

2 4

[PATCH] cmdDomBlkError: Fix crash when initial call to virDomainGetDiskErrors fails
by Peter Krempa 19 Apr '21

19 Apr '21

virDomainGetDiskErrors uses the weird semantics where we make the caller query for the number of elements and then pass pre-allocated structure. The cleanup section errorneously used the 'count' variable to free the allocated elements for the API but 'count' can be '-1' in cases when the API returns failure, thus attempting to free beyond the end of the array. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/155 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tools/virsh-domain-monitor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 0e49f5da8a..a2bf5c05fc 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1220,7 +1220,7 @@ cmdDomBlkError(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virDomainDiskErrorPtr disks = NULL; - unsigned int ndisks; + unsigned int ndisks = 0; size_t i; int count; bool ret = false; @@ -1230,10 +1230,10 @@ cmdDomBlkError(vshControl *ctl, const vshCmd *cmd) if ((count = virDomainGetDiskErrors(dom, NULL, 0, 0)) < 0) goto cleanup; - ndisks = count; - if (ndisks) { - disks = g_new0(virDomainDiskError, ndisks); + if (count > 0) { + disks = g_new0(virDomainDiskError, count); + ndisks = count; if ((count = virDomainGetDiskErrors(dom, disks, ndisks, 0)) == -1) goto cleanup; @@ -1252,7 +1252,7 @@ cmdDomBlkError(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - for (i = 0; i < count; i++) + for (i = 0; i < ndisks; i++) VIR_FREE(disks[i].disk); VIR_FREE(disks); virshDomainFree(dom); -- 2.30.2

2 1

Plans for the next release
by Jiri Denemark 19 Apr '21

19 Apr '21

We are getting close to the next release of libvirt. To aim for the release on May 03 I suggest entering the freeze on Tuesday Apr 27 and tagging RC2 on Thursday Apr 29 in the afternoon. I hope this works for everyone. Jirka

1 0

[libvirt PATCH 0/3] Fix some memory leaks
by Tim Wiederhake 17 Apr '21

17 Apr '21

These memory leaks were found by llvm's address sanitizer asan. Tim Wiederhake (3): xenParseHypervisorFeatures: Fix memory leak virDomainFeaturesDefParse: Fix memory leak virQEMUCapsSetHostModel: Fix memory leak src/conf/domain_conf.c | 2 +- src/libxl/xen_common.c | 1 + src/qemu/qemu_capabilities.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) -- 2.26.2

3 7

[libvirt PATCH] spec: Merge -bash-completion and -admin into -client
by Andrea Bolognani 16 Apr '21

16 Apr '21

The former is ridiculously tiny and doesn't have any use on its own, so it hardly warrants the overhead of an additional package; the latter is also very small and, just like virsh, is something that you likely want to have available on any virtualization host to help with management and debugging tasks. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f9af330186..80a12a307a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -901,7 +901,6 @@ Requires: %{name}-libs = %{version}-%{release} Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils -Requires: %{name}-bash-completion = %{version}-%{release} %description client The client binaries needed to access the virtualization @@ -918,20 +917,6 @@ Requires: cyrus-sasl-gssapi %description libs Shared libraries for accessing the libvirt daemon. -%package admin -Summary: Set of tools to control libvirt daemon -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-bash-completion = %{version}-%{release} - -%description admin -The client side utilities to control the libvirt daemon. - -%package bash-completion -Summary: Bash completion script - -%description bash-completion -Bash completion script stub. - %if %{with_wireshark} %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions @@ -1872,10 +1857,12 @@ exit 0 %files client %{_mandir}/man1/virsh.1* +%{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* %{_mandir}/man1/virt-host-validate.1* %{_bindir}/virsh +%{_bindir}/virt-admin %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate %{_bindir}/virt-host-validate @@ -1886,8 +1873,9 @@ exit 0 %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %endif +%{_datadir}/bash-completion/completions/vsh %{_datadir}/bash-completion/completions/virsh - +%{_datadir}/bash-completion/completions/virt-admin %{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests @@ -1911,14 +1899,6 @@ exit 0 %{_datadir}/libvirt/test-screenshot.png -%files admin -%{_mandir}/man1/virt-admin.1* -%{_bindir}/virt-admin -%{_datadir}/bash-completion/completions/virt-admin - -%files bash-completion -%{_datadir}/bash-completion/completions/vsh - %if %{with_wireshark} %files wireshark %{wireshark_plugindir}/libvirt.so -- 2.26.3

4 5

[libvirt PATCHv1 0/4] qemu: support unmanaged virtiofsd
by Ján Tomko 16 Apr '21

16 Apr '21

Connect the vhost-user-fs device to a socket path configured in the XML. Starting and stopping the virtiofsd daemon on that socket is the user's responsibility. Ján Tomko (4): conf: fs: fill out accessmode in post-parse conf: fs: allow missing accessmode in the formatter conf: add socket for virtiofs filesystems qemu: add socket for virtiofs filesystems docs/schemas/domaincommon.rng | 11 +++++ src/conf/domain_conf.c | 43 +++++++++++++------ src/conf/domain_conf.h | 2 + src/qemu/qemu_extdevice.c | 10 +++-- src/qemu/qemu_validate.c | 17 +++++--- tests/qemuxml2argvdata/vhost-user-fs-sock.xml | 39 +++++++++++++++++ .../vhost-user-fs-sock.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 8 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-sock.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-sock.x86_64-latest.xml -- 2.29.2

2 6

[PATCH 0/2] conf: Convert 'tray_status' and 'startupPolicy' of virDomainDiskDef to enums
by Peter Krempa 16 Apr '21

16 Apr '21

I was testing how virXMLPropEnum works when used on converted types, so I've converted these. Peter Krempa (2): conf: domain: Convert virDomainDiskDef's 'tray_status' to virDomainDiskTray conf: domain: Convert virDomainDiskDef's 'startupPolicy' to virDomainStartupPolicy src/conf/domain_conf.c | 31 +++++++------------------------ src/conf/domain_conf.h | 4 ++-- 2 files changed, 9 insertions(+), 26 deletions(-) -- 2.30.2

2 4

[libvirt PATCH] nodedev: Fix possible NULL pointer dereference on vfiogroup opening
by Erik Skultety 16 Apr '21

16 Apr '21

Coverity report: 1193 g_autofree char *vfiogroup = 1194 virMediatedDeviceGetIOMMUGroupDev(def->caps->data.mdev.uuid); >>> CID 317619: Null pointer dereferences (NULL_RETURNS) >>> Dereferencing a pointer that might be "NULL" "vfiogroup" when calling "open". [Note: The source code implementation of the function has been overridden by a builtin model.] 1195 VIR_AUTOCLOSE fd = open(vfiogroup, O_RDONLY); This patch shuffles the declarations in the affected 'if' block a bit to make it more readable after adding the NULL pointer condition. Note that error is not reported in this patch, because if @vfiogroup is NULL, then it must have been a system error which was already reported by the called function. Don't get confused by virMediatedDeviceGetIOMMUGroupDev returning NULL on an empty UUID, mdevs will always have one. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/node_device/node_device_driver.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index e33d4a965b..7289322050 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1190,10 +1190,16 @@ nodeDeviceDestroy(virNodeDevicePtr device) * to be opened by one user at a time. So if we get EBUSY when opening * the group, we infer that the device is in use and therefore we * shouldn't try to remove the device. */ - g_autofree char *vfiogroup = - virMediatedDeviceGetIOMMUGroupDev(def->caps->data.mdev.uuid); - VIR_AUTOCLOSE fd = open(vfiogroup, O_RDONLY); g_autofree char *errmsg = NULL; + g_autofree char *vfiogroup = NULL; + const char *uuidstr = def->caps->data.mdev.uuid; + VIR_AUTOCLOSE fd = -1; + + vfiogroup = virMediatedDeviceGetIOMMUGroupDev(uuidstr); + if (!vfiogroup) + goto cleanup; + + fd = open(vfiogroup, O_RDONLY); if (fd < 0 && errno == EBUSY) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.30.2

2 1

[libvirt PATCH v6 0/8] Refactor XML parsing boilerplate code
by Tim Wiederhake 16 Apr '21

16 Apr '21

This series lays the groundwork for replacing some recurring boilerplate code in src/conf/ regarding the extraction of XML attribute values. For an on / off attribute, the boilerplate code looks roughly like this, g_autofree char *str = NULL; if (str = virXMLPropString(node, "x")) { int val; if ((val = virTristateBoolTypeFromString(str)) <= 0) { virReportError(...) return -1; } def->x = val; } with some variations regarding how `str` is free'd in case of later re-use, the exact error message for invalid values, whether or not `VIR_TRISTATE_(SWITCH|BOOL)_ABSENT` is explicitly checked for (`val < 0` vs. `val <= 0`), whether an intermediate variable is used or the value is assigned directly, and in some cases the conditions in the two if-blocks are merged. After the refactoring, the above code block looks like this: if (virXMLPropTristateBool(node, "x", VIR_XML_PROP_OPTIONAL, &def->x) < 0) return -1; Similar functions are introduced for integer valued attributes, unsigned integer valued attributes and enum valued attributes. Patches #6, #7, and #8 demonstrate the application of these function and stand representative of more patches that I did not sent along yet as to not drown the mailing list in spam. These patches remove a total of ~ 1000 lines of code and fix some places, where e.g. `<foo bar="default"/>` would incorrectly be accepted as virXMLTristateBool. As an added benefit, this refactoring makes the error messages for invalid values in these XML attributes much more consistent: $ git diff master | grep "^-.*_(\"" | wc -l 239 $ git diff master | grep "^+.*_(\"" | wc -l 21 V1: https://listman.redhat.com/archives/libvir-list/2021-March/msg00853.html V2: https://listman.redhat.com/archives/libvir-list/2021-March/msg00994.html V3: https://listman.redhat.com/archives/libvir-list/2021-March/msg01066.html V4: https://listman.redhat.com/archives/libvir-list/2021-April/msg00209.html V5: https://listman.redhat.com/archives/libvir-list/2021-April/msg00232.html Changes since V5: * Applied changes requested in https://listman.redhat.com/archives/libvir-list/2021-April/msg00658.html Cheers, Tim Tim Wiederhake (8): virxml: Add virXMLPropTristateBool virxml: Add virXMLPropTristateSwitch virxml: Add virXMLPropInt virxml: Add virXMLPropUInt virxml: Add virXMLPropEnum virNetworkForwardNatDefParseXML: Use virXMLProp* virDomainIOThreadIDDefParseXML: Use virXMLProp* virCPUDefParseXML: Use virXMLProp* src/conf/cpu_conf.c | 14 +-- src/conf/domain_conf.c | 14 +-- src/conf/network_conf.c | 16 +-- src/libvirt_private.syms | 5 + src/util/virxml.c | 249 +++++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 42 +++++++ 6 files changed, 305 insertions(+), 35 deletions(-) -- 2.26.2

2 9

[PATCH 0/5] util: xml: cleanup virxml.h and virXMLParseHelper
by Peter Krempa 16 Apr '21

16 Apr '21

Peter Krempa (5): util: virxml: Fix formatting of virxml.h virXMLParseHelper: Sync argument names between declaration and definition util: xml: Register autoptr cleanup function for 'xmlParserCtxt' virXMLParseHelper: Rework error reporting virXMLParseHelper: Refactor cleanup src/util/virxml.c | 45 ++++++----- src/util/virxml.h | 193 +++++++++++++++++++++++++++------------------- 2 files changed, 137 insertions(+), 101 deletions(-) -- 2.30.2

2 6

[libvirt][PATCH v5 0/3] introduce 'restrictive' mode in numatune
by Luyao Zhong 16 Apr '21

16 Apr '21

Before this patch set, numatune only has three memory modes: static, interleave and prefered. These memory policies are ultimately set by mbind() system call. Memory policy could be 'hard coded' into the kernel, but none of above policies fit our requirment under this case. mbind() support default memory policy, but it requires a NULL nodemask. So obviously setting allowed memory nodes is cgroups' mission under this case. So we introduce a new option for mode in numatune named 'restrictive'. <numatune> <memory mode="restrictive" nodeset="1-4,^3"/> <memnode cellid="0" mode="restrictive" nodeset="1"/> <memnode cellid="2" mode="restrictive" nodeset="2"/> </numatune> The config above means we only use cgroups to restrict the allowed memory nodes and not setting any specific memory policies explicitly. For this new "restrictive" mode, there is a concrete use case about a new feature in kernel but not merged yet, we call it memory tiering. (https://lwn.net/Articles/802544/) If memory tiering is enabled on host, DRAM is top tier memory, and PMEM(persistent memory) is second tier memory, PMEM is shown as numa node without cpu. Pages can be migrated between DRAM node and PMEM node based on DRAM pressure and how cold/hot they are. *this memory policy* is implemented in kernel. So we need a default mode here, but from libvirt's perspective, the "defaut" mode is "strict", it's not MPOL_DEFAULT (https://man7.org/linux/man-pages/man2/mbind.2.html) defined in kernel. And to make memory tiering works well, cgroups setting is necessary, since it restricts that the pages can only be migrated between the DRAM and PMEM nodes that we specified (NUMA affinity support). Just using cgroups with multiple nodes in the nodeset makes kernel decide on which node (out of those in the restricted set) to allocate on, but specifying "strict" basically allocates it sequentially (on the first one until it is full, then on the next one and so on). In a word, if a user requires default mode(MPOL_DEFAULT), that means they want kernel decide the memory allocation and also want the cgroups to restrict memory nodes, "restrictive" mode will be useful. BR, Luyao Luyao Zhong (3): docs: add docs for 'restrictive' option for mode in numatune schema: add 'restrictive' config option for mode in numatune qemu: add parser and formatter for 'restrictive' mode in numatune docs/formatdomain.rst | 7 +++- docs/schemas/domaincommon.rng | 2 + include/libvirt/libvirt-domain.h | 1 + src/conf/numa_conf.c | 9 ++++ src/qemu/qemu_command.c | 6 ++- src/qemu/qemu_process.c | 27 ++++++++++++ src/util/virnuma.c | 3 ++ .../numatune-memnode-invalid-mode.err | 1 + .../numatune-memnode-invalid-mode.xml | 33 +++++++++++++++ ...emnode-restrictive-mode.x86_64-latest.args | 38 +++++++++++++++++ .../numatune-memnode-restrictive-mode.xml | 33 +++++++++++++++ tests/qemuxml2argvtest.c | 2 + ...memnode-restrictive-mode.x86_64-latest.xml | 41 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 201 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.xml create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml create mode 100644 tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml -- 2.25.4

3 5

[libvirt PATCH v5 0/8] Refactor XML parsing boilerplate code
by Tim Wiederhake 16 Apr '21

16 Apr '21

This series lays the groundwork for replacing some recurring boilerplate code in src/conf/ regarding the extraction of XML attribute values. For an on / off attribute, the boilerplate code looks roughly like this, g_autofree char *str = NULL; if (str = virXMLPropString(node, "x")) { int val; if ((val = virTristateBoolTypeFromString(str)) <= 0) { virReportError(...) return -1; } def->x = val; } with some variations regarding how `str` is free'd in case of later re-use, the exact error message for invalid values, whether or not `VIR_TRISTATE_(SWITCH|BOOL)_ABSENT` is explicitly checked for (`val < 0` vs. `val <= 0`), whether an intermediate variable is used or the value is assigned directly, and in some cases the conditions in the two if-blocks are merged. After the refactoring, the above code block looks like this: if (virXMLPropTristateBool(node, "x", VIR_XML_PROP_OPTIONAL, &def->x) < 0) return -1; Similar functions are introduced for integer valued attributes, unsigned integer valued attributes and enum valued attributes. Patches #6, #7, and #8 demonstrate the application of these function and stand representative of more patches that I did not sent along yet as to not drown the mailing list in spam. These patches remove a total of ~ 1000 lines of code and fix some places, where e.g. `<foo bar="default"/>` would incorrectly be accepted as virXMLTristateBool. As an added benefit, this refactoring makes the error messages for invalid values in these XML attributes much more consistent: $ git diff master | grep "^-.*_(\"" | wc -l 239 $ git diff master | grep "^+.*_(\"" | wc -l 21 V1: https://listman.redhat.com/archives/libvir-list/2021-March/msg00853.html V2: https://listman.redhat.com/archives/libvir-list/2021-March/msg00994.html V3: https://listman.redhat.com/archives/libvir-list/2021-March/msg01066.html V4: https://listman.redhat.com/archives/libvir-list/2021-April/msg00209.html Changes since V4: * Added custom error message for virXMLProp(Int|UInt) when the attribute value is 0 and VIR_XML_PROP_NONZERO is specified. Cheers, Tim Tim Wiederhake (8): virxml: Add virXMLPropTristateBool virxml: Add virXMLPropTristateSwitch virxml: Add virXMLPropInt virxml: Add virXMLPropUInt virxml: Add virXMLPropEnum virNetworkForwardNatDefParseXML: Use virXMLProp* virDomainIOThreadIDDefParseXML: Use virXMLProp* virCPUDefParseXML: Use virXMLProp* src/conf/cpu_conf.c | 14 +- src/conf/domain_conf.c | 14 +- src/conf/network_conf.c | 16 +-- src/libvirt_private.syms | 5 + src/util/virxml.c | 267 +++++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 31 +++++ 6 files changed, 312 insertions(+), 35 deletions(-) -- 2.26.2

2 18

[libvirt PATCH 00/14] Use virTristateXXX for more struct members
by Tim Wiederhake 16 Apr '21

16 Apr '21

This is a preparation step for some refactoring of the XML parser, see https://listman.redhat.com/archives/libvir-list/2021-March/msg01066.html Many libvirt structs have members that are of type `int` but actually are virTristateBool or virTristateSwitch. Fix this to increase type safety. Note that the comments on `virStorageAdapterFCHost::managed` and `virStoragePoolSourceDevice::part_separator` (patches #12 and #13) were actually wrong. Cheers, Tim Tim Wiederhake (14): conf: Use virTristateXXX in virStorageSource conf: Use virTristateXXX in virStorageSourceNVMeDef conf: Use virTristateXXX in virDomainDeviceInfo conf: Use virTristateXXX in virDomainDiskDef conf: Use virTristateXXX in virDomainActualNetDef conf: Use virTristateXXX in virDomainNetDef conf: Use virTristateXXX in virDomainChrSourceDef conf: Use virTristateXXX in virDomainGraphicsDef conf: Use virTristateXXX in virDomainMemballoonDef conf: Use virTristateXXX in virDomainLoaderDef conf: Use virTristateXXX in virDomainDef conf: Use virTristateXXX in virStorageAdapterFCHost conf: Use virTristateXXX in virStoragePoolSourceDevice conf: Use virTristateXXX in virPCIDeviceAddress src/conf/device_conf.c | 16 +-- src/conf/device_conf.h | 4 +- src/conf/domain_conf.c | 201 +++++++++++++++++++------------- src/conf/domain_conf.h | 28 ++--- src/conf/storage_adapter_conf.c | 4 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 7 +- src/conf/storage_conf.h | 2 +- src/conf/storage_source_conf.h | 4 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_hotplug.c | 2 +- src/util/virpci.h | 2 +- 12 files changed, 162 insertions(+), 113 deletions(-) -- 2.26.2

2 16

[libvirt PATCH v4 0/8] Refactor XML parsing boilerplate code
by Tim Wiederhake 16 Apr '21

16 Apr '21

This series lays the groundwork for replacing some recurring boilerplate code in src/conf/ regarding the extraction of XML attribute values. For an on / off attribute, the boilerplate code looks roughly like this, g_autofree char *str = NULL; if (str = virXMLPropString(node, "x")) { int val; if ((val = virTristateBoolTypeFromString(str)) <= 0) { virReportError(...) return -1; } def->x = val; } with some variations regarding how `str` is free'd in case of later re-use, the exact error message for invalid values, whether or not `VIR_TRISTATE_(SWITCH|BOOL)_ABSENT` is explicitly checked for (`val < 0` vs. `val <= 0`), whether an intermediate variable is used or the value is assigned directly, and in some cases the conditions in the two if-blocks are merged. After the refactoring, the above code block looks like this: if (virXMLPropTristateBool(node, "x", VIR_XML_PROP_OPTIONAL, &def->x) < 0) return -1; Similar functions are introduced for integer valued attributes, unsigned integer valued attributes and enum valued attributes. Patches #6, #7, and #8 demonstrate the application of these function and stand representative of more patches that I did not sent along yet as to not drown the mailing list in spam. These patches remove a total of ~ 1000 lines of code and fix some places, where e.g. `<foo bar="default"/>` would incorrectly be accepted as virXMLTristateBool. As an added benefit, this refactoring makes the error messages for invalid values in these XML attributes much more consistent: $ git diff master | grep "^-.*_(\"" | wc -l 239 $ git diff master | grep "^+.*_(\"" | wc -l 19 V1: https://listman.redhat.com/archives/libvir-list/2021-March/msg00853.html V2: https://listman.redhat.com/archives/libvir-list/2021-March/msg00994.html V3: https://listman.redhat.com/archives/libvir-list/2021-March/msg01066.html Changes since V3: * Changed virXMLProp* to use bitwise OR-ed enums instead of several boolean arguments * Added virXMLProp(Int|UInt|Enum) * Hold back on most of the actual refactoring to get feedback on the new functions' signatures first Cheers, Tim Tim Wiederhake (8): virxml: Add virXMLPropTristateBool virxml: Add virXMLPropTristateSwitch virxml: Add virXMLPropInt virxml: Add virXMLPropUInt virxml: Add virXMLPropEnum virNetworkForwardNatDefParseXML: Use virXMLProp* virDomainIOThreadIDDefParseXML: Use virXMLProp* virCPUDefParseXML: Use virXMLProp* src/conf/cpu_conf.c | 14 +-- src/conf/domain_conf.c | 14 +-- src/conf/network_conf.c | 16 +-- src/libvirt_private.syms | 5 + src/util/virxml.c | 255 +++++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 31 +++++ 6 files changed, 300 insertions(+), 35 deletions(-) -- 2.26.2

3 11

[PATCH] ci: Refresh contents
by Andrea Bolognani 15 Apr '21

15 Apr '21

Notable changes: * cross-building container images are smaller because they no longer include the native compilers; * ccache is enabled for clang builds. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the CI refresh rule. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/287122672 ci/cirrus/freebsd-12.vars | 7 ++++++- ci/cirrus/freebsd-current.vars | 7 ++++++- ci/cirrus/macos-11.vars | 7 ++++++- ci/containers/centos-7.Dockerfile | 9 ++++++--- ci/containers/centos-8.Dockerfile | 9 ++++++--- ci/containers/centos-stream.Dockerfile | 9 ++++++--- ci/containers/debian-10-cross-aarch64.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv6l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv7l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-i686.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips64el.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mipsel.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-ppc64le.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-s390x.Dockerfile | 10 +++++----- ci/containers/debian-10.Dockerfile | 9 ++++++--- ci/containers/debian-sid-cross-aarch64.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv6l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv7l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-i686.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mips64el.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mipsel.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-s390x.Dockerfile | 8 ++++---- ci/containers/debian-sid.Dockerfile | 7 +++++-- ci/containers/fedora-32.Dockerfile | 7 +++++-- ci/containers/fedora-33.Dockerfile | 7 +++++-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide.Dockerfile | 7 +++++-- ci/containers/opensuse-152.Dockerfile | 9 ++++++--- ci/containers/ubuntu-1804.Dockerfile | 9 ++++++--- ci/containers/ubuntu-2004.Dockerfile | 9 ++++++--- 33 files changed, 165 insertions(+), 113 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 115fd89727..7bd875176e 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-12 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 115fd89727..0f5b704a7b 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-current libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index ba0e77d728..8965338456 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-11 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + PACKAGING_COMMAND='brew' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile index d1de34cedf..49345fa128 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/centos:7 RUN yum update -y && \ @@ -47,6 +48,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -123,10 +125,11 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index d55115fe29..0c7292b8d2 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/centos:8 RUN dnf update -y && \ @@ -18,6 +19,7 @@ RUN dnf update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -95,10 +97,11 @@ RUN dnf update -y && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile index a6715700c9..3bc66775eb 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/centos:8 RUN dnf install -y centos-release-stream && \ @@ -20,6 +21,7 @@ RUN dnf install -y centos-release-stream && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -97,10 +99,11 @@ RUN dnf install -y centos-release-stream && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index 50476a7f5c..e006dcc68b 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -120,7 +120,7 @@ cpu = 'aarch64'\n\ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index aed38f6f3d..abc3ef52db 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -119,7 +119,7 @@ cpu = 'arm'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 714e28ad07..2e9bedf614 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -120,7 +120,7 @@ cpu = 'armhf'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 7fcd38ff7b..4b88d751bd 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -119,7 +119,7 @@ cpu = 'i686'\n\ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index 09d0653e13..dbdc9c57a8 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ @@ -119,7 +119,7 @@ cpu = 'mips'\n\ endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index 07ce89e16f..37044e296d 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -119,7 +119,7 @@ cpu = 'mips64el'\n\ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index 644b822302..3587f52374 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -119,7 +119,7 @@ cpu = 'mipsel'\n\ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index f2e61268e9..e8699d896b 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -119,7 +119,7 @@ cpu = 'powerpc64le'\n\ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index e9b89c299a..b31b5fd051 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -119,7 +119,7 @@ cpu = 's390x'\n\ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index fbc06b3314..d4ab8196c2 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -97,10 +99,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 373b9ad31a..514f42a83e 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index e32d0fd230..592c485f64 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index cc46822665..f4e9829961 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index a4cd1c1070..500e306f8b 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 76298a7e4e..1ed444d9d3 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 3c69ce545f..e30e1cf808 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index c274e106a0..430cd1176c 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 7d9120c93e..716002dbaa 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index d1141ea307..011b766715 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -95,7 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile index 71c78c76dc..9b06bcbac5 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 08cd40bc3a..2885eafbb0 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 1ac0c08e4c..139e0b145c 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc RUN nosync dnf install -y \ mingw32-curl \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 767e43639d..b24049f879 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc RUN nosync dnf install -y \ mingw64-curl \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 7cb68dcd50..1f0abb7288 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -25,6 +26,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -104,7 +106,8 @@ exec "$@"' > /usr/bin/nosync && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile index 8688934e92..6b56641292 100644 --- a/ci/containers/opensuse-152.Dockerfile +++ b/ci/containers/opensuse-152.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ @@ -15,6 +16,7 @@ RUN zypper update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-1-devel \ @@ -91,10 +93,11 @@ RUN zypper update -y && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 55b7821cba..c6c3ef5823 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -99,10 +101,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index 04427b81d0..78df341dca 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -98,10 +100,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" -- 2.26.3

1 0

[PATCH] virsh: snapshot: Don't validate schema of XML generated by 'virsh snapshot-create-as'
by Peter Krempa 15 Apr '21

15 Apr '21

Commit 95f8e3237e5486f487324c6 which introduced XML schema validation for snapshot XMLs always asserted the validation for the XML generated by 'virsh snapshot-create-as' on the basis that it's libvirt-generated, thus valid. This unfortunately isn't true as users can influence certain bits of the XML such as the disk image path which must be a full path. Thus if a user tries to invoke virsh as: $ virsh snapshot-create-as upstream --diskspec vda,file=relative.qcow2 error: XML document failed to validate against schema: Unable to validate doc against /path/to/domainsnapshot.rng Extra element disks in interleave Element domainsnapshot failed to validate content They get a rather useless error from the libxml2 RNG validator. With this fix applied, we get to the XML parser in libvirtd which has a more reasonable error: $ virsh snapshot-create-as upstream --diskspec vda,file=relative.qcow2 error: XML error: disk snapshot image path 'relative.qcow2' must be absolute Instead users can force validation of the XML generated by 'virsh snapshot-create-as' by passing the '--validate' flag. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/manpages/virsh.rst | 4 +++- tools/virsh-snapshot.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index bccda292a2..ad91cd6356 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -6916,7 +6916,7 @@ snapshot-create-as snapshot-create-as domain {[--print-xml] [--no-metadata] [--halt] [--reuse-external]} [name] - [description] [--disk-only [--quiesce]] [--atomic] + [description] [--disk-only [--quiesce]] [--atomic] [--validate] [[--live] [--memspec memspec]] [--diskspec] diskspec]... Create a snapshot for domain *domain* with the given <name> and @@ -6988,6 +6988,8 @@ For now, it is not possible to create snapshots in a domain that has checkpoints, although this restriction will be lifted in a future release. +Optionally, the *--validate* option can be passed to validate XML document +which is internally generated by this command against the internal RNG schema. snapshot-current ---------------- diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 2bc2cb7e23..2bec722c61 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -372,6 +372,10 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { .help = N_("require atomic operation") }, VIRSH_COMMON_OPT_LIVE(N_("take a live snapshot")), + {.name = "validate", + .type = VSH_OT_BOOL, + .help = N_("validate the XML against the schema"), + }, {.name = "memspec", .type = VSH_OT_STRING, .flags = VSH_OFLAG_REQ_OPT, @@ -394,7 +398,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) const char *desc = NULL; const char *memspec = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - unsigned int flags = VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE; + unsigned int flags = 0; const vshCmdOpt *opt = NULL; if (vshCommandOptBool(cmd, "no-metadata")) @@ -411,6 +415,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "validate")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 2.30.2

2 1

[libvirt PATCH v2 0/2] Fix some typos and spelling mistakes
by Tim Wiederhake 15 Apr '21

15 Apr '21

Found by codespell [1]. It would be nice to automate this, but I could not get codespell to also check code comments, and ran into a known issue [2] with codespell that prevents putting some terms with mixed letter cases on the skip list. [1] https://github.com/codespell-project/codespell [2] https://github.com/codespell-project/codespell/issues/1860 V1: https://listman.redhat.com/archives/libvir-list/2021-April/msg00562.html Changes since V1: * Added "Fixes:" to patch #1 commit message * Removed "crashes->crashers", "preferable->preferrable", and "purposedly->purposely" from patch #2 Tim Wiederhake (2): Fix spelling virlog: Remove stray "todo" in comment NEWS.rst | 10 +++++----- docs/formatdomain.rst | 6 +++--- docs/kbase/launch_security_sev.rst | 2 +- docs/manpages/virtproxyd.rst | 2 +- docs/pci-addresses.rst | 2 +- src/hyperv/hyperv_wmi.c | 2 +- src/libvirt-domain.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_domain.h | 4 ++-- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_snapshot.c | 4 ++-- src/util/virerror.c | 3 ++- src/util/virhash.c | 2 +- src/util/virlog.c | 2 +- src/util/virnetdev.c | 2 +- src/util/virpci.c | 2 +- src/util/virpci.h | 2 +- tests/meson.build | 2 +- tools/meson.build | 2 +- 21 files changed, 31 insertions(+), 30 deletions(-) -- 2.26.2

2 3

[PATCH] vbox: Make host CPU cache init non-fatal
by Charlie Sharpsteen 15 Apr '21

15 Apr '21

This commit updates the vbox driver to log a warning if the virCapabilitiesInitCaches function fails instead of treating failure as a fatal error. CPU cache initialization requires the sysfs filesystem in order to complete successfully and thus fails on platforms such as macOS. This commit is similar to ace6528ae19, which made the same change to the VMware driver. Signed-off-by: Charlie Sharpsteen <source(a)sharpsteen.net> --- src/vbox/vbox_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 5a5de85eab..933851346b 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -98,7 +98,7 @@ vboxCapsInit(void) return NULL; if (virCapabilitiesInitCaches(caps) < 0) - return NULL; + VIR_WARN("Failed to get host CPU cache info"); if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, -- 2.31.1

2 1

Broken link in documentation for networking
by Thomas Kettenbach 15 Apr '21

15 Apr '21

Hi, keeping it short: The anchor href for one example script seems to be outdated: In Section 1.4 Forwarding Incoming Connections >> Use the basic script below or see an "advanced" version, which can handle several different machines and port mappings here 'here' points to: http://git.zaytsev.net/?p=anubis-puppet.git;a=blob;f=manifests/files/puppet… However this seems to have moved to https://github.com/nest/anubis-puppet/blob/master/manifests/files/puppet/li… Please check if this is correct and update the broken link, if it is feasible. BR, Thomas

2 1

[libvirt PATCH 0/2] Always validate XML for (hypervisor-)cpu-compare
by Tim Wiederhake 15 Apr '21

15 Apr '21

XML schema validation for `virsh (hypervisor-)cpu-compare` has to be enabled explicitly by passing the `--validate` flag. Having invalid XML domain / cpu specification that appear to work can lead to hard to find problems down the line, when e.g. migration of VMs does not work as expected. This series fixes a bug in the validation code and logs the schema validation error to libvirtd's log file. User facing behaviour stays unchanged. See this conversation for more background: https://listman.redhat.com/archives/libvir-list/2021-March/msg01214.html Tim Wiederhake (2): virxml: Fix schema validation of individual nodes virCPUDefParseXML: Log schema validation errors src/conf/cpu_conf.c | 16 +++++++--------- src/util/virxml.c | 13 ++++++------- src/util/virxml.h | 1 - 3 files changed, 13 insertions(+), 17 deletions(-) -- 2.26.2

3 4

[PATCH v2 0/2] qemu: virtiofs: support <sandbox mode='chroot'/>
by Cole Robinson 15 Apr '21

15 Apr '21

Add support for virtiofsd -o sandbox=chroot|namespace v2: Add link to virtiofsd docs in libvirt docs validate the new field for qemu break up the patch Cole Robinson (2): conf: Introduce <sandbox mode='chroot'/> for <filesystem><binary> qemu: virtiofs: support <sandbox mode='chroot'/> docs/formatdomain.rst | 6 +++++ docs/schemas/domaincommon.rng | 12 ++++++++++ src/conf/domain_conf.c | 23 +++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_validate.c | 7 ++++++ src/qemu/qemu_virtiofs.c | 2 ++ .../vhost-user-fs-fd-memory.xml | 1 + 8 files changed, 62 insertions(+) -- 2.30.2

2 3

[libvirt PATCH v2 1/3] qemu: remove unnecessary null check
by Jonathon Jongsma 15 Apr '21

15 Apr '21

virMediatedDeviceGetSysfsPath() (via g_strdup_printf()) is guaranteed to return a non-NULL value, so remove the unnecessary checks for NULL. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> Reviewed-by: Laine Stump <laine(a)redhat.com> --- Changes in v2: - remove NULL checks from 2 additional locations src/qemu/qemu_command.c | 4 +--- src/util/virmdev.c | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 83bebdd2a8..fbe387253e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5138,9 +5138,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def, g_autofree char *mdevPath = NULL; const char *dev_str = NULL; - if (!(mdevPath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr))) - return NULL; - + mdevPath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr); dev_str = qemuBuildHostdevMdevModelTypeString(mdevsrc); if (!dev_str) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 7f4a499536..5f112c775f 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -140,9 +140,7 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) g_autoptr(virMediatedDevice) dev = NULL; g_autofree char *sysfspath = NULL; - if (!(sysfspath = virMediatedDeviceGetSysfsPath(uuidstr))) - return NULL; - + sysfspath = virMediatedDeviceGetSysfsPath(uuidstr); if (!virFileExists(sysfspath)) { virReportError(VIR_ERR_DEVICE_MISSING, _("mediated device '%s' not found"), uuidstr); @@ -208,9 +206,6 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) g_autofree char *iommu_path = NULL; g_autofree char *dev_path = virMediatedDeviceGetSysfsPath(uuidstr); - if (!dev_path) - return NULL; - iommu_path = g_strdup_printf("%s/iommu_group", dev_path); if (!virFileExists(iommu_path)) { -- 2.26.3

2 5

[libvirt PATCH 0/2] Fix some typos and spelling mistakes
by Tim Wiederhake 14 Apr '21

14 Apr '21

Found by codespell [1]. It would be nice to automate this, but I could not get codespell to also check code comments, and ran into a known issue [2] with codespell that prevents putting some terms with mixed letter cases on the skip list. [1] https://github.com/codespell-project/codespell [2] https://github.com/codespell-project/codespell/issues/1860 Tim Wiederhake (2): Fix spelling virlog: Remove stray "todo" in comment NEWS.rst | 12 ++++++------ docs/formatdomain.rst | 6 +++--- docs/glib-adoption.rst | 2 +- docs/kbase/launch_security_sev.rst | 2 +- docs/manpages/virtproxyd.rst | 2 +- docs/pci-addresses.rst | 2 +- src/hyperv/hyperv_wmi.c | 2 +- src/libvirt-domain.c | 2 +- src/libxl/libxl_logger.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_domain.h | 4 ++-- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_snapshot.c | 4 ++-- src/util/virerror.c | 3 ++- src/util/virhash.c | 2 +- src/util/virlog.c | 2 +- src/util/virnetdev.c | 2 +- src/util/virpci.c | 2 +- src/util/virpci.h | 2 +- tests/meson.build | 2 +- tools/meson.build | 2 +- 23 files changed, 34 insertions(+), 33 deletions(-) -- 2.26.2

2 5

[PATCH v2] qemu: Expose disk serial in virDomainGetGuestInfo()
by Michal Privoznik 14 Apr '21

14 Apr '21

When querying guest info via virDomainGetGuestInfo() the 'guest-get-disks' agent command is called. It may report disk serial number which we parse, but never report nor use for anything else. As it turns out, it may help management application find matching disk in their internals. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2021-April/msg00552.html diff to v1: - Filled virsh documentation - Documented that the param is optional and type of string docs/manpages/virsh.rst | 1 + src/libvirt-domain.c | 1 + src/qemu/qemu_driver.c | 19 ++++++++++++++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 813fb0bd60..bccda292a2 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -2787,6 +2787,7 @@ returned: * ``disk.<num>.partition`` - whether this is a partition or disk * ``disk.<num>.dependency.count`` - the number of device dependencies * ``disk.<num>.dependency.<num>.name`` - a dependency name +* ``disk.<num>.serial`` - optional disk serial number * ``disk.<num>.alias`` - the device alias of the disk (e.g. sda) * ``disk.<num>.guest_alias`` - optional alias assigned to the disk diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 83ff7df9fe..509b7a6d88 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12561,6 +12561,7 @@ virDomainSetVcpu(virDomainPtr domain, * hold the list of PVs, for LUKS encrypted volume this will * contain the disk where the volume is placed. (Linux) * "disk.<num>.dependency.<num>.name" - a dependency + * "disk.<num>.serial" - optional disk serial number (as string) * "disk.<num>.alias" - the device alias of the disk (e.g. sda) * "disk.<num>.guest_alias" - optional alias assigned to the disk, on Linux * this is a name assigned by device mapper diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90b5477f00..88ee9e5d5e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19951,15 +19951,24 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfo **info, } if (info[i]->address) { + qemuAgentDiskAddress *address = info[i]->address; virDomainDiskDef *diskdef = NULL; + if (address->serial) { + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "disk.%zu.serial", i); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, address->serial) < 0) + return; + } + /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, - &info[i]->address->pci_controller, - info[i]->address->ccw_addr, - info[i]->address->bus, - info[i]->address->target, - info[i]->address->unit); + &address->pci_controller, + address->ccw_addr, + address->bus, + address->target, + address->unit); if (diskdef) { g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, "disk.%zu.alias", i); -- 2.26.3

3 2

[PATCH] qemu: Expose disk serial in virDomainGetGuestInfo()
by Michal Privoznik 14 Apr '21

14 Apr '21

When querying guest info via virDomainGetGuestInfo() the 'guest-get-disks' agent command is called. It may report disk serial number which we parse, but never report nor use for anything else. As it turns out, it may help management application find matching disk in their internals. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 1 + src/qemu/qemu_driver.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 83ff7df9fe..1c244da650 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12561,6 +12561,7 @@ virDomainSetVcpu(virDomainPtr domain, * hold the list of PVs, for LUKS encrypted volume this will * contain the disk where the volume is placed. (Linux) * "disk.<num>.dependency.<num>.name" - a dependency + * "disk.<num>.serial" - disk serial number * "disk.<num>.alias" - the device alias of the disk (e.g. sda) * "disk.<num>.guest_alias" - optional alias assigned to the disk, on Linux * this is a name assigned by device mapper diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90b5477f00..88ee9e5d5e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19951,15 +19951,24 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfo **info, } if (info[i]->address) { + qemuAgentDiskAddress *address = info[i]->address; virDomainDiskDef *diskdef = NULL; + if (address->serial) { + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "disk.%zu.serial", i); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, address->serial) < 0) + return; + } + /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, - &info[i]->address->pci_controller, - info[i]->address->ccw_addr, - info[i]->address->bus, - info[i]->address->target, - info[i]->address->unit); + &address->pci_controller, + address->ccw_addr, + address->bus, + address->target, + address->unit); if (diskdef) { g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, "disk.%zu.alias", i); -- 2.26.3

2 2

[PATCH 00/15] news update since v6.9 to v7.0
by Han Han 14 Apr '21

14 Apr '21

Han Han (15): news: make SEV attrs 'cbitpos' & 'reducedPhysBits' optional news: support device stats collection for SR-IOV VF hostdev news: virt-aa-helper: allow guest to create hard links for mounted paths news: cpu_map: Add EPYC-Rome cpu model news: cpu: Support for XML validation in cpu comparison news: logging: allow max_len=0 to disable log rollover news: qemu: Set noqueue qdisc for TAP devices news: qemu: Introduce virtio free page reporting feature news: qemu: virtiofs can be used without NUMA nodes news: qemu: Add 'fmode' and 'dmode' options for 9pfs news: Introduce VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE flag news: Introduce "migrate_tls_force" qemu.conf option news: qemu: support kvm-poll-control performance hint news: cpu_map: Add Snowridge cpu model news: qemu: Add support for NFS disk protocol NEWS.rst | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) -- 2.31.1

3 22

[PATCH] libxl: Add debug statements
by Jim Fehlig 14 Apr '21

14 Apr '21

Over several years of debugging reports related to VM shutdown, destruction, and cleanup, I've found that logging of all events received from libxl and logging the entry of libxlDomainCleanup has proven useful. Add the these debug messages upstream to aid in future debugging. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index a25d65629a..917f6f1d81 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -648,6 +648,8 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) virDomainObj *vm = NULL; g_autoptr(libxlDriverConfig) cfg = NULL; + VIR_DEBUG("Received libxl event '%d' for domid '%d'", event->type, event->domid); + if (event->type != LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN && event->type != LIBXL_EVENT_TYPE_DOMAIN_DEATH) { VIR_INFO("Unhandled event type %d", event->type); @@ -844,6 +846,9 @@ libxlDomainCleanup(libxlDriverPrivate *driver, unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI; g_autoptr(virConnect) conn = NULL; + VIR_DEBUG("Cleaning up domain with id '%d' and name '%s'", + vm->def->id, vm->def->name); + #ifdef LIBXL_HAVE_PVUSB hostdev_flags |= VIR_HOSTDEV_SP_USB; #endif -- 2.30.2

2 1

[libvirt PATCH 0/2] fix cgroups BPF FDs leak
by Pavel Hrdina 14 Apr '21

14 Apr '21

Pavel Hrdina (2): vircgroupv2: properly free BPF prog and map FDs vircgroupv2devices: refactor virCgroupV2DevicesRemoveProg src/libvirt_private.syms | 2 +- src/util/vircgroupv2.c | 3 ++- src/util/vircgroupv2devices.c | 14 ++++---------- src/util/vircgroupv2devices.h | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) -- 2.30.2

3 4

[libvirt PATCH 1/3] nodedev: remove unnecessary null check
by Jonathon Jongsma 14 Apr '21

14 Apr '21

g_strdup_printf() is guaranteed to return a non-NULL value, so remove the unnecessary check for NULL. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/util/virmdev.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 7f4a499536..102eb2bf67 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -208,9 +208,6 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) g_autofree char *iommu_path = NULL; g_autofree char *dev_path = virMediatedDeviceGetSysfsPath(uuidstr); - if (!dev_path) - return NULL; - iommu_path = g_strdup_printf("%s/iommu_group", dev_path); if (!virFileExists(iommu_path)) { -- 2.26.3

3 6

[PATCH v2 0/3] nodedev: Follow up fixes
by Michal Privoznik 14 Apr '21

14 Apr '21

This is a v2 of: https://listman.redhat.com/archives/libvir-list/2021-April/msg00478.html Patches that were reviewed in v1 are merged. The rest is reworked per Erik's suggestions. Michal Prívozník (3): nodedev: Wait for device initialization in all public API callbacks nodedev: Mark device initialization complete even in case of an error nodedev: Don't fail device enumeration if MDEVCTL is missing src/node_device/node_device_driver.c | 24 ++++++++++++++++++++++++ src/node_device/node_device_udev.c | 3 +++ 2 files changed, 27 insertions(+) -- 2.26.3

2 6

[PATCH 0/6] nodedev: Follow up fixes
by Michal Privoznik 14 Apr '21

14 Apr '21

Yesterday I've posted patches that allowed me to start the daemon. But today I tried listing some nodedevs. It uncovered some dormant bugs we had (e.g. 3/6 and 5/6) and one new (6/6). Michal Prívozník (6): nodedev: Rename nodeDeviceWaitInit() nodedev: Wait for device initialization in nodeDeviceCreate() nodedev: Signal initCond with driver locked nodedev: Introduce nodeDeviceInitComplete() nodedev: Mark device initialization complete even in case of an error nodedev: Don't fail device enumeration if MDEVCTL is missing src/node_device/node_device_driver.c | 47 +++++++++++++++++++++------- src/node_device/node_device_driver.h | 2 ++ src/node_device/node_device_udev.c | 7 ++--- 3 files changed, 40 insertions(+), 16 deletions(-) -- 2.26.3

2 15

[PATCH 00/10] To make <transient/> disk sharable for qemu
by Masayoshi Mizuma 14 Apr '21

14 Apr '21

This patch series has two parts; the first part is trying to support for hotplugging disks with <transient/> option for qemu, and make the disk shareable when <shareable/> disk option is set as well. The second part is trying to make shareable the disks with <transient/> disk option which is described on the domain xml. The second part is marked as Work In Progress (WIP) because the design may be modified by the first part changes. Reference: - RFC PATCH: https://listman.redhat.com/archives/libvir-list/2021-January/msg01035.html Masayoshi Mizuma (10): qemu_hotplug: Add transient disk hotplug support qemu_hotplug: make transient disk sharable virsh: Add transient flag for disk hotplug tests/qemuhotplugtest: Add qemu caps flags to the argument of DO_TEST tests/qemumonitortestutils: Add JobStatusChange to update progress of blockdev-create tests/qemuhotplugtest: Add transient disk hotplug test WIP: qemu_snapshot: Add the guest name to the transient disk path WIP: qemu_hotplug: Add asynJob to disk hotplug utilities WIP: qemu_hotplug: make transient disk sharable WIP: tests/qemuxml2argvdata: Add shareable transient disk test src/qemu/qemu_command.c | 11 + src/qemu/qemu_hotplug.c | 262 ++++++++++++++++-- src/qemu/qemu_hotplug.h | 3 + src/qemu/qemu_process.c | 23 +- src/qemu/qemu_process.h | 7 + src/qemu/qemu_snapshot.c | 12 +- src/qemu/qemu_validate.c | 21 +- tests/qemuhotplugtest.c | 199 ++++++++----- .../qemuhotplug-disk-scsi-transient.xml | 7 + .../qemuhotplug-disk-virtio-transient.xml | 7 + ...lug-transient-live+disk-scsi-transient.xml | 65 +++++ ...g-transient-live+disk-virtio-transient.xml | 65 +++++ .../qemuhotplug-transient-live.xml | 51 ++++ tests/qemumonitortestutils.c | 22 +- ...isk-transient-shareable.x86_64-latest.args | 41 +++ .../disk-transient-shareable.xml | 26 ++ tests/qemuxml2argvtest.c | 1 + tools/virsh-domain.c | 8 + 18 files changed, 738 insertions(+), 93 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-transient.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-disk-virtio-transient.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-transient-live+disk-scsi-transient.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-transient-live+disk-virtio-transient.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-transient-live.xml create mode 100644 tests/qemuxml2argvdata/disk-transient-shareable.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-transient-shareable.xml -- 2.27.0

2 12

[PATCH resend] lib: Drop internal virXXXPtr typedefs
by Michal Privoznik 13 Apr '21

13 Apr '21

2 2

[PATCH resend] virfile: Replace AbsPath judgement method with g_path_is_absolute()
by Luke Yue 13 Apr '21

13 Apr '21

The g_path_is_absolute() considers more situations than just a simply "path[0] == '/'". Related issue: https://gitlab.com/libvirt/libvirt/-/issues/12 Signed-off-by: Luke Yue <lukedyue(a)gmail.com> --- src/util/virfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 93fac200cc..3311eaff3d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3153,7 +3153,7 @@ virFileOpenTty(int *ttyprimary G_GNUC_UNUSED, int virFileAbsPath(const char *path, char **abspath) { - if (path[0] == '/') { + if (g_path_is_absolute(path)) { *abspath = g_strdup(path); } else { g_autofree char *buf = g_get_current_dir(); -- 2.31.1

2 4

[libvirt PATCH] qemu_conf: properly set 'deprecation_behavior' default value
by Pavel Hrdina 13 Apr '21

13 Apr '21

The comment for that option states that the default value is 'none' but it was not set by the code. Fixes: 700450449377be4bf923e91d00f8fe8cf0975f66 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 77fd7f6df7..68b086be54 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -295,6 +295,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged, &cfg->nfirmwares) < 0) return NULL; + cfg->deprecationBehavior = g_strdup("none"); + return g_steal_pointer(&cfg); } -- 2.30.2

3 7

[libvirt PATCH v2] Remove references to deleted Makefile.am
by Tim Wiederhake 13 Apr '21

13 Apr '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/admin/libvirt_admin_private.syms | 2 +- src/libvirt_private.syms | 2 +- src/libvirt_remote.syms | 2 +- src/vbox/vbox_tmpl.c | 4 ---- tests/testutils.h | 4 ++-- tools/wireshark/README.rst | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/admin/libvirt_admin_private.syms b/src/admin/libvirt_admin_private.syms index 157a45341e..d9f38a7155 100644 --- a/src/admin/libvirt_admin_private.syms +++ b/src/admin/libvirt_admin_private.syms @@ -1,6 +1,6 @@ # # General private symbols for libvirt_admin. Add symbols here, and see -# Makefile.am for more details. +# src/admin/meson.build for more details. # # Keep this file sorted by header name, then by symbols with each header. # diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 119768496b..b3f9c9681a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1,5 +1,5 @@ # -# General private symbols. Add symbols here, and see Makefile.am for +# General private symbols. Add symbols here, and see src/meson.build for # more details. # # Keep this file sorted by header name, then by symbols with each header. diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 605271bcb2..11c9e2cb73 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -1,6 +1,6 @@ # # Private symbols used in RPC operations. Add symbols here, and see -# Makefile.am for more details. +# src/remote/meson.build for more details. # # Keep this file sorted by header name, then by symbols with each header. # diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d37ffd9a6b..182d4c6b75 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1,10 +1,6 @@ /** @file vbox_tmpl.c * Template File to support multiple versions of VirtualBox * at runtime :). - * - * IMPORTANT: - * Please dont include this file in the src/Makefile.am, it - * is automatically include by other files. */ /* diff --git a/tests/testutils.h b/tests/testutils.h index da8ca2dea5..36154e7077 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -30,9 +30,9 @@ #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ #define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */ -/* Makefile.am provides these two definitions */ +/* Meson provides these two definitions */ #if !defined(abs_srcdir) || !defined(abs_builddir) -# error Fix Makefile.am +# error Fix build system #endif extern virArch virTestHostArch; diff --git a/tools/wireshark/README.rst b/tools/wireshark/README.rst index 8407557748..48296a11ce 100644 --- a/tools/wireshark/README.rst +++ b/tools/wireshark/README.rst @@ -24,8 +24,7 @@ Then dissector will compiled with libvirt itself. Add/Remove protocol from dissector's support -------------------------------------------- -Modify variable ``WS_DISSECTOR_PROTO_FILES`` -in ``tools/wireshark/src/Makefile.am``. +Modify argument ``input`` in ``tools/wireshark/src/libvirt/meson.build``. Changing installation directory ------------------------------- -- 2.26.2

2 1

[libvirt PATCH 00/11] Some additional cleanups to mdev support
by Jonathon Jongsma 13 Apr '21

13 Apr '21

Erik recommended several changes to the mdev series that was just merged and suggested to address them in a follow-up patch series. They're mostly related to simplifying the testing, and shouldn't actually change any behavior (aside from switching to using the long commandline options when executing mdevctl). Erik Skultety (4): nodedev: driver: Swap virMdevctlStart and virMdevctlCreate nodedev: driver: Introduce internal mdevctl commands enum nodedev: driver: Create a generic mdevctl command translator tests: nodedev: Make the mdevctl test function and helper generic Jonathon Jongsma (7): nodedev: don't log error in nodeDeviceFindAddressByName() nodedev: avoid use of VIR_ERR_NO_* errors internally tests: nodedev: switch all test macros to accept a filename nodedev: Switch to using long options for mdevctl nodedev: Remove GetMdevctl*Command() wrappers tests: nodedev: simplify test macros tests: nodedev: remove unused variable src/node_device/node_device_driver.c | 181 ++++++++--------- src/node_device/node_device_driver.h | 43 ++-- ...19_36ea_4111_8f0a_8c9a70e21366-create.argv | 2 + ...9_36ea_4111_8f0a_8c9a70e21366-create.json} | 0 ...19_36ea_4111_8f0a_8c9a70e21366-define.argv | 2 +- ...019_36ea_4111_8f0a_8c9a70e21366-start.argv | 3 +- ...d019_36ea_4111_8f0a_8c9a70e21366-stop.argv | 1 + ..._36ea_4111_8f0a_8c9a70e21366-undefine.argv | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-create.argv | 1 + ...9_495e_4243_ad9f_beb3f14c23d9-create.json} | 0 ...39_495e_4243_ad9f_beb3f14c23d9-define.argv | 2 +- ...d39_495e_4243_ad9f_beb3f14c23d9-start.argv | 1 - ...16_1ca8_49ac_b176_871d16c13076-create.argv | 1 + ...6_1ca8_49ac_b176_871d16c13076-create.json} | 0 ...16_1ca8_49ac_b176_871d16c13076-define.argv | 2 +- ...916_1ca8_49ac_b176_871d16c13076-start.argv | 1 - tests/nodedevmdevctldata/mdevctl-create.argv | 1 - tests/nodedevmdevctldata/mdevctl-stop.argv | 1 - .../nodedevmdevctldata/mdevctl-undefine.argv | 1 - tests/nodedevmdevctltest.c | 192 ++++++------------ 20 files changed, 174 insertions(+), 262 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-create.argv rename tests/nodedevmdevctldata/{mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-s= tart.json =3D> mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-create.json} (100%) create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-stop.argv create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-undefine.argv create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-create.argv rename tests/nodedevmdevctldata/{mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-s= tart.json =3D> mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-create.json} (100%) delete mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-start.argv create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-create.argv rename tests/nodedevmdevctldata/{mdev_fedc4916_1ca8_49ac_b176_871d16c13076-s= tart.json =3D> mdev_fedc4916_1ca8_49ac_b176_871d16c13076-create.json} (100%) delete mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-start.argv delete mode 100644 tests/nodedevmdevctldata/mdevctl-create.argv delete mode 100644 tests/nodedevmdevctldata/mdevctl-stop.argv delete mode 100644 tests/nodedevmdevctldata/mdevctl-undefine.argv --=20 2.26.3

2 12

[libvirt PATCH v2] hyperv: Handle long CPU models better.
by Dawid Zamirski 13 Apr '21

13 Apr '21

The existing driver code strips down CPU model strings returned by Hyper-V hosts so they fit into the 32 character limit of the virNodeInfo.model field. However, this did not work well for my AMD CPU for which Hyper-V returns the string "AMD FX(tm)-8350 Eight-Core Processor". Therefore, this patch improves that code block to be case insensitive (so that the "(tm)" part is removed) and additionally removes the trailing " Processor" suffix. While this change alone worked for me, I have also added a line to terminate the stripped down string at 32nd character to make sure that any other CPU string we did not come across yet won't trigger the error - the virNodeInfo has other useful info that is arguably more important than CPU model string, e.g. core count, or memory size Signed-off-by: Dawid Zamirski <dzrudy(a)gmail.com> Reviewed-by: Neal Gompa <ngompa13(a)gmail.com> --- Changes since v1: * Added missing Signed-off-by * Add Reviewed-by * Reworded commit message src/hyperv/hyperv_driver.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 17f5be1f0d..6e03aa4f18 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1948,14 +1948,14 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) if (STRPREFIX(tmp, " ")) { memmove(tmp, tmp + 1, strlen(tmp + 1) + 1); continue; - } else if (STRPREFIX(tmp, "(R)") || STRPREFIX(tmp, "(C)")) { + } else if (STRCASEPREFIX(tmp, "(R)") || STRCASEPREFIX(tmp, "(C)")) { memmove(tmp, tmp + 3, strlen(tmp + 3) + 1); continue; - } else if (STRPREFIX(tmp, "(TM)")) { + } else if (STRCASEPREFIX(tmp, "(TM)")) { memmove(tmp, tmp + 4, strlen(tmp + 4) + 1); continue; - } else if (STRPREFIX(tmp, " @ ")) { - /* Remove " @ X.YZGHz" from the end. */ + } else if (STRPREFIX(tmp, " @ ") || STRPREFIX(tmp, " Processor")) { + /* Remove " @ X.YZGHz" or " Processor" from the end. */ *tmp = '\0'; break; } @@ -1963,13 +1963,12 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) ++tmp; } + /* trim whatever is left to 32 characters - better this than nothing */ + processorList->data->Name[31] = '\0'; + /* Fill struct */ - if (virStrcpyStatic(info->model, processorList->data->Name) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU model %s too long for destination"), - processorList->data->Name); + if (virStrcpyStatic(info->model, processorList->data->Name) < 0) return -1; - } info->memory = computerSystem->data->TotalPhysicalMemory / 1024; /* byte to kilobyte */ info->mhz = processorList->data->MaxClockSpeed; -- 2.31.1

1 0

[libvirt PATCH] Remove references to deleted Makefile.am
by Tim Wiederhake 12 Apr '21

12 Apr '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/admin/libvirt_admin_private.syms | 2 +- src/libvirt_private.syms | 2 +- src/libvirt_remote.syms | 2 +- src/vbox/vbox_tmpl.c | 4 ---- tests/testutils.h | 4 ++-- tools/wireshark/README.rst | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/admin/libvirt_admin_private.syms b/src/admin/libvirt_admin_private.syms index 157a45341e..d9f38a7155 100644 --- a/src/admin/libvirt_admin_private.syms +++ b/src/admin/libvirt_admin_private.syms @@ -1,6 +1,6 @@ # # General private symbols for libvirt_admin. Add symbols here, and see -# Makefile.am for more details. +# src/admin/meson.build for more details. # # Keep this file sorted by header name, then by symbols with each header. # diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cb9fe7c80a..123357b761 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1,5 +1,5 @@ # -# General private symbols. Add symbols here, and see Makefile.am for +# General private symbols. Add symbols here, and see src/meson.build for # more details. # # Keep this file sorted by header name, then by symbols with each header. diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 605271bcb2..11c9e2cb73 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -1,6 +1,6 @@ # # Private symbols used in RPC operations. Add symbols here, and see -# Makefile.am for more details. +# src/remote/meson.build for more details. # # Keep this file sorted by header name, then by symbols with each header. # diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d37ffd9a6b..182d4c6b75 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1,10 +1,6 @@ /** @file vbox_tmpl.c * Template File to support multiple versions of VirtualBox * at runtime :). - * - * IMPORTANT: - * Please dont include this file in the src/Makefile.am, it - * is automatically include by other files. */ /* diff --git a/tests/testutils.h b/tests/testutils.h index ff5c98a078..482a6bdc0e 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -30,9 +30,9 @@ #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ #define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */ -/* Makefile.am provides these two definitions */ +/* Meson provides these two definitions */ #if !defined(abs_srcdir) || !defined(abs_builddir) -# error Fix Makefile.am +# error Fix build system #endif extern virArch virTestHostArch; diff --git a/tools/wireshark/README.rst b/tools/wireshark/README.rst index 8407557748..644818fb85 100644 --- a/tools/wireshark/README.rst +++ b/tools/wireshark/README.rst @@ -24,8 +24,7 @@ Then dissector will compiled with libvirt itself. Add/Remove protocol from dissector's support -------------------------------------------- -Modify variable ``WS_DISSECTOR_PROTO_FILES`` -in ``tools/wireshark/src/Makefile.am``. +Modify variable ``input`` in ``tools/wireshark/src/libvirt/meson.build``. Changing installation directory ------------------------------- -- 2.26.2

2 1

[PATCH 0/2] qemu: blockjob: Fix two issues with block pull job finishing
by Peter Krempa 12 Apr '21

12 Apr '21

Peter Krempa (2): qemuBlockJobProcessEventCompletedPull: Avoid dangling pointer after blockpull qemuBlockJobProcessEventCompletedPull: Add backingStore terminators if base is NULL src/qemu/qemu_blockjob.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) -- 2.30.2

2 4

[PATCH 0/5] nodedev: Couple of fixes after last mdevctl patches
by Michal Privoznik 12 Apr '21

12 Apr '21

Recently, the nodedev driver gained ability to define (some type of) devices. However, it uncovered some dormant bugs we had (patches 2/5 and 3/5) and also introduced some (patches 1/5 and 5/5). I've came across these problems because I don't have /etc/mdevctl.d on my machine. Michal Prívozník (5): nodedev: Unlock @priv if initialization of mdevctlMonitors fails nodedev: Lock @priv sooner nodedev: Don't join not spawned threads nodedev: Separate mdevctl monitor setup into a function nodedev: Only set up mdevctl monitors if mdevctl.d exist src/node_device/node_device_udev.c | 75 ++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 24 deletions(-) -- 2.26.3

2 7

[PATCH] bhyve: Fix declaration of 'params' in 'bhyveParsePCIFbuf'
by Peter Krempa 12 Apr '21

12 Apr '21

In commit ad80bba90a3 I've mistakenly didn't delete '**' from the variable declaration when converting it to 'GStrv' Fixes: ad80bba90a3 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- The patch will be pushed under the build-breaker and trivial rules once the pipeline passes: https://gitlab.com/pipo.sk/libvirt/-/pipelines/285158773 src/bhyve/bhyve_parse_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index d86d37b697..2783119a7b 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -558,7 +558,7 @@ bhyveParsePCIFbuf(virDomainDefPtr def, virDomainVideoDefPtr video = NULL; virDomainGraphicsDefPtr graphics = NULL; - g_auto(GStrv) **params = NULL; + g_auto(GStrv) params = NULL; GStrv next; if (!(video = virDomainVideoDefNew(xmlopt))) -- 2.30.2

2 1

[RFC PATCH 00/43] qemu: Remove support for qemu-1.5 - qemu-2.10 and clean up capabilities
by Peter Krempa 12 Apr '21

12 Apr '21

May 7, 2021 is the 2nd anniversary of release of rhel-8, which means we no longer have to support qemu-1.5. Remove the capabilities and test data for the versions we no longer care about and clean up some capabilities related stuff: - remove code for QEMU_CAPS_DEVICE_VIDEO_PRIMARY - remove checking for QEMU_CAPS_QUERY_QMP_SCHEMA since all versions now support it This is also a good opportunity to clean up few things regarding the capabilties test data, namely call 'query-qmp-schema' before 'query-commands' to prepare to retire query-commands. This series is heavily truncated since there were massive (27MiB) patches resulting from some of the mechanical (and generated) changes and also depends on my previous command line wrapping cleanup. Fetch the full version at: git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprec-2 The cleanups in patches 41, 42, and the massive move of commands in patch 43 was done using a tool based on pieces of our code which I've uploaded to: https://gitlab.com/pipo.sk/libvirt/-/commits/qemu-capabilities-tool The tool may come in handy for other things too in the future as it allows programatic modification of the capability replies files. Peter Krempa (43): docs/platforms: Drop separate link to qemu-kvm on repology.org qemuxml2xmltest: testInfoSetPaths: Remove return value qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs fails qemu: Formally deprecate support for qemu < 2.11 NEWS: Mention that minimum supported qemu version was bumped to 2.11 qemuxml2argvtest: Remove versioned tests for qemu < 2.11 [fixup] qemuxml2argvdata: Remove unused output files qemuxml2xmltest: Remove versioned tests for qemu < 2.11 [fixup] qemuxml2xmldata: Remove unused output files qemucapabilitiesdata: Drop capability test data for qemu < 2.11 virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument qemuBuildDeviceAddressStr: Remove unused 'qemuCaps' virQEMUCapsInitProcessCaps: Remove obsolete version checks virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing qemuxml2argvtest: Parse 'arch' from XML early qemuxml2xmltest: Always include basic set of capabilities qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to virQEMUCapsInitQMPBasicArch qemuxml2argvtest: Remove negative test case 'pseries-features-htp-resize' qemu: capabilities: Move setting of PPC specific flags to virQEMUCapsInitQMPBasicArch qemuxml2argvtest: Remove negative test for gic v3/host qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to virQEMUCapsInitQMPBasicArch qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq' qemuxml2argvtest: Remove tests for absence of QEMU_CAPS_DEVICE_VIDEO_PRIMARY qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to virQEMUCapsInitQMPBasicArch [fixup] Fix test fallout in tests/qemuxml2argvdata [fixup] Fix test fallout in tests/qemuxml2xmloutdata qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from tests qemu: capabilities: Move rest of always present caps to virQEMUCapsInitQMPArch qemuhotplugtest: Add also always-present capabilities qemu: command: Remove legacy '-vga' commandline formatter qemu_domain_address: Drop compatibility with pre-device vga specification for i440fx qemu_domain_address: Drop compatibility with pre-device vga specification for q35 qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA qemu: monitor: Remove qemuMonitorGetEvents qemu: monitor: Remove qemuMonitorSupportsActiveCommit tests: qemucapabilitiesdata: Fix formatting of manually added hunk tests: qemucapabilitiesdata: Fix wrong command identifier in caps_4.0.0.riscv64.replies qemu: capabilities: Probe QMP schema before probing commands NEWS.rst | 7 + docs/drvqemu.rst | 2 +- docs/platforms.rst | 2 - src/qemu/qemu_alias.c | 5 +- src/qemu/qemu_alias.h | 1 - src/qemu/qemu_capabilities.c | 237 +- src/qemu/qemu_capabilities.h | 7 +- src/qemu/qemu_command.c | 190 +- src/qemu/qemu_domain_address.c | 82 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_monitor.c | 23 - src/qemu/qemu_monitor.h | 3 - src/qemu/qemu_monitor_json.c | 90 - src/qemu/qemu_monitor_json.h | 6 - .../caps_1.5.3.x86_64.replies | 3327 -- .../caps_1.5.3.x86_64.xml | 176 - .../caps_1.6.0.x86_64.replies | 3298 -- .../caps_1.6.0.x86_64.xml | 185 - .../caps_1.7.0.x86_64.replies | 3521 -- .../caps_1.7.0.x86_64.xml | 191 - .../caps_2.1.1.x86_64.replies | 4041 -- .../caps_2.1.1.x86_64.xml | 217 - .../caps_2.10.0.aarch64.replies | 16975 ------ .../caps_2.10.0.aarch64.xml | 325 - .../caps_2.10.0.ppc64.replies | 20756 ------- .../caps_2.10.0.ppc64.xml | 1067 - .../caps_2.10.0.s390x.replies | 16608 ------ .../caps_2.10.0.s390x.xml | 1277 - .../caps_2.10.0.x86_64.replies | 19329 ------- .../caps_2.10.0.x86_64.xml | 997 - .../caps_2.11.0.s390x.replies | 24392 ++++---- .../caps_2.11.0.s390x.xml | 3 - .../caps_2.11.0.x86_64.replies | 25712 ++++----- .../caps_2.11.0.x86_64.xml | 3 - .../caps_2.12.0.aarch64.replies | 29188 +++++----- .../caps_2.12.0.aarch64.xml | 2 - .../caps_2.12.0.ppc64.replies | 31502 +++++------ .../caps_2.12.0.ppc64.xml | 3 - .../caps_2.12.0.s390x.replies | 27224 ++++----- .../caps_2.12.0.s390x.xml | 3 - .../caps_2.12.0.x86_64.replies | 30352 +++++----- .../caps_2.12.0.x86_64.xml | 3 - .../caps_2.4.0.x86_64.replies | 4868 -- .../caps_2.4.0.x86_64.xml | 263 - .../caps_2.5.0.x86_64.replies | 12506 ----- .../caps_2.5.0.x86_64.xml | 273 - .../caps_2.6.0.aarch64.replies | 13317 ----- .../caps_2.6.0.aarch64.xml | 283 - .../caps_2.6.0.ppc64.replies | 15692 ------ .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1026 - .../caps_2.6.0.x86_64.replies | 13061 ----- .../caps_2.6.0.x86_64.xml | 273 - .../caps_2.7.0.s390x.replies | 12137 ---- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 113 - .../caps_2.7.0.x86_64.replies | 13680 ----- .../caps_2.7.0.x86_64.xml | 284 - .../caps_2.8.0.s390x.replies | 13553 ----- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 265 - .../caps_2.8.0.x86_64.replies | 14594 ----- .../caps_2.8.0.x86_64.xml | 419 - .../caps_2.9.0.ppc64.replies | 19514 ------- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1056 - .../caps_2.9.0.s390x.replies | 14607 ----- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 273 - .../caps_2.9.0.x86_64.replies | 18290 ------ .../caps_2.9.0.x86_64.xml | 910 - .../caps_3.0.0.ppc64.replies | 32872 +++++------ .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 - .../caps_3.0.0.riscv32.replies | 21760 ++++---- .../caps_3.0.0.riscv32.xml | 3 - .../caps_3.0.0.riscv64.replies | 21760 ++++---- .../caps_3.0.0.riscv64.xml | 3 - .../caps_3.0.0.s390x.replies | 28066 +++++----- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 - .../caps_3.0.0.x86_64.replies | 31463 ++++++----- .../caps_3.0.0.x86_64.xml | 3 - .../caps_3.1.0.ppc64.replies | 32440 +++++------ .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 - .../caps_3.1.0.x86_64.replies | 32304 +++++------ .../caps_3.1.0.x86_64.xml | 3 - .../caps_4.0.0.aarch64.replies | 31294 +++++------ .../caps_4.0.0.aarch64.xml | 2 - .../caps_4.0.0.ppc64.replies | 33422 +++++------ .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 - .../caps_4.0.0.riscv32.replies | 29062 +++++----- .../caps_4.0.0.riscv32.xml | 3 - .../caps_4.0.0.riscv64.replies | 29062 +++++----- .../caps_4.0.0.riscv64.xml | 3 - .../caps_4.0.0.s390x.replies | 29542 +++++----- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 - .../caps_4.0.0.x86_64.replies | 32932 +++++------ .../caps_4.0.0.x86_64.xml | 3 - .../caps_4.1.0.x86_64.replies | 34454 ++++++------ .../caps_4.1.0.x86_64.xml | 3 - .../caps_4.2.0.aarch64.replies | 33732 ++++++------ .../caps_4.2.0.aarch64.xml | 2 - .../caps_4.2.0.ppc64.replies | 34230 ++++++------ .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 - .../caps_4.2.0.s390x.replies | 31044 +++++------ .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 - .../caps_4.2.0.x86_64.replies | 36818 ++++++------- .../caps_4.2.0.x86_64.xml | 3 - .../caps_5.0.0.aarch64.replies | 36336 ++++++------ .../caps_5.0.0.aarch64.xml | 2 - .../caps_5.0.0.ppc64.replies | 37738 ++++++------- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 - .../caps_5.0.0.riscv64.replies | 32784 +++++------ .../caps_5.0.0.riscv64.xml | 3 - .../caps_5.0.0.x86_64.replies | 39726 ++++++------- .../caps_5.0.0.x86_64.xml | 3 - .../caps_5.1.0.sparc.replies | 25244 ++++----- .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 3 - .../caps_5.1.0.x86_64.replies | 41066 +++++++------- .../caps_5.1.0.x86_64.xml | 3 - .../caps_5.2.0.aarch64.replies | 38490 ++++++------- .../caps_5.2.0.aarch64.xml | 2 - .../caps_5.2.0.ppc64.replies | 40514 +++++++------- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 3 - .../caps_5.2.0.riscv64.replies | 34452 ++++++------ .../caps_5.2.0.riscv64.xml | 3 - .../caps_5.2.0.s390x.replies | 35480 ++++++------ .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 - .../caps_5.2.0.x86_64.replies | 42432 +++++++------- .../caps_5.2.0.x86_64.xml | 3 - .../caps_6.0.0.x86_64.replies | 45838 ++++++++-------- .../caps_6.0.0.x86_64.xml | 3 - tests/qemuhotplugtest.c | 5 + .../ppc64-modern-bulk-result-conf.xml | 2 +- .../ppc64-modern-bulk-result-live.xml | 2 +- .../ppc64-modern-individual-result-conf.xml | 2 +- .../ppc64-modern-individual-result-live.xml | 2 +- .../x86-modern-bulk-result-conf.xml | 2 +- .../x86-modern-bulk-result-live.xml | 2 +- .../x86-modern-individual-add-result-conf.xml | 2 +- .../x86-modern-individual-add-result-live.xml | 2 +- .../x86-old-bulk-result-conf.xml | 2 +- .../x86-old-bulk-result-live.xml | 2 +- .../qemuhotplug-ivshmem-doorbell-detach.xml | 2 +- .../qemuhotplug-ivshmem-plain-detach.xml | 2 +- .../qemuhotplug-watchdog-full.xml | 2 +- .../qemuhotplug-watchdog-user-alias-full.xml | 2 +- .../qemuhotplug-base-live+disk-virtio.xml | 2 +- .../qemuhotplug-base-live+hostdev-pci.xml | 2 +- .../qemuhotplug-base-live+interface-vdpa.xml | 2 +- ...qemuhotplug-base-live+ivshmem-doorbell.xml | 4 +- .../qemuhotplug-base-live+ivshmem-plain.xml | 2 +- ...uhotplug-base-live+watchdog-user-alias.xml | 2 +- .../qemuhotplug-base-live+watchdog.xml | 2 +- ...hotplug-base-with-scsi-controller-live.xml | 8 +- ...thout-scsi-controller-live+disk-scsi-2.xml | 8 +- tests/qemumonitorjsontest.c | 44 - .../aarch64-aavmf-virtio-mmio.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- .../aarch64-cpu-passthrough.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.err | 1 - tests/qemuxml2argvdata/aarch64-gic-v3.err | 1 - .../aarch64-noacpi-nouefi.args | 2 +- .../qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +- .../qemuxml2argvdata/aarch64-pci-serial.args | 2 +- .../aarch64-traditional-pci.args | 2 +- .../aarch64-usb-controller-nec-xhci.args | 2 +- .../aarch64-usb-controller-qemu-xhci.args | 2 +- .../aarch64-video-default.args | 2 +- .../aarch64-video-virtio-gpu-pci.args | 2 +- .../aarch64-virt-2.6-virtio-pci-default.args | 2 +- .../aarch64-virt-default-nic.args | 2 +- .../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +- .../aarch64-virtio-pci-default.args | 2 +- .../aarch64-virtio-pci-manual-addresses.args | 2 +- tests/qemuxml2argvdata/audio-default-sdl.args | 2 +- .../qemuxml2argvdata/audio-default-spice.args | 2 +- tests/qemuxml2argvdata/audio-default-vnc.args | 2 +- tests/qemuxml2argvdata/autoindex.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.args | 2 +- .../balloon-mmio-deflate.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/boot-complex.args | 8 +- .../boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- .../boot-menu-enable-with-timeout.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 6 +- tests/qemuxml2argvdata/boot-strict.args | 8 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- .../channel-unix-guestfwd.x86_64-2.5.0.args | 33 - .../qemuxml2argvdata/channel-virtio-auto.args | 6 +- .../channel-virtio-autoadd.args | 6 +- .../channel-virtio-autoassign.args | 4 +- .../channel-virtio-default.args | 4 +- .../channel-virtio-state.args | 2 +- .../qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 4 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- .../clock-localtime-basis-localtime.args | 2 +- .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- .../qemuxml2argvdata/console-compat-auto.args | 2 +- .../console-compat-chardev.args | 2 +- .../qemuxml2argvdata/console-virtio-many.args | 4 +- .../console-virtio-unix.x86_64-2.5.0.args | 34 - tests/qemuxml2argvdata/console-virtio.args | 4 +- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable2.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-cache-emulate-l3.args | 2 +- .../cpu-cache-passthrough.args | 2 +- .../cpu-cache-passthrough2.args | 2 +- .../cpu-check-default-none.args | 2 +- .../cpu-check-default-none2.args | 2 +- .../cpu-check-default-partial.args | 2 +- .../cpu-check-default-partial2.args | 2 +- tests/qemuxml2argvdata/cpu-check-none.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- .../cpu-host-passthrough.args | 2 +- .../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- .../cpu-no-removed-features.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 2 +- .../cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../qemuxml2argvdata/cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/cputune.args | 2 +- tests/qemuxml2argvdata/debug-threads.args | 2 +- .../default-kvm-host-arch.args | 2 +- .../default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/disk-aio.args | 2 +- tests/qemuxml2argvdata/disk-blockio.args | 2 +- .../disk-cache.x86_64-1.5.3.args | 38 - .../disk-cache.x86_64-2.6.0.args | 40 - .../disk-cache.x86_64-2.7.0.args | 40 - .../qemuxml2argvdata/disk-cdrom-network.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 4 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +- tests/qemuxml2argvdata/disk-geometry.args | 2 +- tests/qemuxml2argvdata/disk-ide-split.args | 2 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 4 +- .../disk-network-gluster.args | 6 +- .../disk-network-iscsi-modern.args | 10 +- .../qemuxml2argvdata/disk-network-iscsi.args | 10 +- tests/qemuxml2argvdata/disk-network-nbd.args | 10 +- .../disk-network-rbd.x86_64-2.5.0.args | 40 - .../disk-network-sheepdog.args | 2 +- .../disk-network-source-auth.args | 6 +- tests/qemuxml2argvdata/disk-order.args | 6 +- .../qemuxml2argvdata/disk-readonly-disk.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.args | 4 +- .../disk-scsi-device-auto.x86_64-1.5.3.args | 33 - .../disk-scsi-disk-split.args | 10 +- .../qemuxml2argvdata/disk-scsi-disk-vpd.args | 6 +- .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 6 +- .../disk-scsi-lun-passthrough.args | 6 +- tests/qemuxml2argvdata/disk-serial.args | 2 +- tests/qemuxml2argvdata/disk-snapshot.args | 2 +- .../disk-source-pool-mode.args | 2 +- tests/qemuxml2argvdata/disk-source-pool.args | 4 +- .../disk-usb-device-removable.args | 2 +- tests/qemuxml2argvdata/disk-usb-device.args | 2 +- tests/qemuxml2argvdata/disk-virtio.args | 4 +- tests/qemuxml2argvdata/encrypted-disk.args | 2 +- .../eoi-disabled.x86_64-2.7.0.args | 30 - .../eoi-enabled.x86_64-2.7.0.args | 30 - tests/qemuxml2argvdata/event_idx.args | 4 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/fs9p.args | 6 +- .../graphics-egl-headless.args | 2 +- .../graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- .../graphics-spice-agent-file-xfer.args | 4 +- .../graphics-spice-agentmouse.args | 2 +- .../graphics-spice-auto-socket-cfg.args | 2 +- .../graphics-spice-auto-socket.args | 2 +- .../graphics-spice-compression.args | 4 +- .../graphics-spice-egl-headless.args | 4 +- .../graphics-spice-no-args.args | 2 +- .../graphics-spice-qxl-vga.args | 4 +- .../qemuxml2argvdata/graphics-spice-sasl.args | 4 +- .../graphics-spice-socket.args | 2 +- .../graphics-spice-timeout.args | 2 +- .../graphics-spice-usb-redir.args | 2 +- tests/qemuxml2argvdata/graphics-spice.args | 4 +- .../graphics-vnc-auto-socket-cfg.args | 2 +- .../graphics-vnc-auto-socket.args | 2 +- .../graphics-vnc-egl-headless.args | 2 +- .../graphics-vnc-no-listen-attr.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +- .../qemuxml2argvdata/graphics-vnc-policy.args | 2 +- .../graphics-vnc-remove-generated-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +- .../graphics-vnc-socket-new-cmdline.args | 2 +- .../qemuxml2argvdata/graphics-vnc-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +- .../graphics-vnc-tls.x86_64-2.4.0.args | 30 - .../graphics-vnc-websocket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc.args | 2 +- .../hostdev-mdev-precreated.args | 2 +- .../hostdev-pci-address-device.args | 4 +- .../hostdev-pci-address-unassigned.args | 8 +- .../qemuxml2argvdata/hostdev-pci-address.args | 2 +- .../hostdev-pci-multifunction.args | 16 +- .../hostdev-scsi-lsi.x86_64-2.8.0.args | 45 - .../hostdev-scsi-vhost-scsi-pci.args | 2 +- .../hostdev-scsi-vhost-scsi-pcie.args | 4 +- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 47 - .../hostdev-usb-address-device-boot.args | 2 +- .../hostdev-usb-address-device.args | 2 +- .../hostdev-vfio-multidomain.args | 4 +- tests/qemuxml2argvdata/hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/hugepages-default.args | 2 +- tests/qemuxml2argvdata/hugepages-shared.args | 2 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 2 +- .../intel-iommu.x86_64-2.6.0.args | 29 - tests/qemuxml2argvdata/iothreads-disk.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- .../kvmclock+eoi-disabled.x86_64-2.7.0.args | 30 - .../luks-disks-source-qcow2.args | 8 +- tests/qemuxml2argvdata/luks-disks-source.args | 6 +- .../mach-virt-console-virtio.args | 2 +- .../mach-virt-serial-native.args | 2 +- .../mach-virt-serial-pci.args | 2 +- .../mach-virt-serial-usb.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 2 +- tests/qemuxml2argvdata/machine-aliases2.args | 2 +- tests/qemuxml2argvdata/machine-smm-opt.args | 2 +- .../qemuxml2argvdata/machine-vmport-opt.args | 2 +- .../memory-hotplug-dimm-addr.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- .../migrate-numa-unaligned.args | 2 +- .../minimal-msg-timestamp.args | 2 +- tests/qemuxml2argvdata/minimal-sandbox.args | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/monitor-json.args | 2 +- .../multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/net-client.args | 4 +- tests/qemuxml2argvdata/net-eth-hostip.args | 2 +- tests/qemuxml2argvdata/net-eth-ifname.args | 2 +- tests/qemuxml2argvdata/net-eth-names.args | 6 +- .../net-eth-unmanaged-tap.args | 2 +- tests/qemuxml2argvdata/net-eth.args | 2 +- .../net-hostdev-bootorder.args | 2 +- .../net-hostdev-multidomain.args | 4 +- .../net-hostdev-vfio-multidomain.args | 4 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/net-hostdev.args | 4 +- tests/qemuxml2argvdata/net-many-models.args | 12 +- tests/qemuxml2argvdata/net-mcast.args | 4 +- tests/qemuxml2argvdata/net-server.args | 4 +- tests/qemuxml2argvdata/net-udp.args | 4 +- tests/qemuxml2argvdata/net-user.args | 2 +- .../net-vhostuser-multiq.args | 10 +- .../qemuxml2argvdata/net-vhostuser-multiq.err | 1 - tests/qemuxml2argvdata/net-vhostuser.args | 6 +- .../net-vhostuser.x86_64-2.5.0.args | 36 - tests/qemuxml2argvdata/net-virtio-device.args | 4 +- .../net-virtio-disable-offloads.args | 4 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +- .../net-virtio-rxtxqueuesize.args | 4 +- .../qemuxml2argvdata/net-virtio-teaming.args | 10 +- tests/qemuxml2argvdata/net-virtio.args | 2 +- .../numad-auto-memory-vcpu-cpuset.args | 2 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-vcpu-static-numatune.args | 2 +- .../numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- .../numatune-auto-nodeset-invalid.args | 2 +- .../numatune-auto-prefer.args | 2 +- .../qemuxml2argvdata/numatune-distances.args | 2 +- .../numatune-memnode-no-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memnode.args | 2 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/panic-no-address.args | 2 +- tests/qemuxml2argvdata/panic.args | 2 +- .../parallel-parport-chardev.args | 2 +- .../parallel-tcp-chardev.args | 2 +- .../parallel-unix-chardev.x86_64-2.5.0.args | 33 - tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- .../pci-bridge-many-disks.args | 216 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 68 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 10 +- .../pci-serial-dev-chardev.args | 2 +- .../pcie-root-port-model-generic.args | 6 +- .../pcie-root-port-model-ioh3420.args | 4 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- .../pseries-cpu-compat-power9.args | 4 +- .../qemuxml2argvdata/pseries-cpu-compat.args | 4 +- .../pseries-features-htp-resize.err | 1 - .../pseries-features-htp-resize.xml | 1 - .../pv-spinlock-disabled.x86_64-2.7.0.args | 30 - .../pv-spinlock-enabled.x86_64-2.7.0.args | 30 - .../q35-pci-force-address.args | 2 +- .../q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- .../qemu-ns-commandline-ns0.args | 2 +- .../qemu-ns-commandline-ns1.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 2 +- .../qemu-ns-domain-commandline-ns0.args | 2 +- .../qemu-ns-domain-commandline.args | 2 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- .../seclabel-dynamic-baselabel.args | 2 +- .../seclabel-dynamic-labelskip.args | 2 +- .../seclabel-dynamic-override.args | 2 +- .../seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- .../seclabel-static-labelskip.args | 2 +- .../seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../qemuxml2argvdata/serial-file-chardev.args | 2 +- .../qemuxml2argvdata/serial-many-chardev.args | 2 +- .../qemuxml2argvdata/serial-pty-chardev.args | 2 +- .../serial-spiceport-nospice.args | 2 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- .../serial-tcp-tlsx509-chardev.args | 2 +- .../qemuxml2argvdata/serial-udp-chardev.args | 2 +- .../qemuxml2argvdata/serial-unix-chardev.args | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- .../shmem-plain-doorbell.args | 14 +- tests/qemuxml2argvdata/shmem.args | 14 +- .../smartcard-controller.args | 2 +- .../smartcard-host-certificates-database.args | 2 +- .../smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-tcp.args | 2 +- ...artcard-passthrough-unix.x86_64-2.5.0.args | 32 - tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/sound-device.args | 14 +- tests/qemuxml2argvdata/sound.args | 4 +- .../usb-controller-qemu-xhci.args | 2 +- .../qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- .../usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- .../qemuxml2argvdata/usb-ich9-companion.args | 2 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 26 +- .../qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-none.args | 2 +- .../usb-piix3-controller.args | 2 +- .../qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- .../usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- .../usb-redir-unix.x86_64-2.5.0.args | 36 - tests/qemuxml2argvdata/usb-redir.args | 2 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/user-aliases-usb.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 2 +- .../qemuxml2argvdata/video-qxl-nodevice.args | 32 - tests/qemuxml2argvdata/video-qxl-nodevice.xml | 29 - .../qemuxml2argvdata/video-vga-nodevice.args | 30 - tests/qemuxml2argvdata/video-vga-nodevice.xml | 29 - .../qemuxml2argvdata/video-vga-qxl-heads.args | 5 +- .../virtio-input-passthrough.args | 4 +- tests/qemuxml2argvdata/virtio-input.args | 6 +- tests/qemuxml2argvdata/virtio-lun.args | 4 +- .../qemuxml2argvdata/virtio-rng-default.args | 2 +- .../virtio-rng-egd-unix.x86_64-2.5.0.args | 32 - tests/qemuxml2argvdata/virtio-rng-egd.args | 4 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 4 +- tests/qemuxml2argvdata/virtio-rng-random.args | 4 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvdata/watchdog-device.args | 2 +- tests/qemuxml2argvdata/watchdog-dump.args | 2 +- .../qemuxml2argvdata/watchdog-injectnmi.args | 2 +- tests/qemuxml2argvtest.c | 155 +- tests/qemuxml2xmloutdata/autoindex.xml | 4 +- .../balloon-device-auto.xml | 2 +- .../bios-nvram-os-interleave.xml | 2 +- tests/qemuxml2xmloutdata/bios-nvram.xml | 2 +- tests/qemuxml2xmloutdata/blkiotune-device.xml | 2 +- tests/qemuxml2xmloutdata/blkiotune.xml | 2 +- .../boot-menu-disable-with-timeout.xml | 2 +- .../qemuxml2xmloutdata/boot-menu-disable.xml | 2 +- .../boot-menu-enable-with-timeout.xml | 2 +- tests/qemuxml2xmloutdata/boot-multi.xml | 2 +- tests/qemuxml2xmloutdata/boot-order.xml | 6 +- tests/qemuxml2xmloutdata/channel-guestfwd.xml | 2 +- .../channel-unix-source-path-active.xml | 2 +- .../channel-unix-source-path-inactive.xml | 2 +- .../channel-virtio-auto.xml | 6 +- .../channel-virtio-state-active.xml | 2 +- .../channel-virtio-state-inactive.xml | 2 +- tests/qemuxml2xmloutdata/channel-virtio.xml | 2 +- tests/qemuxml2xmloutdata/chardev-label.xml | 4 +- tests/qemuxml2xmloutdata/clock-catchup.xml | 2 +- .../clock-timer-hyperv-rtc.xml | 2 +- .../console-compat-auto.xml | 2 +- tests/qemuxml2xmloutdata/console-compat2.xml | 2 +- .../console-virtio-many.xml | 4 +- tests/qemuxml2xmloutdata/console-virtio.xml | 4 +- .../controller-usb-order.xml | 2 +- .../controller-virtio-scsi.xml | 12 +- .../cpu-check-default-none.xml | 2 +- .../cpu-check-default-none2.xml | 2 +- .../cpu-check-default-partial.xml | 2 +- .../cpu-check-default-partial2.xml | 2 +- tests/qemuxml2xmloutdata/cpu-check-full.xml | 2 +- tests/qemuxml2xmloutdata/cpu-check-none.xml | 2 +- .../qemuxml2xmloutdata/cpu-check-partial.xml | 2 +- tests/qemuxml2xmloutdata/cpu-empty.xml | 2 +- tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +- tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +- .../qemuxml2xmloutdata/cpu-host-kvmclock.xml | 2 +- .../cpu-host-model-features.xml | 2 +- .../cpu-host-model-vendor.xml | 2 +- .../cpu-host-passthrough-features.xml | 2 +- tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 2 +- .../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 2 +- .../cpu-numa-disordered.xml | 2 +- .../qemuxml2xmloutdata/cpu-numa-memshared.xml | 2 +- .../cpu-numa-no-memory-element.xml | 2 +- tests/qemuxml2xmloutdata/cpu-numa1.xml | 2 +- tests/qemuxml2xmloutdata/cpu-numa2.xml | 2 +- .../qemuxml2xmloutdata/cputune-iothreads.xml | 2 +- .../cputune-iothreadsched-zeropriority.xml | 2 +- .../cputune-iothreadsched.xml | 2 +- .../cputune-zero-shares.xml | 2 +- tests/qemuxml2xmloutdata/cputune.xml | 2 +- .../default-kvm-host-arch.xml | 2 +- .../default-qemu-host-arch.xml | 2 +- .../disk-active-commit-active.xml | 2 +- .../disk-active-commit-inactive.xml | 2 +- tests/qemuxml2xmloutdata/disk-aio.xml | 2 +- .../disk-backing-chains-active.xml | 12 +- .../disk-backing-chains-inactive.xml | 12 +- .../disk-backing-chains-index-active.xml | 14 +- .../disk-backing-chains-index-inactive.xml | 14 +- .../disk-backing-chains-noindex.xml | 14 +- .../disk-cache.x86_64-1.5.3.xml | 61 - .../disk-cache.x86_64-2.6.0.xml | 61 - .../disk-cache.x86_64-2.7.0.xml | 61 - .../qemuxml2xmloutdata/disk-copy_on_read.xml | 4 +- .../qemuxml2xmloutdata/disk-mirror-active.xml | 8 +- .../disk-mirror-inactive.xml | 8 +- .../disk-mirror-old-active.xml | 6 +- .../disk-mirror-old-inactive.xml | 6 +- .../disk-network-gluster.xml | 6 +- .../qemuxml2xmloutdata/disk-network-iscsi.xml | 10 +- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 10 +- tests/qemuxml2xmloutdata/disk-network-rbd.xml | 12 +- .../disk-network-sheepdog.xml | 2 +- .../disk-network-source-auth.xml | 6 +- .../disk-scsi-device-auto.xml | 4 +- .../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 6 +- .../disk-scsi-lun-passthrough-sgio.xml | 6 +- tests/qemuxml2xmloutdata/disk-serial.xml | 2 +- .../disk-source-pool-mode.xml | 2 +- tests/qemuxml2xmloutdata/disk-source-pool.xml | 4 +- tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 +- tests/qemuxml2xmloutdata/disk-virtio.xml | 4 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- tests/qemuxml2xmloutdata/eoi-disabled.xml | 2 +- tests/qemuxml2xmloutdata/eoi-enabled.xml | 2 +- tests/qemuxml2xmloutdata/event_idx.xml | 4 +- tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 2 +- .../hostdev-mdev-precreated.xml | 2 +- .../hostdev-pci-address-unassigned.xml | 8 +- .../hostdev-pci-address.xml | 2 +- .../hostdev-pci-multifunction.xml | 16 +- .../hostdev-scsi-autogen-address.xml | 6 +- .../hostdev-scsi-large-unit.xml | 4 +- tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 4 +- .../qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 4 +- .../qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 4 +- .../hostdev-scsi-shareable.xml | 4 +- .../hostdev-scsi-vhost-scsi-pci.xml | 2 +- .../hostdev-scsi-vhost-scsi-pcie.xml | 8 +- .../hostdev-scsi-virtio-scsi.xml | 4 +- tests/qemuxml2xmloutdata/hostdev-vfio.xml | 4 +- .../qemuxml2xmloutdata/hugepages-default.xml | 2 +- tests/qemuxml2xmloutdata/hugepages-shared.xml | 2 +- tests/qemuxml2xmloutdata/hyperv-off.xml | 2 +- .../intel-iommu.x86_64-2.6.0.xml | 31 - tests/qemuxml2xmloutdata/interface-driver.xml | 4 +- tests/qemuxml2xmloutdata/iothreads-disk.xml | 2 +- tests/qemuxml2xmloutdata/kvm-features-off.xml | 2 +- tests/qemuxml2xmloutdata/lease.xml | 2 +- .../qemuxml2xmloutdata/luks-disks-source.xml | 6 +- .../memory-hotplug-dimm.xml | 2 +- tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +- .../qemuxml2xmloutdata/memorybacking-set.xml | 2 +- .../memorybacking-unset.xml | 2 +- .../qemuxml2xmloutdata/memtune-unlimited.xml | 2 +- tests/qemuxml2xmloutdata/memtune.xml | 2 +- .../qemuxml2xmloutdata/metadata-duplicate.xml | 2 +- tests/qemuxml2xmloutdata/metadata.xml | 2 +- tests/qemuxml2xmloutdata/minimal.xml | 2 +- tests/qemuxml2xmloutdata/net-coalesce.xml | 8 +- tests/qemuxml2xmloutdata/net-eth-hostip.xml | 2 +- tests/qemuxml2xmloutdata/net-eth-ifname.xml | 2 +- .../net-eth-unmanaged-tap.xml | 2 +- tests/qemuxml2xmloutdata/net-eth.xml | 2 +- .../net-hostdev-bootorder.xml | 2 +- tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 4 +- tests/qemuxml2xmloutdata/net-hostdev.xml | 4 +- tests/qemuxml2xmloutdata/net-many-models.xml | 12 +- tests/qemuxml2xmloutdata/net-midonet.xml | 4 +- tests/qemuxml2xmloutdata/net-mtu.xml | 6 +- tests/qemuxml2xmloutdata/net-openvswitch.xml | 4 +- tests/qemuxml2xmloutdata/net-udp.xml | 4 +- tests/qemuxml2xmloutdata/net-user.xml | 2 +- tests/qemuxml2xmloutdata/net-vdpa.xml | 2 +- tests/qemuxml2xmloutdata/net-vhostuser.xml | 6 +- .../qemuxml2xmloutdata/net-virtio-device.xml | 4 +- .../net-virtio-disable-offloads.xml | 4 +- .../net-virtio-network-portgroup.xml | 8 +- .../net-virtio-rxtxqueuesize.xml | 4 +- .../net-virtio-teaming-network.xml | 6 +- .../qemuxml2xmloutdata/net-virtio-teaming.xml | 10 +- tests/qemuxml2xmloutdata/net-virtio.xml | 2 +- .../numad-auto-memory-vcpu-cpuset.xml | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +- .../numad-auto-vcpu-no-numatune.xml | 2 +- .../numad-static-vcpu-no-numatune.xml | 2 +- .../numatune-auto-prefer.xml | 2 +- .../qemuxml2xmloutdata/numatune-distances.xml | 2 +- .../numatune-memnode-no-memory.xml | 2 +- tests/qemuxml2xmloutdata/numatune-memnode.xml | 2 +- tests/qemuxml2xmloutdata/panic-isa.xml | 2 +- tests/qemuxml2xmloutdata/panic-no-address.xml | 2 +- tests/qemuxml2xmloutdata/panic.xml | 2 +- .../pci-bridge-many-disks.xml | 216 +- tests/qemuxml2xmloutdata/pci-expander-bus.xml | 68 +- .../pci-rom-disabled-invalid.xml | 2 +- tests/qemuxml2xmloutdata/pci-rom-disabled.xml | 2 +- tests/qemuxml2xmloutdata/pci-rom.xml | 10 +- .../pci-serial-dev-chardev.xml | 2 +- .../pcie-root-port-model-generic.xml | 12 +- .../pcie-root-port-model-ioh3420.xml | 8 +- tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64.xml | 2 +- .../pv-spinlock-disabled.xml | 2 +- .../pv-spinlock-enabled.xml | 2 +- .../q35-pci-force-address.xml | 4 +- .../qemuxml2xmloutdata/seclabel-dac-none.xml | 2 +- .../seclabel-device-multiple.xml | 2 +- .../seclabel-dynamic-baselabel-inactive.xml | 2 +- .../seclabel-dynamic-labelskip-inactive.xml | 2 +- .../seclabel-dynamic-none.xml | 2 +- .../seclabel-dynamic-override-inactive.xml | 2 +- .../seclabel-dynamic-relabel-inactive.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-none.xml | 2 +- .../seclabel-static-labelskip-active.xml | 2 +- .../seclabel-static-labelskip-inactive.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-static.xml | 2 +- .../serial-spiceport-nospice.xml | 2 +- .../serial-target-port-auto.xml | 2 +- .../serial-tcp-tlsx509-chardev.xml | 2 +- .../shmem-plain-doorbell.xml | 14 +- tests/qemuxml2xmloutdata/shmem.xml | 14 +- .../smartcard-controller.xml | 2 +- .../smartcard-host-certificates-database.xml | 2 +- .../smartcard-host-certificates.xml | 2 +- tests/qemuxml2xmloutdata/smartcard-host.xml | 2 +- .../smartcard-passthrough-spicevmc.xml | 2 +- .../smartcard-passthrough-tcp.xml | 2 +- .../smbios-multiple-type2.xml | 2 +- tests/qemuxml2xmloutdata/smbios.xml | 2 +- tests/qemuxml2xmloutdata/sound-device.xml | 14 +- tests/qemuxml2xmloutdata/sound.xml | 4 +- .../tap-vhost-incorrect.xml | 6 +- tests/qemuxml2xmloutdata/tap-vhost.xml | 4 +- .../qemuxml2xmloutdata/tseg-explicit-size.xml | 4 +- tests/qemuxml2xmloutdata/usb-controller.xml | 2 +- .../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 26 +- tests/qemuxml2xmloutdata/usb-none.xml | 2 +- .../usb-piix3-controller.xml | 2 +- tests/qemuxml2xmloutdata/usb-port-missing.xml | 2 +- .../usb-redir-filter-version.xml | 2 +- tests/qemuxml2xmloutdata/usb-redir-filter.xml | 2 +- tests/qemuxml2xmloutdata/usb-redir.xml | 2 +- tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 2 +- tests/qemuxml2xmloutdata/vhost_queues.xml | 4 +- .../virtio-input-passthrough.xml | 4 +- tests/qemuxml2xmloutdata/virtio-input.xml | 6 +- tests/qemuxml2xmloutdata/virtio-lun.xml | 4 +- tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 4 +- .../qemuxml2xmloutdata/virtio-rng-random.xml | 4 +- tests/qemuxml2xmloutdata/vmcoreinfo.xml | 2 +- tests/qemuxml2xmltest.c | 72 +- tests/testutilsqemu.c | 2 +- 739 files changed, 588789 insertions(+), 853995 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.err delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/pseries-features-htp-resize.err delete mode 120000 tests/qemuxml2argvdata/pseries-features-htp-resize.xml delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml -- 2.30.2

4 65

[libvirt PATCH v6 00/30] Add support for persistent mediated devices
by Jonathon Jongsma 12 Apr '21

12 Apr '21

This patch series follows the previously-merged series which added support for transient mediated devices. This series expands mdev support to include persistent device definitions. Again, it relies on mdevctl as the backend. It follows the common libvirt pattern of APIs by adding the following new APIs for node devices: - virNodeDeviceDefineXML() - defines a persistent device - virNodeDeviceUndefine() - undefines a persistent device - virNodeDeviceCreate() - starts a previously-defined device It also adds virsh commands mapping to these new APIs: nodedev-define, nodedev-undefine, and nodedev-start. Since we rely on mdevctl for the definition of mediated devices, we need a way to stay up-to-date with devices that are defined by mdevctl (outside of libvirt). The method for staying up-to-date is currently a little bit crude due to the fact that mdevctl does not emit any events when new devices are added or removed. As a workaround, we create a file monitor for the mdevctl config directory and re-query mdevctl when we detect changes within that directory. In the future, mdevctl may introduce a more elegant solution. Changes in v6: - rebase to git master again - remove typedefs for various *Ptr types, since they're now discouraged in libvirt. Changes in v5: - Rebase to git master - updated new API version info to 7.2.0 - capture and relay stderr message from mdevctl - changed to using GHashTable functions directly instead of deprecated virHash functions - protected mdevctlMonitors with a mutex - added a couple patches to fix the 5s delay when defining a new mdev. These are currently separate patches added to the end of the series, but could be squashed into the earlier commits if that's preferred. - various other minor review fixes Changes in v4: - rebase to git master - switch to throwaway thread for querying mdevctl - fixed a bug when removing devices because I was accidentally using virHashForEach() instead of virHashForeachSafe() - use DEFINED/UNDEFINED events instead of STARTED/STOPPED events - changes related to merging information about mdev devices from both udev a= nd mdevctl: - Re-used the same function to copy extra data from mdevctl regardless of whether we're processing a udev event or a mdevctl event (recommended by Erik). This results in slightly more complex handling of the object lifetimes (see patch 9), but it consolidates some code. - nodeDeviceDefCopyFromMdevctl() previously only copied the data that was unique to mdevctl and didn't exist in udev. It now copies additional data (possibly overwriting some udev). This solves a problem where a device = is defined but not active (i.e. we have not gotten any data from udev), and then changed (e.g. somebody calls 'mdevctl modify' to change the mdev type), but libvirt was not updating to the new definition. - fix a bug where we were mistakenly emitting 'update' events for devices th= at had not changed - Added the ability to specify a uuid for an mdev via device XML. - split some commits into multiple patches - updated new API version info to 7.1.0 - Fixed a bug reported by Yan Fu which hangs the client when attempting to destroy a nodedev that is in use by an active vm. See https://www.redhat.com/archives/libvir-list/2021-February/msg00116.html for solution suggested by Alex. - numerous smaller fixes from review findings changes in v3: - streamlined tests -- removed some unnecessary duplication - split out patch to factor out node device name generation function - split nodeDeviceParseMdevctlChildDevice() into a separate function - added follow-up patch to remove space-padded alignment in header - refactored the mdevctl update handling significantly: - no longer a separate persistent thread that gets signaled by a timer - now piggybacks onto the existing udev thread and signals the thread in t= he same way that the udev event does. - Daniel suggested spawning a throw-away thread to handle mdevctl updates, but that introduces the complexity of possibly serializing multiple throw-away threads (e.g. if we get an 'created' event followed immediate= ly by a 'deleted' event, two threads may be spawned and we'd need to ensure they are properly ordered) - added virNodeDeviceObjListForEach() and virNodeDeviceObjListRemoveLocked() to simplify removing devices that are removed from mdevctl. - coding style fixes - NOTE: per Erik's request, I experimented with changing the way that mdevctl commands were generated and tested (e.g. introducing something like virMdevctlGetCommand(def, MDEVCTL_COMMAND_<SUBCOMMAND>, ...)), but it was too invasive and awkward and didn't seem worthwhile Changes in v2: - rebase to latest git master Jonathon Jongsma (30): nodedev: capture and report stderror from mdevctl tests: remove extra trailing semicolon nodedev: introduce concept of 'active' node devices nodedev: Add ability to filter by active state nodedev: fix docs for virConnectListAllNodeDevices() nodedev: expose internal helper for naming devices nodedev: add ability to parse mdevs from mdevctl nodedev: add ability to list defined mdevs nodedev: add persistence to virNodeDeviceObj nodedev: add DEFINED/UNDEFINED lifecycle events nodedev: add mdevctl devices to node device list nodedev: add helper functions to remove node devices nodedev: handle mdevs that disappear from mdevctl nodedev: Refresh mdev devices when changes are detected nodedev: add function to generate mdevctl define command api: add virNodeDeviceDefineXML() virsh: Add --inactive, --all to nodedev-list virsh: add nodedev-define command nodedev: refactor tests to support mdev undefine api: add virNodeDeviceUndefine() virsh: Factor out function to find node device virsh: add nodedev-undefine command api: add virNodeDeviceCreate() virsh: add "nodedev-start" command nodedev: add <uuid> element to mdev caps nodedev: add ability to specify UUID for new mdevs nodedev: fix hang when destroying an mdev in use nodedev: add docs about mdev attribute order nodedev: factor out function to add mediated devices nodedev: avoid delay when defining a new mdev docs/formatnode.html.in | 5 +- docs/schemas/nodedev.rng | 43 +- examples/c/misc/event-test.c | 4 + include/libvirt/libvirt-nodedev.h | 20 +- src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 6 + src/conf/node_device_conf.c | 14 + src/conf/node_device_conf.h | 8 + src/conf/virnodedeviceobj.c | 147 +++- src/conf/virnodedeviceobj.h | 24 + src/driver-nodedev.h | 14 + src/libvirt-nodedev.c | 141 +++- src/libvirt_private.syms | 6 + src/libvirt_public.syms | 3 + src/node_device/node_device_driver.c | 743 +++++++++++++++++- src/node_device/node_device_driver.h | 50 +- src/node_device/node_device_udev.c | 217 ++++- src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 40 +- src/remote_protocol-structs | 16 + src/rpc/gendispatch.pl | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.argv | 2 + ...19_36ea_4111_8f0a_8c9a70e21366-define.json | 1 + ...019_36ea_4111_8f0a_8c9a70e21366-start.argv | 3 +- ...39_495e_4243_ad9f_beb3f14c23d9-define.argv | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.json | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.argv | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.json | 1 + tests/nodedevmdevctldata/mdevctl-create.argv | 1 + .../mdevctl-list-defined.argv | 1 + .../mdevctl-list-multiple.json | 59 ++ .../mdevctl-list-multiple.out.xml | 43 + .../nodedevmdevctldata/mdevctl-undefine.argv | 1 + tests/nodedevmdevctltest.c | 232 +++++- ...v_d069d019_36ea_4111_8f0a_8c9a70e21366.xml | 1 + tools/virsh-nodedev.c | 269 ++++++- 36 files changed, 1931 insertions(+), 193 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.json create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.json create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.json create mode 100644 tests/nodedevmdevctldata/mdevctl-create.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-defined.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-undefine.argv --=20 2.26.3

5 62