- Devel - libvirt List Archives

[PATCH v2 00/12] libxl: bump LIBXL_API_VERSION
by Olaf Hering 31 Mar '21

31 Mar '21

Various changes to handle libxl API variants. Olaf v2: - adjust names of wrapper functions adjust indent adjust style of braces rename new header Olaf Hering (12): libxl: add API wrapper for libxl_domain_create_restore libxl: add API wrapper for libxl_retrieve_domain_configuration libxl: add API wrapper for libxl_domain_shutdown libxl: add API wrapper for libxl_domain_reboot libxl: add API wrapper for libxl_domain_pause libxl: add API wrapper for libxl_domain_unpause libxl: add API wrapper for libxl_domain_need_memory libxl: add API wrapper for libxl_get_free_memory libxl: add API wrapper for libxl_set_vcpuonline libxl: add API wrapper for libxl_send_trigger libxl: add API wrapper for libxl_set_memory_target libxl: use API 4.13 to support domUs with more than 4TB meson.build | 7 +- src/libxl/libxl_api_wrapper.h | 217 ++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.c | 5 +- src/libxl/libxl_domain.c | 27 +++-- src/libxl/libxl_driver.c | 25 ++-- src/libxl/libxl_migration.c | 3 +- tests/libxlmock.c | 7 +- 7 files changed, 261 insertions(+), 30 deletions(-) create mode 100644 src/libxl/libxl_api_wrapper.h

2 14

[PATCH-for-5.2] target/mips: Deprecate nanoMIPS ISA
by Philippe Mathieu-Daudé 30 Mar '21

30 Mar '21

The nanoMIPS ISA has been announced in 2018 for various projects: GCC: https://gcc.gnu.org/legacy-ml/gcc/2018-05/msg00012.html Linux: https://lwn.net/Articles/753605/ QEMU: https://www.mail-archive.com/qemu-devel@nongnu.org/msg530721.html Unfortunately the links referenced doesn't work anymore (www.mips.com) >From this Wayback machine link [1] we can get to a working place to download a toolchain (a more recent release than the one referenced in the announcement mails): http://codescape.mips.com/components/toolchain/nanomips/2018.04-02/download… The toolchain page mention LLVM but simply links http://llvm.org/ where there is no reference on nanoMIPS. The only reference in the GCC mailing list, is the nanoMIPS announcement: https://gcc.gnu.org/pipermail/gcc/2018-May.txt The developer who authored the announcements have been emailed [2] to ask for more information but all their emails are now bouncing: - Your message to Stefan.Markovic(a)mips.com couldn't be delivered. - Your message to smarkovic(a)wavecomp.com couldn't be delivered. - Couldn't deliver the message to the following recipients: Robert.Suchanek(a)mips.com, matthew.fortune(a)mips.com, marcin.nowakowski(a)mips.com Our deprecation policy do not allow feature removal before 2 release, therefore declare the nanoMIPS ISA code deprecated as of QEMU 5.2. This gives time to developers to update the QEMU community, or interested parties to step in to maintain this code. [1] https://web.archive.org/web/20180904044530/https://www.mips.com/develop/too… [2] https://www.mail-archive.com/qemu-devel@nongnu.org/msg756392.html Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> --- docs/system/deprecated.rst | 23 +++++++++++++++++++++++ MAINTAINERS | 6 +++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 32a0e620dbb..a26af200c73 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -310,6 +310,13 @@ to build binaries for it. ``Icelake-Client`` CPU Models are deprecated. Use ``Icelake-Server`` CPU Models instead. +MIPS ``I7200`` CPU Model (since 5.2) +'''''''''''''''''''''''''''''''''''' + +The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated +(the ISA has never been upstreamed to a compiler toolchain). Therefore +this CPU is also deprecated. + System emulator devices ----------------------- @@ -413,6 +420,13 @@ The ``ppc64abi32`` architecture has a number of issues which regularly trip up our CI testing and is suspected to be quite broken. For that reason the maintainers strongly suspect no one actually uses it. +MIPS ``I7200`` CPU (since 5.2) +'''''''''''''''''''''''''''''' + +The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated +(the ISA has never been upstreamed to a compiler toolchain). Therefore +this CPU is also deprecated. + Related binaries ---------------- @@ -477,6 +491,15 @@ versions, aliases will point to newer CPU model versions depending on the machine type, so management software must resolve CPU model aliases before starting a virtual machine. +Guest Emulator ISAs +------------------- + +nanoMIPS ISA +'''''''''''' + +The ``nanoMIPS`` ISA has never been upstreamed to any compiler toolchain. +As it is hard to generate binaries for it, declare it deprecated. + Recently removed features ========================= diff --git a/MAINTAINERS b/MAINTAINERS index 2c22bbca5ac..4f701012eea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -227,7 +227,7 @@ R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com> S: Odd Fixes F: target/mips/ F: default-configs/*mips* -F: disas/*mips* +F: disas/mips.c F: docs/system/cpu-models-mips.rst.inc F: hw/intc/mips_gic.c F: hw/mips/ @@ -240,6 +240,10 @@ F: include/hw/timer/mips_gictimer.h F: tests/tcg/mips/ K: ^Subject:.*(?i)mips +MIPS TCG CPUs (nanoMIPS ISA) +S: Orphan +F: disas/nanomips.* + Moxie TCG CPUs M: Anthony Green <green(a)moxielogic.com> S: Maintained -- 2.26.2

3 4

[PATCH] vm : forbid to start a removing vm
by Hogan Wang 30 Mar '21

30 Mar '21

From: Zhuang Shengen <zhuangshengen(a)huawei.com> When a vm is doing migration phase confirm, and then start it concurrently, it will lead to the vm out of libvirtd control. Cause Analysis: 1. thread1 migrate vm out. 2. thread2 start the migrating vm. 3. thread1 remove vm from domain list after migrate success. 4. thread2 acquired the vm job success and start the vm. 5. cannot find the vm any more by 'virsh list' command. Actually, the started vm is not exist in the domain list. Solution: Check the vm->removing state before start. Signed-off-by: Zhuang Shengen <zhuangshengen(a)huawei.com> Reviewed-by: Hogan Wang <hogan.wang(a)huawei.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d1a3659774..a5dfea94cb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6637,6 +6637,12 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) goto endjob; } + if (vm->removing) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is already removing")); + goto endjob; + } + if (qemuDomainObjStart(dom->conn, driver, vm, flags, QEMU_ASYNC_JOB_START) < 0) goto endjob; -- 2.23.0

2 4

Ways to deal with broken machine types
by Igor Mammedov 30 Mar '21

30 Mar '21

On Tue, 23 Mar 2021 16:04:11 +0100 Thomas Lamprecht <t.lamprecht(a)proxmox.com> wrote: > On 23.03.21 15:55, Vitaly Cheptsov wrote: > >> 23 марта 2021 г., в 17:48, Michael S. Tsirkin <mst(a)redhat.com> написал(а): > >> > >> The issue is with people who installed a VM using 5.1 qemu, > >> migrated to 5.2, booted there and set a config on a device > >> e.g. IP on a NIC. > >> They now have a 5.1 machine type but changing uid back > >> like we do will break these VMs. > >> > >> Unlikley to be common but let's at least create a way for these people > >> to used these VMs. > >> > > They can simply set the 5.2 VM version in such a case. I do not want to > let this legacy hack to be enabled in any modern QEMU VM version, as it violates ACPI specification and makes the life more difficult for various other software like bootloaders and operating systems. > > Yeah here I agree with Vitaly, if they already used 5.2 and made some configurations > for those "new" devices they can just keep using 5.2? > > If some of the devices got configured on 5.1 and some on 5.2 there's nothing we can > do anyway, from a QEMU POV - there the user always need to choose one machine version > and fix up the device configured while on the other machine. According to testing it appears that issue affects virtio drivers so it may lead to failure to boot guest (and there was at least 1 report about virtio-scsi being affected). Let me hijack this thread for beyond this case scope. I agree that for this particular bug we've done all we could, but there is broader issue to discuss here. We have machine versions to deal with hw compatibility issues and that covers most of the cases, but occasionally we notice problem well after release(s), so users may be stuck with broken VM and need to manually fix configuration (and/or VM). Figuring out what's wrong and how to fix it is far from trivial. So lets discuss if we can help to ease this pain, yes it will be late for first victims but it's still better than never. I'll try to sum up idea Michael suggested (here comes my unorganized brain-dump), 1. We can keep in VM's config QEMU version it was created on and as minimum warn user with a pointer to known issues if version in config mismatches version of actually used QEMU, with a knob to silence it for particular mismatch. When an issue becomes know and resolved we know for sure how and what changed and embed instructions on what options to use for fixing up VM's config to preserve old HW config depending on QEMU version VM was installed on. some more ideas: 2. let mgmt layer to keep fixup list and apply them to config if available (user would need to upgrade mgmt or update fixup list somehow) 3. let mgmt layer to pass VM's QEMU version to currently used QEMU, so that QEMU could maintain and apply fixups based on QEMU version + machine type. The user will have to upgrade to newer QEMU to get/use new fixups. In my opinion both would lead to explosion of 'possibly needed' properties for each change we introduce in hw/firmware(read ACPI) and very possibly a lot of conditional branches in QEMU code. And I'm afraid it will become hard to maintain QEMU => more bugs in future. Also it will lead to explosion of test matrix for downstreams who care about testing. If we proactively gate changes on properties, we can just update fixup lists in mgmt, without need to update QEMU (aka Insite rules) at a cost of complexity on QMEU side. Alternatively we can be conservative in spawning new properties, that means creating them only when issue is fixed and require users to update QEMU, so that fixups could be applied to VM. Feel free to shoot the messenger down or suggest ways how we can deal with the problem.

5 7

[PATCH] NEWS: Mention fix for exec-restart of virtlo(g|ck)d and 'object_add' improvements
by Peter Krempa 30 Mar '21

30 Mar '21

Mention that libvirt-7.2 will be needed to do stuff that executes 'object-add'/'object-del' QMP commands with the upcoming qemu-6.0 and that exec-restart of virtlockd and virtlogd was fixed. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2142cbd21e..1c4186917e 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -35,8 +35,20 @@ v7.2.0 (unreleased) * **Improvements** + * qemu: Compatibility with ``qemu-6.0`` for certain hot-(un)-plug operations + + Libvirt ``7.2.0`` is required for compatibility with the upcoming + ``qemu-6.0`` release for hotplug and hotunplug of certain devices and + helpers, such as iothreads, chardevs, RNG devices, disks with secret, ... + * **Bug fixes** + * virtlogd|virtlockd: Fixed crash when upgrading the daemons in-place + + A bug preventing the in-place upgrade of ``virtlogd`` and ``virtlockd`` + daemons was fixed, so they can again be upgraded without dropping the log + file descriptors or locks on files. + v7.1.0 (2021-03-01) =================== -- 2.29.2

2 1

Entering freeze for libvirt-7.2.0
by Jiri Denemark 30 Mar '21

30 Mar '21

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

1 1

[PATCH] qemu: don't reject virtiofs for qemu:///session
by Cole Robinson 29 Mar '21

29 Mar '21

Currently libvirt rejects attempts to use virtiofs with qemu:///session. Indeed virtiofs does not have a chance of working with typical session usage, because virtiofsd needs multiple linux capabilities to perform its job. The only way to do this with out of the box qemu packaging is to run virtiofsd as root, so libvirtd must run as root, so qemu:///system is required. But it's possible that a custom environment could setuid or set file capabilities on the virtiofsd binary. In this case qemu:///session would work fine. This may be an option for kubevirt to help them transition to using qemu:///session everywhere Drop the two pieces that block virtiofs for qemu:///session. Attempts to use virtiofs for stock qemu:///session will fail at qemu startup, though it's a bit opaque: error: Failed to start domain 'f32' error: internal error: qemu unexpectedly closed the monitor: 2021-03-26T16:26:12.459293Z qemu-system-x86_64: -device vhost-user-fs-pci,chardev=chr-vu-fs0,tag=/foovirtiofs,bus=pci.10,addr=0x0: Failed to write msg. Wrote -1 instead of 12. 2021-03-26T16:26:12.459317Z qemu-system-x86_64: -device vhost-user-fs-pci,chardev=chr-vu-fs0,tag=/foovirtiofs,bus=pci.10,addr=0x0: vhost_dev_init failed: Operation not permitted Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- The SetUID/SetGID bits don't seem to be necessary for qemu:///system usage AFAICT, but it's a bit tough to decode virSetUIDGIDWithCaps. virtiofsd is meticulous about managing its capability set though src/qemu/qemu_validate.c | 7 +------ src/qemu/qemu_virtiofs.c | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 6043f974ce..d4079f6b67 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4053,7 +4053,7 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics, static int qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, const virDomainDef *def, - virQEMUDriverPtr driver, + virQEMUDriverPtr driver G_GNUC_UNUSED, virQEMUCapsPtr qemuCaps) { if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { @@ -4107,11 +4107,6 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, _("virtiofs does not yet support read-only mode")); return -1; } - if (!driver->privileged) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtiofs is not yet supported in session mode")); - return -1; - } if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtiofs only supports passthrough accessmode")); diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 2e239cad66..0bb4e3c0d1 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -214,10 +214,6 @@ qemuVirtioFSStart(virLogManagerPtr logManager, if (!(cmd = qemuVirtioFSBuildCommandLine(cfg, fs, &fd))) goto cleanup; - /* so far only running as root is supported */ - virCommandSetUID(cmd, 0); - virCommandSetGID(cmd, 0); - virCommandSetPidFile(cmd, pidfile); virCommandSetOutputFD(cmd, &logfd); virCommandSetErrorFD(cmd, &logfd); -- 2.30.2

3 3

[libvirt PATCH] conf: remove duplicated firmware type attribute
by Daniel P. Berrangé 29 Mar '21

29 Mar '21

The <os firmware='efi'> <firmware type='efi'> <feature enabled='no' name='enrolled-keys'/> </firmware> </os> repeats the firmware attribute twice. This has no functional benefit, as evidenced by fact that we use a single struct field to store both attributes, while needlessly introducing an error scenario. The XML can just be simplified to: <os firmware='efi'> <firmware> <feature enabled='no' name='enrolled-keys'/> </firmware> </os> which also means that we don't need to emit the empty element <firmware type='efi'/> for all existing configs too. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/formatdomain.rst | 8 ---- docs/schemas/domaincommon.rng | 10 +--- src/conf/domain_conf.c | 48 ++++++------------- .../os-firmware-efi-no-enrolled-keys.xml | 2 +- .../os-firmware-invalid-type.xml | 28 ----------- tests/qemuxml2argvtest.c | 1 - ...aarch64-os-firmware-efi.aarch64-latest.xml | 1 - .../os-firmware-bios.x86_64-latest.xml | 1 - .../os-firmware-efi-secboot.x86_64-latest.xml | 1 - .../os-firmware-efi.x86_64-latest.xml | 1 - tests/vmx2xmldata/vmx2xml-firmware-efi.xml | 1 - 11 files changed, 18 insertions(+), 84 deletions(-) delete mode 100644 tests/qemuxml2argvdata/os-firmware-invalid-type.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 9392c80113..741130bf21 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -158,14 +158,6 @@ harddisk, cdrom, network) determining where to obtain/find the boot image. ``firmware`` :since:`Since 7.2.0 QEMU/KVM only` - When used together with ``firmware`` attribute of ``os`` element the ``type`` - attribute must have the same value. - - List of mandatory attributes: - - - ``type`` (accepted values are ``bios`` and ``efi``) same as the ``firmware`` - attribute of ``os`` element. - When using firmware auto-selection there are different features enabled in the firmwares. The list of features can be used to limit what firmware should be automatically selected for the VM. The list of features can be specified diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1dbfc68f18..f5ced5b7a2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -278,13 +278,7 @@ <ref name="ostypehvm"/> <optional> <element name="firmware"> - <attribute name="type"> - <choice> - <value>bios</value> - <value>efi</value> - </choice> - </attribute> - <zeroOrMore> + <oneOrMore> <element name="feature"> <attribute name="enabled"> <ref name="virYesNo"/> @@ -296,7 +290,7 @@ </choice> </attribute> </element> - </zeroOrMore> + </oneOrMore> </element> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b0eba9f7bd..d050a519c6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19590,31 +19590,21 @@ virDomainDefParseBootFirmwareOptions(virDomainDefPtr def, xmlXPathContextPtr ctxt) { g_autofree char *firmware = virXPathString("string(./os/@firmware)", ctxt); - g_autofree char *type = virXPathString("string(./os/firmware/@type)", ctxt); g_autofree xmlNodePtr *nodes = NULL; g_autofree int *features = NULL; int fw = 0; int n = 0; size_t i; - if (!firmware && !type) + if (!firmware) return 0; - if (firmware && type && STRNEQ(firmware, type)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("firmware attribute and firmware type has to be the same")); - return -1; - } - - if (!type) - type = g_steal_pointer(&firmware); - - fw = virDomainOsDefFirmwareTypeFromString(type); + fw = virDomainOsDefFirmwareTypeFromString(firmware); if (fw <= 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown firmware value %s"), - type); + firmware); return -1; } @@ -29491,30 +29481,22 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def, virBufferAsprintf(buf, ">%s</type>\n", virDomainOSTypeToString(def->os.type)); - if (def->os.firmware) { - virBufferAsprintf(buf, "<firmware type='%s'", - virDomainOsDefFirmwareTypeToString(def->os.firmware)); - - if (def->os.firmwareFeatures) { - virBufferAddLit(buf, ">\n"); - - virBufferAdjustIndent(buf, 2); + if (def->os.firmwareFeatures) { + virBufferAddLit(buf, "<firmware>\n"); + virBufferAdjustIndent(buf, 2); - for (i = 0; i < VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_LAST; i++) { - if (def->os.firmwareFeatures[i] == VIR_TRISTATE_BOOL_ABSENT) - continue; + for (i = 0; i < VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_LAST; i++) { + if (def->os.firmwareFeatures[i] == VIR_TRISTATE_BOOL_ABSENT) + continue; - virBufferAsprintf(buf, "<feature enabled='%s' name='%s'/>\n", - virTristateBoolTypeToString(def->os.firmwareFeatures[i]), - virDomainOsDefFirmwareFeatureTypeToString(i)); - } + virBufferAsprintf(buf, "<feature enabled='%s' name='%s'/>\n", + virTristateBoolTypeToString(def->os.firmwareFeatures[i]), + virDomainOsDefFirmwareFeatureTypeToString(i)); + } - virBufferAdjustIndent(buf, -2); + virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</firmware>\n"); - } else { - virBufferAddLit(buf, "/>\n"); - } + virBufferAddLit(buf, "</firmware>\n"); } virBufferEscapeString(buf, "<init>%s</init>\n", diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml index 8944ce70bb..352908f745 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml +++ b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml @@ -6,7 +6,7 @@ <vcpu placement='static'>1</vcpu> <os firmware='efi'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> - <firmware type='efi'> + <firmware> <feature enabled='no' name='enrolled-keys'/> </firmware> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/os-firmware-invalid-type.xml b/tests/qemuxml2argvdata/os-firmware-invalid-type.xml deleted file mode 100644 index 41360df0f7..0000000000 --- a/tests/qemuxml2argvdata/os-firmware-invalid-type.xml +++ /dev/null @@ -1,28 +0,0 @@ -<domain type='kvm'> - <name>fedora</name> - <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid> - <memory unit='KiB'>8192</memory> - <currentMemory unit='KiB'>8192</currentMemory> - <vcpu placement='static'>1</vcpu> - <os firmware='efi'> - <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> - <firmware type='bios'/> - <loader secure='no'/> - <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> - <boot dev='hd'/> - <bootmenu enable='yes'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 12c2b68fd7..3439f34ef1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3582,7 +3582,6 @@ mymain(void) DO_TEST_CAPS_LATEST("os-firmware-efi"); DO_TEST_CAPS_LATEST("os-firmware-efi-secboot"); DO_TEST_CAPS_LATEST("os-firmware-efi-no-enrolled-keys"); - DO_TEST_CAPS_LATEST_PARSE_ERROR("os-firmware-invalid-type"); DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64"); DO_TEST_CAPS_LATEST("vhost-user-vga"); diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml index cb4f3ccfce..627e285ae1 100644 --- a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml @@ -6,7 +6,6 @@ <vcpu placement='static'>1</vcpu> <os firmware='efi'> <type arch='aarch64' machine='virt-4.0'>hvm</type> - <firmware type='efi'/> <kernel>/aarch64.kernel</kernel> <initrd>/aarch64.initrd</initrd> <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml index 016c5b863f..df6f61421a 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml @@ -6,7 +6,6 @@ <vcpu placement='static'>1</vcpu> <os firmware='bios'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> - <firmware type='bios'/> <loader secure='no'/> <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> <boot dev='hd'/> diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml index fa5eaa3148..c383546cc6 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml @@ -6,7 +6,6 @@ <vcpu placement='static'>1</vcpu> <os firmware='efi'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> - <firmware type='efi'/> <loader secure='yes'/> <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> <boot dev='hd'/> diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml index 382146c23b..04d57860e7 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml @@ -6,7 +6,6 @@ <vcpu placement='static'>1</vcpu> <os firmware='efi'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> - <firmware type='efi'/> <loader secure='no'/> <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> <boot dev='hd'/> diff --git a/tests/vmx2xmldata/vmx2xml-firmware-efi.xml b/tests/vmx2xmldata/vmx2xml-firmware-efi.xml index fa10daf3a6..fee707fe71 100644 --- a/tests/vmx2xmldata/vmx2xml-firmware-efi.xml +++ b/tests/vmx2xmldata/vmx2xml-firmware-efi.xml @@ -6,7 +6,6 @@ <vcpu placement='static'>1</vcpu> <os firmware='efi'> <type arch='i686'>hvm</type> - <firmware type='efi'/> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> -- 2.30.2

2 2

[libvirt PATCH 0/9] improve firmware auto-selection
by Pavel Hrdina 29 Mar '21

29 Mar '21

Cleanup the parser code and implement firmware feature filtering support to allow users to modify firmware auto-selection behavior per VM. More details in PATCH 08. Pavel Hrdina (9): docs: improve description of secure attribute for loader element conf: introduce virDomainDefParseBootInitOptions conf: introduce virDomainDefParseBootKernelOptions conf: introduce virDomainDefParseBootFirmwareOptions conf: introduce virDomainDefParseBootLoaderOptions conf: introduce virDomainDefParseBootAcpiOptions conf: use switch in virDomainDefParseBootOptions conf: introduce support for firmware auto-selection feature filtering qemu: implement support for firmware auto-selection feature filtering docs/formatdomain.rst | 35 +- docs/schemas/domaincommon.rng | 23 + src/conf/domain_conf.c | 396 ++++++++++++------ src/conf/domain_conf.h | 10 + src/qemu/qemu_firmware.c | 40 ++ .../os-firmware-efi-invalid-type.xml | 28 ++ ...re-efi-no-enrolled-keys.x86_64-latest.args | 49 +++ .../os-firmware-efi-no-enrolled-keys.xml | 25 ++ ...os-firmware-invalid-type.x86_64-latest.err | 1 + .../os-firmware-invalid-type.xml | 28 ++ tests/qemuxml2argvtest.c | 2 + ...aarch64-os-firmware-efi.aarch64-latest.xml | 1 + .../os-firmware-bios.x86_64-latest.xml | 1 + ...are-efi-no-enrolled-keys.x86_64-latest.xml | 50 +++ .../os-firmware-efi-secboot.x86_64-latest.xml | 1 + .../os-firmware-efi.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tests/vmx2xmldata/vmx2xml-firmware-efi.xml | 1 + 18 files changed, 567 insertions(+), 126 deletions(-) create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-invalid-type.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/os-firmware-invalid-type.xml create mode 100644 tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.xml -- 2.30.2

4 21

[PATCH] qemu_driver: Acquire MODIFY job in qemuDomainStartDirtyRateCalc()
by Michal Privoznik 29 Mar '21

29 Mar '21

This API talks to QEMU and changes its internal state. Therefore, it should acquire QEMU_JOB_MODIFY instead of QEMU_JOB_QUERY. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 69dc704a44..af015f0625 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20425,7 +20425,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, if (virDomainStartDirtyRateCalcEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { -- 2.26.3

2 1

[libvirt PATCH] remote: don't allow dirty rate API with read permission
by Daniel P. Berrangé 29 Mar '21

29 Mar '21

This API interacts with the hypervisor and makes changes to its behaviour, so must be protected by the write permission. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 7fdc65f029..743c21b316 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -6743,7 +6743,7 @@ enum remote_procedure { /** * @generate: both - * @acl: domain:read + * @acl: domain:write */ REMOTE_PROC_DOMAIN_START_DIRTY_RATE_CALC = 427 }; -- 2.30.2

3 2

[PATCH v1 00/12] libxl: bump LIBXL_API_VERSION
by Olaf Hering 29 Mar '21

29 Mar '21

Various changes to handle libxl API variants. Olaf Olaf Hering (12): libxl: add API wrapper for libxl_domain_create_restore libxl: add API wrapper for libxl_retrieve_domain_configuration libxl: add API wrapper for libxl_domain_shutdown libxl: add API wrapper for libxl_domain_reboot libxl: add API wrapper for libxl_domain_pause libxl: add API wrapper for libxl_domain_unpause libxl: add API wrapper for libxl_domain_need_memory libxl: add API wrapper for libxl_get_free_memory libxl: add API wrapper for libxl_set_vcpuonline libxl: add API wrapper for libxl_send_trigger libxl: add API wrapper for libxl_set_memory_target libxl: use API 4.13 to support domUs with more than 4TB meson.build | 7 +- src/libxl/libxl_api.h | 219 ++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.c | 5 +- src/libxl/libxl_domain.c | 23 ++-- src/libxl/libxl_driver.c | 21 ++-- src/libxl/libxl_migration.c | 3 +- tests/libxlmock.c | 7 +- 7 files changed, 259 insertions(+), 26 deletions(-) create mode 100644 src/libxl/libxl_api.h

3 22

[PATCH] src: drop some forward declarations in src/storage/storage_backend_sheepdog.c
by peili 29 Mar '21

29 Mar '21

--- src/storage/storage_backend_sheepdog.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 8c37947308..010e86aa14 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -35,12 +35,6 @@ #define VIR_FROM_THIS VIR_FROM_STORAGE -static int virStorageBackendSheepdogRefreshVol(virStoragePoolObjPtr pool, - virStorageVolDefPtr vol); - -void virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, - virStoragePoolObjPtr pool); - int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, char *output) -- 2.20.1

3 3

[PATCH] rpc: libssh2: Enable EC host keys
by Bastian Germann 28 Mar '21

28 Mar '21

libssh2 has ECDSA and ED25519 support beginning with v1.9.0. libvirt cannot make use of those because it will handle them as unknown key types. Add support for those host key types. Signed-off-by: Bastian Germann <bastiangermann(a)fishpost.de> --- libvirt.spec.in | 2 +- meson.build | 2 +- src/rpc/virnetsshsession.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f9af330186..8f5b3f126c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -359,7 +359,7 @@ BuildRequires: libcap-ng-devel >= 0.5.0 BuildRequires: fuse-devel >= 2.8.6 %endif %if %{with_libssh2} -BuildRequires: libssh2-devel >= 1.3.0 +BuildRequires: libssh2-devel >= 1.9.0 %endif %if %{with_netcf} BuildRequires: netcf-devel >= 0.2.2 diff --git a/meson.build b/meson.build index ea93a2a8ec..5e5b22107c 100644 --- a/meson.build +++ b/meson.build @@ -1142,7 +1142,7 @@ else libssh_dep = dependency('', required: false) endif -libssh2_version = '1.3' +libssh2_version = '1.9' if get_option('driver_remote').enabled() libssh2_dep = dependency('libssh2', version: '>=' + libssh2_version, required: get_option('libssh2')) if libssh2_dep.found() diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index fe77594f65..cb081bcf4f 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -389,6 +389,18 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) case LIBSSH2_HOSTKEY_TYPE_DSS: keyType = LIBSSH2_KNOWNHOST_KEY_SSHDSS; break; + case LIBSSH2_HOSTKEY_TYPE_ECDSA_256: + keyType = LIBSSH2_KNOWNHOST_KEY_ECDSA_256; + break; + case LIBSSH2_HOSTKEY_TYPE_ECDSA_384: + keyType = LIBSSH2_KNOWNHOST_KEY_ECDSA_384; + break; + case LIBSSH2_HOSTKEY_TYPE_ECDSA_521: + keyType = LIBSSH2_KNOWNHOST_KEY_ECDSA_521; + break; + case LIBSSH2_HOSTKEY_TYPE_ED25519: + keyType = LIBSSH2_KNOWNHOST_KEY_ED25519; + break; case LIBSSH2_HOSTKEY_TYPE_UNKNOWN: default: -- 2.30.2

2 1

[PATCH] src: drop some forward declarations in src/storage/storage_backend_sheepdog.c
by peili 27 Mar '21

27 Mar '21

--- src/storage/storage_backend_sheepdog.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 8c37947308..010e86aa14 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -35,12 +35,6 @@ #define VIR_FROM_THIS VIR_FROM_STORAGE -static int virStorageBackendSheepdogRefreshVol(virStoragePoolObjPtr pool, - virStorageVolDefPtr vol); - -void virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, - virStoragePoolObjPtr pool); - int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, char *output) -- 2.20.1

1 0

[PATCH] qemu: virtiofs: support <sandbox mode='chroot'/>
by Cole Robinson 26 Mar '21

26 Mar '21

Add a new XML element <filesystem> <binary> <sandbox mode='chroot|namespace'/> </binary> </filesystem> Which maps to `virtiofsd -o sandbox=chroot|namespace`, which was added in qemu 5.2.0: https://git.qemu.org/?p=qemu.git;a=commit;h=06844584b62a43384642f7243b0fc01… Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.rst | 4 ++++ 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_virtiofs.c | 2 ++ .../vhost-user-fs-fd-memory.xml | 1 + 7 files changed, 53 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 9392c80113..9dda39dbcb 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3234,6 +3234,7 @@ A directory on the host that can be accessed directly from the guest. <driver type='virtiofs' queue='1024'/> <binary path='/usr/libexec/virtiofsd' xattr='on'> <cache mode='always'/> + <sandbox mode='namespace'/> <lock posix='on' flock='on'/> </binary> <source dir='/path'/> @@ -3358,6 +3359,9 @@ A directory on the host that can be accessed directly from the guest. ``cache`` element, possible ``mode`` values being ``none`` and ``always``. Locking can be controlled via the ``lock`` element - attributes ``posix`` and ``flock`` both accepting values ``on`` or ``off``. ( :since:`Since 6.2.0` ) + The sandboxing method used by virtiofsd can be configured with the ``sandbox`` + element, possible ``mode`` values being ``namespace`` and + ``chroot``. ( :since:`Since 7.2.0` ) ``source`` The resource on the host that is being accessed in the guest. The ``name`` attribute must be used with ``type='template'``, and the ``dir`` attribute diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1dbfc68f18..6404ebf210 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2960,6 +2960,18 @@ </optional> </element> </optional> + <optional> + <element name="sandbox"> + <optional> + <attribute name="mode"> + <choice> + <value>namespace</value> + <value>chroot</value> + </choice> + </attribute> + </optional> + </element> + </optional> <optional> <element name="lock"> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b0eba9f7bd..70a900ee25 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -538,6 +538,13 @@ VIR_ENUM_IMPL(virDomainFSCacheMode, "always", ); +VIR_ENUM_IMPL(virDomainFSSandboxMode, + VIR_DOMAIN_FS_SANDBOX_MODE_LAST, + "default", + "namespace", + "chroot", +); + VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, @@ -10373,6 +10380,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *binary = virXPathString("string(./binary/@path)", ctxt); g_autofree char *xattr = virXPathString("string(./binary/@xattr)", ctxt); g_autofree char *cache = virXPathString("string(./binary/cache/@mode)", ctxt); + g_autofree char *sandbox = virXPathString("string(./binary/sandbox/@mode)", ctxt); g_autofree char *posix_lock = virXPathString("string(./binary/lock/@posix)", ctxt); g_autofree char *flock = virXPathString("string(./binary/lock/@flock)", ctxt); int val; @@ -10406,6 +10414,16 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, def->cache = val; } + if (sandbox) { + if ((val = virDomainFSSandboxModeTypeFromString(sandbox)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse sandbox mode '%s' for virtiofs"), + sandbox); + goto error; + } + def->sandbox = val; + } + if (posix_lock) { if ((val = virTristateSwitchTypeFromString(posix_lock)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -25483,6 +25501,11 @@ virDomainFSDefFormat(virBufferPtr buf, virDomainFSCacheModeTypeToString(def->cache)); } + if (def->sandbox != VIR_DOMAIN_FS_SANDBOX_MODE_DEFAULT) { + virBufferAsprintf(&binaryBuf, "<sandbox mode='%s'/>\n", + virDomainFSSandboxModeTypeToString(def->sandbox)); + } + if (def->posix_lock != VIR_TRISTATE_SWITCH_ABSENT) { virBufferAsprintf(&lockAttrBuf, " posix='%s'", virTristateSwitchTypeToString(def->posix_lock)); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0b8895bbdf..d77b04847b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -846,6 +846,14 @@ typedef enum { VIR_DOMAIN_FS_CACHE_MODE_LAST } virDomainFSCacheMode; +typedef enum { + VIR_DOMAIN_FS_SANDBOX_MODE_DEFAULT = 0, + VIR_DOMAIN_FS_SANDBOX_MODE_NAMESPACE, + VIR_DOMAIN_FS_SANDBOX_MODE_CHROOT, + + VIR_DOMAIN_FS_SANDBOX_MODE_LAST +} virDomainFSSandboxMode; + struct _virDomainFSDef { int type; int fsdriver; /* enum virDomainFSDriverType */ @@ -870,6 +878,7 @@ struct _virDomainFSDef { virDomainFSCacheMode cache; virTristateSwitch posix_lock; virTristateSwitch flock; + virDomainFSSandboxMode sandbox; virDomainVirtioOptionsPtr virtio; virObjectPtr privateData; }; @@ -3800,6 +3809,7 @@ VIR_ENUM_DECL(virDomainFSAccessMode); VIR_ENUM_DECL(virDomainFSWrpolicy); VIR_ENUM_DECL(virDomainFSModel); VIR_ENUM_DECL(virDomainFSCacheMode); +VIR_ENUM_DECL(virDomainFSSandboxMode); VIR_ENUM_DECL(virDomainNet); VIR_ENUM_DECL(virDomainNetBackend); VIR_ENUM_DECL(virDomainNetVirtioTxMode); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cb9fe7c80a..04b2bc9dcd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -414,6 +414,7 @@ virDomainFSDriverTypeToString; virDomainFSIndexByName; virDomainFSInsert; virDomainFSRemove; +virDomainFSSandboxModeTypeToString; virDomainFSTypeFromString; virDomainFSTypeToString; virDomainFSWrpolicyTypeFromString; diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 2e239cad66..988b757d6f 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -131,6 +131,8 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfigPtr cfg, virQEMUBuildBufferEscapeComma(&opts, fs->src->path); if (fs->cache) virBufferAsprintf(&opts, ",cache=%s", virDomainFSCacheModeTypeToString(fs->cache)); + if (fs->sandbox) + virBufferAsprintf(&opts, ",sandbox=%s", virDomainFSSandboxModeTypeToString(fs->sandbox)); if (fs->xattr == VIR_TRISTATE_SWITCH_ON) virBufferAddLit(&opts, ",xattr"); diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml index 2277850c2c..abddf0870b 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml @@ -30,6 +30,7 @@ <driver type='virtiofs' queue='1024'/> <binary path='/usr/libexec/virtiofsd' xattr='on'> <cache mode='always'/> + <sandbox mode='chroot'/> <lock posix='off' flock='off'/> </binary> <source dir='/path'/> -- 2.30.2

2 2

[libvirt PATCH v5 00/30] Add support for persistent mediated devices
by Jonathon Jongsma 26 Mar '21

26 Mar '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 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 | 7 + 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, 1935 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.2

2 34

[libvirt PATCH v3 0/3] qemuProcessUpdateGuestCPU: Check host cpu for forbidden features
by Tim Wiederhake 26 Mar '21

26 Mar '21

V1: https://listman.redhat.com/archives/libvir-list/2021-February/msg01275.ht= ml V2: https://listman.redhat.com/archives/libvir-list/2021-February/msg01289.ht= ml Changes since V2: * Factored out into seperate function in src/cpu/cpu.c * Made virCPUDefFindFeature work on const pointers Tim Wiederhake (3): virCPUDefFindFeature: Make first argument const ptr cpu: Introduce virCPUCheckForbiddenFeatures qemuProcessUpdateGuestCPU: Check host cpu for forbidden features src/conf/cpu_conf.c | 2 +- src/conf/cpu_conf.h | 2 +- src/cpu/cpu.c | 37 +++++++++++++++++++++++++++++++++++++ src/cpu/cpu.h | 6 ++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 10 ++++++++++ 6 files changed, 56 insertions(+), 2 deletions(-) --=20 2.26.2

2 4

[PATCH] serialize access pci_get_strings function with a mutex
by wangjian 26 Mar '21

26 Mar '21

serialize access pci_get_strings function with a mutex. nodedev-init thread: nodeStateInitializeEnumerate -> udevEnumerateDevices-> udevProcessDeviceListEntry -> udevAddOneDevice -> udevGetDeviceDetails-> udevProcessPCI -> udevTranslatePCIIds -> pci_get_strings -> (libpciaccess) find_device_name -> populate_vendor -> d = realloc( vend->devices, (vend->num_devices + 1), * sizeof( struct pci_device_leaf ) ); vend->num_devices++; udev-event thread: udevEventHandleThread -> udevHandleOneDevice -> udevAddOneDevice-> udevGetDeviceDetails-> udevProcessPCI -> udevTranslatePCIIds -> pci_get_strings -> (libpciaccess) find_device_name -> populate_vendor -> d = realloc( vend->devices, (vend->num_devices + 1), * sizeof( struct pci_device_leaf ) ); vend->num_devices++; Since the functions provided by libpciaccess are not thread-safe, when the udev-event and nodedev-init threads of libvirt call the pci_get_strings function provided by libpaciaccess at the same time. It will appear that for the same address, realloc a large space first, and then realloc a small space, which triggers the 'invalid next size' of realloc, leading to the thread core. Signed-off-by: WangJian <wangjian161(a)huawei.com> --- src/node_device/node_device_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 3f28858..cc752ba 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -331,6 +331,7 @@ udevGenerateDeviceName(struct udev_device *device, return 0; } +static pthread_mutex_t g_pciaccess_mutex = PTHREAD_MUTEX_INITIALIZER; static int udevTranslatePCIIds(unsigned int vendor, @@ -350,11 +351,13 @@ udevTranslatePCIIds(unsigned int vendor, m.match_data = 0; /* pci_get_strings returns void */ + pthread_mutex_lock(&g_pciaccess_mutex); pci_get_strings(&m, &device_name, &vendor_name, NULL, NULL); + pthread_mutex_unlock(&g_pciaccess_mutex); *vendor_string = g_strdup(vendor_name); *product_string = g_strdup(device_name); -- 2.23.0

3 3

[PATCH 0/2] Revert parts of g_steal_pointer() rewrite
by Michal Privoznik 26 Mar '21

26 Mar '21

A few hours ago, I've merged a patch that uses g_steal_pointer() instead of its opened coded alternative. Well, turns out that some areas are more fragile and rely on the open coded version. https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/275871589 Michal Prívozník (2): virnetsocket: Revert part of g_steal_pointer() rewrite lib: Undo some g_steal_pointer() changes src/libxl/libxl_driver.c | 9 ++++++--- src/lxc/lxc_driver.c | 12 ++++++++---- src/qemu/qemu_driver.c | 36 ++++++++++++++++++++++++------------ src/rpc/virnetsocket.c | 3 ++- 4 files changed, 40 insertions(+), 20 deletions(-) -- 2.26.2

2 3

[libvirt PATCH v2] ci: Refresh information
by Andrea Bolognani 26 Mar '21

26 Mar '21

Notable changes: * HAL is no longer installed on FreeBSD; * the native version of libwsman is no longer installed in containers intended for cross-compilation; * Meson 0.55 rather than 0.54 is requested when installing it from PyPI; * GNU sed and GNU grep are installed explicitly everywhere. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Changes from [v1]: * install GNU grep and GNU sed everywhere. I didn't push the original patch, even though it had already been ACKed, to avoid unnecessary container rebuilds. [v1] https://listman.redhat.com/archives/libvir-list/2021-March/msg01211.html ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/cirrus/macos-11.vars | 2 +- ci/containers/centos-7.Dockerfile | 6 ++++-- ci/containers/centos-8.Dockerfile | 6 ++++-- ci/containers/centos-stream.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-aarch64.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-armv6l.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-armv7l.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-i686.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-mips.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-mips64el.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-mipsel.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-ppc64le.Dockerfile | 6 ++++-- ci/containers/debian-10-cross-s390x.Dockerfile | 6 ++++-- ci/containers/debian-10.Dockerfile | 6 ++++-- ci/containers/debian-sid-cross-aarch64.Dockerfile | 4 +++- ci/containers/debian-sid-cross-armv6l.Dockerfile | 4 +++- ci/containers/debian-sid-cross-armv7l.Dockerfile | 4 +++- ci/containers/debian-sid-cross-i686.Dockerfile | 4 +++- ci/containers/debian-sid-cross-mips64el.Dockerfile | 4 +++- ci/containers/debian-sid-cross-mipsel.Dockerfile | 4 +++- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 4 +++- ci/containers/debian-sid-cross-s390x.Dockerfile | 4 +++- ci/containers/debian-sid.Dockerfile | 4 +++- ci/containers/fedora-32.Dockerfile | 4 +++- ci/containers/fedora-33.Dockerfile | 4 +++- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 5 +++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 5 +++-- ci/containers/fedora-rawhide.Dockerfile | 4 +++- ci/containers/opensuse-152.Dockerfile | 6 ++++-- ci/containers/ubuntu-1804.Dockerfile | 6 ++++-- ci/containers/ubuntu-2004.Dockerfile | 6 ++++-- 33 files changed, 109 insertions(+), 51 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 5add0fb058..115fd89727 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 5add0fb058..115fd89727 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index c29b8b13b8..ba0e77d728 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip3' -PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8 gettext git glib gnutls libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl' +PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl' diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile index c499e7a19d..d1de34cedf 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/centos:7 RUN yum update -y && \ @@ -64,6 +64,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ glibc-devel \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iptables \ iscsi-initiator-utils \ @@ -111,6 +112,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xen-devel \ @@ -124,7 +126,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 e600598329..d55115fe29 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/centos:8 RUN dnf update -y && \ @@ -35,6 +35,7 @@ RUN dnf update -y && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -84,6 +85,7 @@ RUN dnf update -y && \ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xfsprogs-devel \ @@ -96,7 +98,7 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 2b51eccc8d..a6715700c9 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/centos:8 RUN dnf install -y centos-release-stream && \ @@ -37,6 +37,7 @@ RUN dnf install -y centos-release-stream && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -86,6 +87,7 @@ RUN dnf install -y centos-release-stream && \ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xfsprogs-devel \ @@ -98,7 +100,7 @@ RUN dnf install -y centos-release-stream && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 272c809f17..50476a7f5c 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -118,7 +120,7 @@ cpu = 'aarch64'\n\ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 e877b5e0b3..aed38f6f3d 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu = 'arm'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 d8cbc82334..714e28ad07 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -118,7 +120,7 @@ cpu = 'armhf'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 ed056c31b5..7fcd38ff7b 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu = 'i686'\n\ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 969964faf2..09d0653e13 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu = 'mips'\n\ endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 a78492971f..07ce89e16f 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu = 'mips64el'\n\ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 857173f261..644b822302 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu = 'mipsel'\n\ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 349cc1e487..f2e61268e9 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu = 'powerpc64le'\n\ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 e79381e69a..e9b89c299a 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ @@ -117,7 +119,7 @@ cpu = 's390x'\n\ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 bac8589f2c..fbc06b3314 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ @@ -98,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 f0831c1fed..373b9ad31a 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index c3661e2e7d..e32d0fd230 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 4322046e8d..cc46822665 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index a48ff3471c..a4cd1c1070 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 9f3325b546..76298a7e4e 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 39993132ac..3c69ce545f 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index ebb4389e69..c274e106a0 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 8cc22358cf..7d9120c93e 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ xsltproc \ zfs-fuse && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index a1ef98e67c..d1141ea307 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -81,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile index 71d391b7bd..71c78c76dc 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ @@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm-build \ sanlock-devel \ scrub \ + sed \ sheepdog \ systemtap-sdt-devel \ wireshark-devel \ diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 5fb30380b0..08cd40bc3a 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ @@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm-build \ sanlock-devel \ scrub \ + sed \ sheepdog \ systemtap-sdt-devel \ wireshark-devel \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index c718778acb..1ac0c08e4c 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \ firewalld-filesystem \ git \ glibc-langpack-en \ + grep \ iproute \ iproute-tc \ iptables \ iscsi-initiator-utils \ kmod \ - libwsman-devel \ libxml2 \ libxslt \ lvm2 \ @@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ + sed \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 6058d0c0b2..767e43639d 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \ firewalld-filesystem \ git \ glibc-langpack-en \ + grep \ iproute \ iproute-tc \ iptables \ iscsi-initiator-utils \ kmod \ - libwsman-devel \ libxml2 \ libxslt \ lvm2 \ @@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ + sed \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 027e8a7c41..7cb68dcd50 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -43,6 +43,7 @@ exec "$@"' > /usr/bin/nosync && \ glibc-langpack-en \ glusterfs-api-devel \ gnutls-devel \ + grep \ iproute \ iproute-tc \ iptables \ @@ -90,6 +91,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm-build \ sanlock-devel \ scrub \ + sed \ sheepdog \ systemtap-sdt-devel \ wireshark-devel \ diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile index 00521f7796..8688934e92 100644 --- a/ci/containers/opensuse-152.Dockerfile +++ b/ci/containers/opensuse-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ @@ -31,6 +31,7 @@ RUN zypper update -y && \ glibc-devel \ glibc-locale \ glusterfs-devel \ + grep \ iproute2 \ iptables \ kmod \ @@ -81,6 +82,7 @@ RUN zypper update -y && \ rpm-build \ sanlock-devel \ scrub \ + sed \ systemtap-sdt-devel \ wireshark-devel \ xen-devel \ @@ -92,7 +94,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 3d18274d00..55b7821cba 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ glusterfs-common \ + grep \ iproute2 \ iptables \ kmod \ @@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ sheepdog \ systemtap-sdt-dev \ wireshark-dev \ @@ -100,7 +102,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 9018c9d22e..04427b81d0 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gcc \ gettext \ git \ + grep \ iproute2 \ iptables \ kmod \ @@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ qemu-utils \ radvd \ scrub \ + sed \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ @@ -99,7 +101,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" -- 2.26.3

2 1

[libvirt PATCH 2/2] build: teach run script how to temporarily stop systemd units
by Daniel P. Berrangé 25 Mar '21

25 Mar '21

When testing locally built daemons on a systemd host there can be quite a few systemd units that need temporarily stopping, and ideally restarting after the test is complete. This becomes a massive burden when modular daemons are running and you want to test libvirtd, as a huge number of units need stopping. The run script can facilitate this usage by looking at what units are running and automatically stopping any that are known to conflict with the daemon that is about to be run. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- run.in | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/run.in b/run.in index 99c67c586a..72d299dc4a 100644 --- a/run.in +++ b/run.in @@ -44,6 +44,7 @@ import os import os.path import random import sys +import subprocess # Function to intelligently prepend a path to an environment variable. # See https://stackoverflow.com/a/9631350 @@ -77,5 +78,86 @@ env["LIBVIRT_DIR_OVERRIDE"] = "1" # read problems when using glibc. env["MALLOC_PERTURB_"] = "%d" % random.randint(1, 255) -# Run the program. -os.execve(prog, args, env) +modular_daemons = [ + "virtinterfaced", + "virtlxcd", + "virtnetworkd", + "virtnodedevd", + "virtnwfilterd", + "virtproxyd", + "virtqemud", + "virtsecretd", + "virtstoraged", + "virtvboxd", + "virtvzd", + "virtxend", +] + +def is_modular_daemon(name): + return name in modular_daemons + +def is_monolithic_daemon(name): + return name == "libvirtd" + +def is_systemd_host(): + if os.getuid() != 0: + return False + return os.path.exists("/run/systemd/system") + +def daemon_units(name): + return [name + suffix for suffix in [ + ".service", ".socket", "-ro.socket", "-admin.socket"]] + +def is_unit_active(name): + ret = subprocess.call(["systemctl", "is-active", "-q", name]) + return ret == 0 + +def change_unit(name, action): + ret = subprocess.call(["systemctl", action, "-q", name]) + return ret == 0 + +try_stop_units = [] +if is_systemd_host(): + name = os.path.basename(prog) + + maybe_stopped_units = [] + if is_modular_daemon(name): + # Only need to stop libvirtd or this specific modular unit + maybe_stopped_units += daemon_units("libvirtd") + maybe_stopped_units += daemon_units(name) + elif is_monolithic_daemon(name): + # Need to stop libvirtd and/or all modular units + maybe_stopped_units += daemon_units("libvirtd") + for entry in modular_daemons: + maybe_stopped_units += daemon_units(entry) + + for unit in maybe_stopped_units: + if is_unit_active(unit): + try_stop_units.append(unit) + +if len(try_stop_units) == 0: + # Run the program directly, replacing ourselves + os.execve(prog, args, env) +else: + print("Temporarily stopping systemd units...") + stopped_units = [] + + try: + for unit in try_stop_units: + print(" > %s" % unit) + if not change_unit(unit, "stop"): + raise Exception("Unable to stop '%s'" % unit) + + stopped_units.append(unit) + + print("Running %s..." % prog) + ret = subprocess.call(prog, env=env) + except KeyboardInterrupt as ex: + pass + finally: + print("Re-starting original systemd units...") + stopped_units.reverse() + for unit in stopped_units: + print(" > %s" % unit) + if not change_unit(unit, "start"): + print(" ! unable to restart %s" % unit, file=sys.stderr) -- 2.30.2

2 3

[PATCH 1/1] set vm physical bits(phys_bits)
by Wang,Liang(ACG CCN) 25 Mar '21

25 Mar '21

Set the vm phys_bits through the phys and hostphysbits in XML <phys bits='43' /> corresponds to "-cpu-phys-bits=42" <hostphysbits /> corresponds to "host-phys-bits=on" <cpu mode='host-passthrough' check='none'> <phys bits='43' /> <hostphysbits /> </cpu> --- src/conf/cpu_conf.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 2 ++ src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 42 insertions(+) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 380a74691d..41f7c26f63 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -158,6 +158,8 @@ virCPUDefCopyModelFilter(virCPUDefPtr dst, dst->model = g_strdup(src->model); dst->vendor = g_strdup(src->vendor); dst->vendor_id = g_strdup(src->vendor_id); + dst->phys_bits = src->phys_bits; + dst->host_phys_bits = src->host_phys_bits; dst->microcodeVersion = src->microcodeVersion; dst->nfeatures_max = src->nfeatures; dst->nfeatures = 0; @@ -540,6 +542,18 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, return -1; } + if (virXPathNode("./phys[1]", ctxt)) { + unsigned long phys_bits; + if (virXPathULong("string(./phys[1]/@bits)", + ctxt, &phys_bits) >=0 ) { + def->phys_bits = (unsigned int) phys_bits; + } + } + + if (virXPathNode("./hostphysbits[1]", ctxt)) { + def->host_phys_bits = true; + } + if (virXPathNode("./topology[1]", ctxt)) { unsigned long ul; @@ -811,6 +825,12 @@ virCPUDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } + if (def->phys_bits > 0) + virBufferAsprintf(buf, "<phys bits='%u' />\n", def->phys_bits); + + if (def->host_phys_bits) + virBufferAddLit(buf, "<hostphysbits />\n"); + if (def->sockets && def->dies && def->cores && def->threads) { virBufferAddLit(buf, "<topology"); virBufferAsprintf(buf, " sockets='%u'", def->sockets); @@ -1067,6 +1087,20 @@ virCPUDefIsEqual(virCPUDefPtr src, return false; } + if (src->phys_bits != dst->phys_bits) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target CPU phys_bits %d does not match source %d"), + dst->phys_bits, src->phys_bits); + goto cleanup; + } + + if (src->host_phys_bits != dst->host_phys_bits) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target CPU host_phys_bits %d does not match source %d"), + dst->host_phys_bits, src->host_phys_bits); + goto cleanup; + } + if (src->sockets != dst->sockets) { MISMATCH(_("Target CPU sockets %d does not match source %d"), dst->sockets, src->sockets); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 7ab198d370..f2a23ad41e 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -132,6 +132,8 @@ struct _virCPUDef { char *vendor_id; /* vendor id returned by CPUID in the guest */ int fallback; /* enum virCPUFallback */ char *vendor; + unsigned int phys_bits; + bool host_phys_bits; unsigned int microcodeVersion; unsigned int sockets; unsigned int dies; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1b4fa77867..d9bf3d5ce8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6729,6 +6729,12 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virBufferAddLit(&buf, ",l3-cache=off"); } + if (def->cpu && def->cpu->phys_bits > 0) + virBufferAsprintf(&buf, ",phys-bits=%u", def->cpu->phys_bits); + + if (def->cpu && def->cpu->host_phys_bits) + virBufferAddLit(&buf, ",host-phys-bits=on"); + cpu = virBufferContentAndReset(&cpu_buf); cpu_flags = virBufferContentAndReset(&buf); -- 2.24.3

4 5

[PATCH] vz: Add case for VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER
by Michal Privoznik 25 Mar '21

25 Mar '21

In one of my recent patches I've introduced new connection feature VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER. However, I forgot to add corresponding case into a switch in vzConnectSupportsFeature(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/vz/vz_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index f3ad22c270..d8ad2499ab 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -3031,6 +3031,7 @@ vzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature) switch ((virDrvFeature) feature) { case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_P2P: + case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: return 1; case VIR_DRV_FEATURE_FD_PASSING: case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: -- 2.26.2

1 0

[libvirt PATCH 0/2] build: make the run script more intelligent on systemd hosts
by Daniel P. Berrangé 24 Mar '21

24 Mar '21

Running virtqemud, we just stop the virqemud daemon units Temporarily stopping systemd units... > virtqemud.socket > virtqemud-ro.socket > virtqemud-admin.socket Running ./src/virtqemud... ^CRe-starting original systemd units... > virtqemud-admin.socket > virtqemud-ro.socket > virtqemud.socket Running libvirtd, we stop all modular demon units Temporarily stopping systemd units... > virtnetworkd.socket > virtproxyd.socket > virtqemud.socket > virtqemud-ro.socket > virtqemud-admin.socket Running ./src/libvirtd... ^CRe-starting original systemd units... > virtqemud-admin.socket > virtqemud-ro.socket > virtqemud.socket > virtproxyd.socket > virtnetworkd.socket Daniel P. Berrangé (2): build: convert the run script to use Python build: teach run script how to temporarily stop systemd units run.in | 125 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 105 insertions(+), 20 deletions(-) -- 2.30.2

2 3

[PATCH v2 0/2] Fix calling of virNetworkUpdate() driver callback
by Michal Privoznik 24 Mar '21

24 Mar '21

v2 of: https://listman.redhat.com/archives/libvir-list/2021-March/msg00052.html I've pushed 1/2 from the v1 series (which just debug printed all arguments) which is unrelated to this problem. diff to v1: - Implemented different approach as suggested by Jano in his review of v1. I must say I like it more. Michal Prívozník (2): network: Implement virConnectSupportsFeature() lib: Fix calling of virNetworkUpdate() driver callback src/esx/esx_driver.c | 3 +++ src/libvirt-network.c | 24 ++++++++++++++++++++-- src/libvirt_internal.h | 5 +++++ src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/network/bridge_driver.c | 32 +++++++++++++++++++++++++++++ src/openvz/openvz_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_daemon_dispatch.c | 1 + src/test/test_driver.c | 1 + 10 files changed, 68 insertions(+), 2 deletions(-) -- 2.26.2

2 3

[PATCH 0/2] lib: Use g_steal_pointer() more
by Michal Privoznik 24 Mar '21

24 Mar '21

4 6

[libvirt PATCH 0/4] increase locked memory limit when a vDPA device is present
by Laine Stump 24 Mar '21

24 Mar '21

We recently learned that vDPA devices may/will need to pin/lock all of guest memory, and so just as we do for VFIO devices, we need to increase the locked memory limit when a vDPA device is present. https://bugzilla.redhat.com/1939776 Laine Stump (4): conf: new function virDomainDefHasVDPANet() qemu: simplify qemuDomainGetMemLockLimitBytes() qemu: account for mdev devices in getPPC64MemLockLimitBytes() qemu: increase locked memory limit when a vDPA device is present src/conf/domain_conf.c | 14 ++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 26 +++----------------------- 4 files changed, 21 insertions(+), 23 deletions(-) -- 2.30.2

2 8

[PATCH 1/1] set vm physical bits(phys_bits)
by Paul Schlacter 24 Mar '21

24 Mar '21

Set the vm phys_bits through the phys and hostphysbits in XML <phys bits='43' /> corresponds to "-cpu-phys-bits=42" <hostphysbits /> corresponds to "host-phys-bits=on" <cpu mode='host-passthrough' check='none'> <phys bits='43' /> <hostphysbits /> </cpu> --- src/conf/cpu_conf.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 2 ++ src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 42 insertions(+) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 380a74691d..41f7c26f63 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -158,6 +158,8 @@ virCPUDefCopyModelFilter(virCPUDefPtr dst, dst->model = g_strdup(src->model); dst->vendor = g_strdup(src->vendor); dst->vendor_id = g_strdup(src->vendor_id); + dst->phys_bits = src->phys_bits; + dst->host_phys_bits = src->host_phys_bits; dst->microcodeVersion = src->microcodeVersion; dst->nfeatures_max = src->nfeatures; dst->nfeatures = 0; @@ -540,6 +542,18 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, return -1; } + if (virXPathNode("./phys[1]", ctxt)) { + unsigned long phys_bits; + if (virXPathULong("string(./phys[1]/@bits)", + ctxt, &phys_bits) >=0 ) { + def->phys_bits = (unsigned int) phys_bits; + } + } + + if (virXPathNode("./hostphysbits[1]", ctxt)) { + def->host_phys_bits = true; + } + if (virXPathNode("./topology[1]", ctxt)) { unsigned long ul; @@ -811,6 +825,12 @@ virCPUDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } + if (def->phys_bits > 0) + virBufferAsprintf(buf, "<phys bits='%u' />\n", def->phys_bits); + + if (def->host_phys_bits) + virBufferAddLit(buf, "<hostphysbits />\n"); + if (def->sockets && def->dies && def->cores && def->threads) { virBufferAddLit(buf, "<topology"); virBufferAsprintf(buf, " sockets='%u'", def->sockets); @@ -1067,6 +1087,20 @@ virCPUDefIsEqual(virCPUDefPtr src, return false; } + if (src->phys_bits != dst->phys_bits) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target CPU phys_bits %d does not match source %d"), + dst->phys_bits, src->phys_bits); + goto cleanup; + } + + if (src->host_phys_bits != dst->host_phys_bits) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target CPU host_phys_bits %d does not match source %d"), + dst->host_phys_bits, src->host_phys_bits); + goto cleanup; + } + if (src->sockets != dst->sockets) { MISMATCH(_("Target CPU sockets %d does not match source %d"), dst->sockets, src->sockets); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 7ab198d370..f2a23ad41e 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -132,6 +132,8 @@ struct _virCPUDef { char *vendor_id; /* vendor id returned by CPUID in the guest */ int fallback; /* enum virCPUFallback */ char *vendor; + unsigned int phys_bits; + bool host_phys_bits; unsigned int microcodeVersion; unsigned int sockets; unsigned int dies; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1b4fa77867..d9bf3d5ce8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6729,6 +6729,12 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virBufferAddLit(&buf, ",l3-cache=off"); } + if (def->cpu && def->cpu->phys_bits > 0) + virBufferAsprintf(&buf, ",phys-bits=%u", def->cpu->phys_bits); + + if (def->cpu && def->cpu->host_phys_bits) + virBufferAddLit(&buf, ",host-phys-bits=on"); + cpu = virBufferContentAndReset(&cpu_buf); cpu_flags = virBufferContentAndReset(&buf); -- 2.24.3

1 0

[PATCH 0/1] set vm physical bits(phys_bits)
by Paul Schlacter 24 Mar '21

24 Mar '21

wlfightup (1): set vm physical bits(phys_bits) src/conf/cpu_conf.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 2 ++ src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 42 insertions(+) -- 2.24.3

1 0

[libvirt PATCH] ci: Refresh information
by Andrea Bolognani 24 Mar '21

24 Mar '21

Notable changes: * HAL is no longer installed on FreeBSD; * the native version of libwsman is no longer installed in containers intended for cross-compilation; * Meson 0.55 is used instead of 0.54 when installing from PyPI. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/275067437 ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/containers/centos-7.Dockerfile | 4 ++-- ci/containers/centos-8.Dockerfile | 4 ++-- ci/containers/centos-stream.Dockerfile | 4 ++-- ci/containers/debian-10-cross-aarch64.Dockerfile | 4 ++-- ci/containers/debian-10-cross-armv6l.Dockerfile | 4 ++-- ci/containers/debian-10-cross-armv7l.Dockerfile | 4 ++-- ci/containers/debian-10-cross-i686.Dockerfile | 4 ++-- ci/containers/debian-10-cross-mips.Dockerfile | 4 ++-- ci/containers/debian-10-cross-mips64el.Dockerfile | 4 ++-- ci/containers/debian-10-cross-mipsel.Dockerfile | 4 ++-- ci/containers/debian-10-cross-ppc64le.Dockerfile | 4 ++-- ci/containers/debian-10-cross-s390x.Dockerfile | 4 ++-- ci/containers/debian-10.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-aarch64.Dockerfile | 2 +- ci/containers/debian-sid-cross-armv6l.Dockerfile | 2 +- ci/containers/debian-sid-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-sid-cross-i686.Dockerfile | 2 +- ci/containers/debian-sid-cross-mips64el.Dockerfile | 2 +- ci/containers/debian-sid-cross-mipsel.Dockerfile | 2 +- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 2 +- ci/containers/debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/fedora-32.Dockerfile | 2 +- ci/containers/fedora-33.Dockerfile | 2 +- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 +-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 +-- ci/containers/fedora-rawhide.Dockerfile | 2 +- ci/containers/opensuse-152.Dockerfile | 4 ++-- ci/containers/ubuntu-1804.Dockerfile | 4 ++-- ci/containers/ubuntu-2004.Dockerfile | 4 ++-- 32 files changed, 48 insertions(+), 50 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 5add0fb058..f50c3da65f 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 5add0fb058..f50c3da65f 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile index c499e7a19d..c71d1bcbcf 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/centos:7 RUN yum update -y && \ @@ -124,7 +124,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 e600598329..21cf916d8d 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/centos:8 RUN dnf update -y && \ @@ -96,7 +96,7 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 2b51eccc8d..0e66d4ae99 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/centos:8 RUN dnf install -y centos-release-stream && \ @@ -98,7 +98,7 @@ RUN dnf install -y centos-release-stream && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 272c809f17..31bf9fce7a 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -118,7 +118,7 @@ cpu = 'aarch64'\n\ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 e877b5e0b3..df0dd1b649 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -117,7 +117,7 @@ cpu = 'arm'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 d8cbc82334..0b07fcaa2e 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -118,7 +118,7 @@ cpu = 'armhf'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 ed056c31b5..9c3f2cdfd4 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -117,7 +117,7 @@ cpu = 'i686'\n\ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 969964faf2..148b43f7e2 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -117,7 +117,7 @@ cpu = 'mips'\n\ endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 a78492971f..df782b4b9b 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -117,7 +117,7 @@ cpu = 'mips64el'\n\ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 857173f261..a61a9fc365 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -117,7 +117,7 @@ cpu = 'mipsel'\n\ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 349cc1e487..46aab91e28 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -117,7 +117,7 @@ cpu = 'powerpc64le'\n\ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 e79381e69a..80f2564caf 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -117,7 +117,7 @@ cpu = 's390x'\n\ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 bac8589f2c..ce4c27899a 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,7 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 f0831c1fed..8ea2e6172d 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index c3661e2e7d..cc5ca035de 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 4322046e8d..de53f630c9 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index a48ff3471c..3b351b58cb 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 9f3325b546..56979fb07e 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 39993132ac..f7e9aa98d1 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index ebb4389e69..149c5e26be 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 8cc22358cf..61da0135c2 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index a1ef98e67c..ce05150c09 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile index 71d391b7bd..6ea7537006 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 5fb30380b0..aeddc7ec30 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index c718778acb..a72b9a56f7 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -35,7 +35,6 @@ exec "$@"' > /usr/bin/nosync && \ iptables \ iscsi-initiator-utils \ kmod \ - libwsman-devel \ libxml2 \ libxslt \ lvm2 \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 6058d0c0b2..abcf18831b 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -35,7 +35,6 @@ exec "$@"' > /usr/bin/nosync && \ iptables \ iscsi-initiator-utils \ kmod \ - libwsman-devel \ libxml2 \ libxslt \ lvm2 \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 027e8a7c41..fde3699202 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile index 00521f7796..2fba8969f6 100644 --- a/ci/containers/opensuse-152.Dockerfile +++ b/ci/containers/opensuse-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ @@ -92,7 +92,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 3d18274d00..9cfdc21594 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 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 9018c9d22e..5616825c46 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d2… FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -99,7 +99,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ - meson==0.54.0 + meson==0.55.3 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" -- 2.26.3

2 1

[PATCH] Virtuozzo URL has been changed (RESEND FROM GITLAB)
by Erik Skultety 24 Mar '21

24 Mar '21

From: Yaroslav Kargin <ykargin(a)virtuozzo.com> Signed-off-by: Yaroslav Kargin <ykargin(a)virtuozzo.com> --- This patch was merged in gitlab, resending it to the list. docs/drvvirtuozzo.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drvvirtuozzo.html.in b/docs/drvvirtuozzo.html.in index 8813d00ad8..e47f72bad1 100644 --- a/docs/drvvirtuozzo.html.in +++ b/docs/drvvirtuozzo.html.in @@ -12,7 +12,7 @@ <h2><a id="project">Project Links</a></h2> <ul> <li> - The <a href="http://www.odin.com/products/virtuozzo/">Virtuozzo</a> Solution. + The <a href="https://www.virtuozzo.com/">Virtuozzo</a> Solution. </li> </ul> -- 2.30.2

1 0

[PATCH 0/1] set vm physical bits(phys_bits)
by Wang,Liang(ACG CCN) 24 Mar '21

24 Mar '21

wangliang (1): set vm physical bits(phys_bits) src/conf/cpu_conf.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 2 ++ src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 42 insertions(+) -- 2.24.3

1 0

[libvirt PATCH 0/5] Formalize the deprecation of arguments in virsh
by Tim Wiederhake 24 Mar '21

24 Mar '21

virsh has several arguments that are better not used. This series introduces a formal way of marking them as deprecated. Tim Wiederhake (5): vsh: Set default log level to "warning" vsh: Introduce flag for deprecated options vsh: setmem: Mark '--kilobytes' as deprecated vsh: setmaxmem: Mark '--kilobytes' as deprecated vsh: secret-set-value: Mark '--base64' as deprecated tools/virsh-domain.c | 2 ++ tools/virsh-secret.c | 3 +-- tools/vsh.c | 11 +++++++++-- tools/vsh.h | 11 ++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) -- 2.26.2

4 16

[libvirt PATCH v2 0/3] docs: Convert html.in to rst (volume 1)
by Erik Skultety 23 Mar '21

23 Mar '21

since v1: - fixed a broken heading reference from a kbase article caused by RST convers= ion - dropped architecture.html.in along with images v1: https://listman.redhat.com/archives/libvir-list/2021-March/msg00584.html Erik Skultety (3): docs: html.in: Drop the architecture page docs: html.in: Convert auth to rst docs: kbase: Fix a broken formatdomain reference in locking-sanlock docs/architecture.gif | Bin 5571 -> 0 bytes docs/architecture.html.in | 82 -------- docs/architecture.svg | 239 --------------------- docs/auth.html.in | 368 --------------------------------- docs/auth.rst | 343 ++++++++++++++++++++++++++++++ docs/kbase/locking-sanlock.rst | 4 +- docs/meson.build | 4 +- 7 files changed, 346 insertions(+), 694 deletions(-) delete mode 100644 docs/architecture.gif delete mode 100644 docs/architecture.html.in delete mode 100644 docs/architecture.svg delete mode 100644 docs/auth.html.in create mode 100644 docs/auth.rst --=20 2.29.2

2 5

[PATCH v2] qemu: don't raise error upon interface update without <frames/> for <rx/> in coalesce
by Kristina Hanicova 23 Mar '21

23 Mar '21

With this, incomplete XML without <frames/> for <rx/> in coalesce won't raise error as before. It will leave the coalesce parameter empty, thanks to passing it as a parameter and return an integer to indicate error state - previously it returned pointer (or NULL for both error and incomplete XML). I also added a test case to test this functionality in the qemuxml2xmltest. The code went through some refactoring: * change of a condition * addition of a parameter * change of order, that allowed removal of VIR_FREE * removal of redundant labels and variables Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1535930 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- diff to v1: - Added qemuxml2xmlout testcase, per Martin's review src/conf/domain_conf.c | 25 +++++++++-------------- tests/qemuxml2argvdata/net-coalesce.xml | 9 ++++++++ tests/qemuxml2xmloutdata/net-coalesce.xml | 8 +++++++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b731744f04..798594f520 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7516,11 +7516,11 @@ virDomainNetIPInfoParseXML(const char *source, } -static virNetDevCoalescePtr +static int virDomainNetDefCoalesceParseXML(xmlNodePtr node, - xmlXPathContextPtr ctxt) + xmlXPathContextPtr ctxt, + virNetDevCoalescePtr *coalesce) { - virNetDevCoalescePtr ret = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned long long tmp = 0; g_autofree char *str = NULL; @@ -7529,15 +7529,13 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, str = virXPathString("string(./rx/frames/@max)", ctxt); if (!str) - return NULL; - - ret = g_new0(virNetDevCoalesce, 1); + return 0; if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { virReportError(VIR_ERR_XML_DETAIL, _("cannot parse value '%s' for coalesce parameter"), str); - goto error; + return -1; } if (tmp > UINT32_MAX) { @@ -7545,15 +7543,13 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, _("value '%llu' is too big for coalesce " "parameter, maximum is '%lu'"), tmp, (unsigned long) UINT32_MAX); - goto error; + return -1; } - ret->rx_max_coalesced_frames = tmp; - return ret; + *coalesce = g_new0(virNetDevCoalesce, 1); + (*coalesce)->rx_max_coalesced_frames = tmp; - error: - VIR_FREE(ret); - return NULL; + return 0; } static void @@ -11517,8 +11513,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, node = virXPathNode("./coalesce", ctxt); if (node) { - def->coalesce = virDomainNetDefCoalesceParseXML(node, ctxt); - if (!def->coalesce) + if (virDomainNetDefCoalesceParseXML(node, ctxt, &def->coalesce) < 0) goto error; } diff --git a/tests/qemuxml2argvdata/net-coalesce.xml b/tests/qemuxml2argvdata/net-coalesce.xml index bdcf786429..6fa3641e7d 100644 --- a/tests/qemuxml2argvdata/net-coalesce.xml +++ b/tests/qemuxml2argvdata/net-coalesce.xml @@ -55,6 +55,15 @@ </rx> </coalesce> </interface> + <interface type='network'> + <source network='default'/> + <mac address='52:54:00:e5:48:60'/> + <model type='virtio'/> + <coalesce> + <rx> + </rx> + </coalesce> + </interface> <serial type='pty'> <target port='0'/> </serial> diff --git a/tests/qemuxml2xmloutdata/net-coalesce.xml b/tests/qemuxml2xmloutdata/net-coalesce.xml index 3a37587dde..452ed94de3 100644 --- a/tests/qemuxml2xmloutdata/net-coalesce.xml +++ b/tests/qemuxml2xmloutdata/net-coalesce.xml @@ -56,6 +56,12 @@ <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> + <interface type='network'> + <mac address='52:54:00:e5:48:60'/> + <source network='default'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </interface> <serial type='pty'> <target type='isa-serial' port='0'> <model name='isa-serial'/> @@ -67,7 +73,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </memballoon> </devices> </domain> -- 2.29.2

2 1

[libvirt PATCH] conf: allow for a partial match when searching for an <interface>
by Laine Stump 23 Mar '21

23 Mar '21

Commit 114e3b42 modified virDomainNetFindIdx() to compare the alias name of the <interface> being matched (in addition to already-existing match of MAC address and PCI/CCW address). This was done in response to https://bugzilla.redhat.com/1926190 which complained that it wasn't possible to unplug an interface that had the same MAC address as another <interface> (which is the way interfaces are setup when using <teaming> - the "team" is identified in the guest virtio-net driver by looking for another interface with the same MAC as the virtio-net device) - the reporter of that bug did not have PCI addresses of the devices easily available when attempting to unplug one of the two devices, and so needed some other way to disambiguate the two interfaces with matching MACs. Unfortunately, this caused a regression which was caught during QE testing - in the past it had been possible to use virDomainUpdateDevice (which also calls virDomainNetFindIdx()) to modify the alias name of an existing interface - with the change in commit 114e3b42 this was no longer possible (since we would try to match the new alias, which would of course always fail). The solution to this regression is to allow mismatched alias names when calling virDomainNetFindIdx() for purposes of updating a device (indicated by the new bool argument "partialMatch"). When calling for unplug the old behavior is maintained - in that case the alias name must still match. Because we need to keep track of potentially multiple "partial" matches so that we can go back later and try to disambiguate when necessary, I needed an array to hold the indexes of all the matches during the "first round". There is guidance in glib-adoption.rst saying that new libvirt code should prefer GArray/GPtrArray. A couple of adventurous souls have used GPtrArray, but so far nobody has used GArray, and I decided this was a good chance to try that out. It went okay. Reported-by: Yalan Zhang <yalzhang(a)redhat.com> Signed-off-by: Laine Stump <laine(a)redhat.com> --- I realized while writing this patch that an update-device test case in qemuhotplugtest would have caught this regression and so I probably should add such a test case to prevent it happening again, but the testing harness for update-device was only ever made to work for graphics devices, meaning there's some unknown amount of investigating and rejiggering that needs to be done to make such a test work (a quick attempt failed). Since someone is waiting on the fix for this regression, I'm hoping that I can get a reprieve on the "add a test case to catch thre regression" part that should accompany a bugfix like this in exchange for a promise that I will start looking into that immediately after I get this pushed (and then backported so testing of the bugzilla above can be completed) src/conf/domain_conf.c | 207 +++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 2 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 6 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hotplug.c | 4 +- 6 files changed, 145 insertions(+), 84 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 95602ae57e..f071bf93d0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16871,109 +16871,170 @@ int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net) * virDomainNetFindIdx: * @def: domain definition * @net: interface definition + * @matchPartial: true if mismatched alias is still a match * - * Lookup domain's network interface based on passed @net - * definition. If @net's MAC address was auto generated, - * the MAC comparison is ignored. + * Find a network interface from the domain's nets list by looking for + * a match to @net. The following attributes are compared when + * specified in @net: MAC address, PCI/CCW address, and alias name. + * + * If matchPartial is true, then an entry with mismatched alias name + * still counts as a match (as long as everything else that was + * specified matches). + * + * If @net matches multiple items in nets, that is an error. * * Return: index of match if unique match found, * -1 otherwise and an error is logged. */ int -virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) +virDomainNetFindIdx(virDomainDefPtr def, + virDomainNetDefPtr net, + bool matchPartial) { + guint gi; size_t i; - int matchidx = -1; + g_autoptr(GArray) matches + = g_array_sized_new(false, false, sizeof(size_t), def->nnets); char mac[VIR_MAC_STRING_BUFLEN]; bool MACAddrSpecified = !net->mac_generated; bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); bool CCWAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); + bool ambiguousPartial = false; + g_auto(virBuffer) errBuf = VIR_BUFFER_INITIALIZER; + + /* initialize the matches array to contain the indexes for all + * NetDefs. We will then go through this array for each field we + * want to match on, removing the indexes of NetDefs that don't + * match for that field. At the end we'll have no match, one + * match, or ambiguous (multiple) matches. + */ + for (i = 0; i < def->nnets; i++) + g_array_append_val(matches, i); + + for (gi = 0; gi < matches->len;) { + + i = g_array_index(matches, size_t, gi); + /* + * mac/pci/ccw addresses must always match if they are + * specified in the search template object + */ - for (i = 0; i < def->nnets; i++) { if (MACAddrSpecified && - virMacAddrCmp(&def->nets[i]->mac, &net->mac) != 0) + virMacAddrCmp(&def->nets[i]->mac, &net->mac) != 0) { + g_array_remove_index(matches, gi); continue; + } if (PCIAddrSpecified && !virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, - &net->info.addr.pci)) + &net->info.addr.pci)) { + g_array_remove_index(matches, gi); continue; + } if (CCWAddrSpecified && !virDomainDeviceCCWAddressEqual(&def->nets[i]->info.addr.ccw, - &net->info.addr.ccw)) - continue; - - if (net->info.alias && - STRNEQ_NULLABLE(def->nets[i]->info.alias, net->info.alias)) { - continue; + &net->info.addr.ccw)) { + g_array_remove_index(matches, gi); + continue; } - if (matchidx >= 0) { - /* there were multiple matches on mac address, and no - * qualifying guest-side PCI/CCW address was given, so we must - * fail (NB: a USB address isn't adequate, since it may - * specify only vendor and product ID, and there may be - * multiples of those. - */ - if (MACAddrSpecified) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("multiple devices matching MAC address %s found"), - virMacAddrFormat(&net->mac, mac)); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("multiple matching devices found")); - } + /* this NetDef matches all the mandatory fields, so keep it for now */ + gi++; + } - return -1; - } + if (matches->len == 0) + goto cleanup; - matchidx = i; - } - - if (matchidx < 0) { - if (MACAddrSpecified && PCIAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device matching MAC address %s found on " - VIR_PCI_DEVICE_ADDRESS_FMT), - virMacAddrFormat(&net->mac, mac), - net->info.addr.pci.domain, - net->info.addr.pci.bus, - net->info.addr.pci.slot, - net->info.addr.pci.function); - } else if (MACAddrSpecified && CCWAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device matching MAC address %s found on " - VIR_CCW_DEVICE_ADDRESS_FMT), - virMacAddrFormat(&net->mac, mac), - net->info.addr.ccw.cssid, - net->info.addr.ccw.ssid, - net->info.addr.ccw.devno); - } else if (PCIAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device found on " VIR_PCI_DEVICE_ADDRESS_FMT), - net->info.addr.pci.domain, - net->info.addr.pci.bus, - net->info.addr.pci.slot, - net->info.addr.pci.function); - } else if (CCWAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device found on " VIR_CCW_DEVICE_ADDRESS_FMT), - net->info.addr.ccw.cssid, - net->info.addr.ccw.ssid, - net->info.addr.ccw.devno); - } else if (MACAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device matching MAC address %s found"), - virMacAddrFormat(&net->mac, mac)); - } else { - virReportError(VIR_ERR_DEVICE_MISSING, "%s", - _("no matching device found")); + /* A "partial match" is when everything but alias matches. When + * we've already determined that exactly one NetDef matches + * everything else that was specified in the object we're trying + * to match, counting this "partial match" as a success allows for + * finding an interface based on MAC/pci address, with the intent + * to update the alias (i.e. the alias name doesn't match because + * it's the *new* alias name we want to change to). + * + * We can't *always* ignore the alias though, since it is + * sometimes used to disambiguate between multiple NetDefs when + * searching for a NetDef to remove (rather than update) - in + * particular if there are multiple NetDefs with the same MAC + * address, and the caller didn't specify PCI address (because + * they don't know it). Obviously when it's necessary to look at + * the alias in order to disambiguate between two NetDefs, it + * won't be possible to update the alias; updating other + * attributes, or unplugging the device, shouldn't be a problem + * though. + */ + if (matchPartial) { + if (matches->len == 1) + goto cleanup; + + /* by the time we've checked the multiple remaining NetDefs + * for a match to the alias, we'll no longer have the + * information about ambiguity in the match prior to checking + * aliases, but we'll need to know that in order to report the + * proper error, so save that fact now. + */ + ambiguousPartial = true; + } + + if (net->info.alias) { + for (gi = 0; gi < matches->len;) { + i = g_array_index(matches, size_t, gi); + + if (STRNEQ_NULLABLE(def->nets[i]->info.alias, net->info.alias)) + g_array_remove_index(matches, gi); + else + gi++; } } - return matchidx; + + cleanup: + if (matches->len == 1) + return g_array_index(matches, size_t, 0); + + /* make a string describing all the match terms */ + if (MACAddrSpecified) + virBufferAsprintf(&errBuf, "MAC address '%s' ", virMacAddrFormat(&net->mac, mac)); + + if (PCIAddrSpecified) { + g_autofree char *pciAddrStr = virPCIDeviceAddressAsString(&net->info.addr.pci); + + virBufferAsprintf(&errBuf, "PCI address '%s' ", pciAddrStr); + } + + if (CCWAddrSpecified) { + virBufferAsprintf(&errBuf, "CCW address '" VIR_CCW_DEVICE_ADDRESS_FMT "' ", + net->info.addr.ccw.cssid, + net->info.addr.ccw.ssid, + net->info.addr.ccw.devno); + } + + if (net->info.alias) + virBufferAsprintf(&errBuf, "alias name '%s' ", net->info.alias); + + virBufferTrim(&errBuf, " "); + + /* we either matched too many... */ + + if (matches->len > 1 || ambiguousPartial) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("found multiple devices matching requested <interface> (%s)"), + virBufferContentAndReset(&errBuf)); + return -1; + } + + + /* ...or not enough + * (at this point we know matches->len == 0, no need to check) + */ + + virReportError(VIR_ERR_OPERATION_FAILED, + _("found no devices matching requested <interface> (%s)"), + virBufferContentAndReset(&errBuf)); + return -1; } bool diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 87bc7e8625..da32016b01 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3554,7 +3554,7 @@ virDomainDiskRemove(virDomainDefPtr def, size_t i); virDomainDiskDefPtr virDomainDiskRemoveByName(virDomainDefPtr def, const char *name); -int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net); +int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net, bool matchPartial); virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device); virDomainNetDefPtr virDomainNetFindByName(virDomainDefPtr def, const char *ifname); bool virDomainHasNet(virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 830634b2bd..bfbfdf94e6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3861,7 +3861,7 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver, libxl_device_nic_init(&nic); - if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; @@ -3990,7 +3990,7 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8e0ec82e0b..d96a6f5f2e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3096,7 +3096,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, switch (dev->type) { case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, true)) < 0) return -1; oldDev.data.net = vmdef->nets[idx]; @@ -3150,7 +3150,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ @@ -3962,7 +3962,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, const virNetDevVPortProfile *vport = NULL; virErrorPtr save_err = NULL; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f3f8caab44..df69782f9c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7159,7 +7159,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, break; case VIR_DOMAIN_DEVICE_NET: - if ((idx = virDomainNetFindIdx(vm->def, dev->data.net)) >= 0) { + if ((idx = virDomainNetFindIdx(vm->def, dev->data.net, true)) >= 0) { oldDev.data.net = vm->def->nets[idx]; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev, VIR_DOMAIN_DEVICE_ACTION_UPDATE, @@ -7459,7 +7459,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ @@ -7686,7 +7686,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((pos = virDomainNetFindIdx(vmdef, net)) < 0) + if ((pos = virDomainNetFindIdx(vmdef, net, true)) < 0) return -1; oldDev.data.net = vmdef->nets[pos]; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 58d2abb862..f0cf75e547 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3512,7 +3512,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, g_autoptr(virConnect) conn = NULL; virErrorPtr save_err = NULL; - if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0) + if ((changeidx = virDomainNetFindIdx(vm->def, newdev, true)) < 0) goto cleanup; devslot = &vm->def->nets[changeidx]; olddev = *devslot; @@ -5664,7 +5664,7 @@ qemuDomainDetachPrepNet(virDomainObjPtr vm, { int detachidx; - if ((detachidx = virDomainNetFindIdx(vm->def, match)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, match, false)) < 0) return -1; *detach = vm->def->nets[detachidx]; -- 2.30.2

3 4

[libvirt PATCH] ci: Drop FreeBSD 11 build
by Andrea Bolognani 23 Mar '21

23 Mar '21

FreeBSD 12 was released in December 2018, so according to our platform support policy we can now drop support for the previous major release. It would be going EOL in September anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 10 ---------- ci/cirrus/freebsd-11.vars | 8 -------- 2 files changed, 18 deletions(-) delete mode 100644 ci/cirrus/freebsd-11.vars diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a059ad229c..cbc1292839 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -404,16 +404,6 @@ x64-ubuntu-2004: variables: NAME: ubuntu-2004 -x64-freebsd-11-build: - extends: .cirrus_build_job - variables: - NAME: freebsd-11 - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-11-4 - UPDATE_COMMAND: pkg update - INSTALL_COMMAND: pkg install -y - x64-freebsd-12-build: extends: .cirrus_build_job variables: diff --git a/ci/cirrus/freebsd-11.vars b/ci/cirrus/freebsd-11.vars deleted file mode 100644 index 5add0fb058..0000000000 --- a/ci/cirrus/freebsd-11.vars +++ /dev/null @@ -1,8 +0,0 @@ -PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' -CCACHE='/usr/local/bin/ccache' -MAKE='/usr/local/bin/gmake' -NINJA='/usr/local/bin/ninja' -PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' -- 2.26.3

2 1

[PATCH 0/2] domain_conf: Don't leak def->os.firmwareFeatures
by Michal Privoznik 23 Mar '21

23 Mar '21

See 2/2. Michal Prívozník (2): domain_conf: Separate virDomainOS clear into a function domain_conf: Don't leak def->os.firmwareFeatures src/conf/domain_conf.c | 55 ++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 23 deletions(-) -- 2.26.2

2 3

[PATCH 1/1] domain_cgroup.c: update domain after setting blkio.weight
by Daniel Henrique Barboza 23 Mar '21

23 Mar '21

Commit ac87d3520ad5 consolidated common cgroup code between the QEMU and lxc drivers in domain_cgroup.c. In this process, in virDomainCgroupSetupDomainBlkioParameters(), a call to virCgroupGetBlkioWeight() went missing. The result is that 'virsh blkiotune' is setting the blkio.weight for the guest in the host cgroup, but not on the domain XML, because virCgroupGetBlkioWeight() is also used to write the blkio.weight value in the domain object. Fix it by adding the virCgroupGetBlkioWeight() call in the virDomainCgroupSetupDomainBlkioParameters() helper. Fixes: 5493217b940ee9ea72b581270adb3ab9ba245148 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1941407 Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/hypervisor/domain_cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c index eb4fa20a9e..05e3aa7e6a 100644 --- a/src/hypervisor/domain_cgroup.c +++ b/src/hypervisor/domain_cgroup.c @@ -104,7 +104,8 @@ virDomainCgroupSetupDomainBlkioParameters(virCgroupPtr cgroup, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (virCgroupSetBlkioWeight(cgroup, params[i].value.ui) < 0) + if (virCgroupSetBlkioWeight(cgroup, params[i].value.ui) < 0 || + virCgroupGetBlkioWeight(cgroup, &def->blkio.weight) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) || -- 2.30.2

2 2

[PATCH 0/2] qemu: fix crash when deleting a dedefined
by Peter Krempa 23 Mar '21

23 Mar '21

Peter Krempa (2): qemuCheckpointDiscardBitmaps: Refuse to delete checkpoint with NULL bitmap name virDomainCheckpointRedefinePrep: Assign default bitmap names when domain XML is missing src/conf/checkpoint_conf.c | 3 +++ src/qemu/qemu_checkpoint.c | 7 +++++++ 2 files changed, 10 insertions(+) -- 2.29.2

2 3

[PATCH v4 00/13] qemu: Prepare for -object QAPIfication
by Peter Krempa 23 Mar '21

23 Mar '21

The qemu changes are merged upstream now, so this series is now required to ensure qemu compatibility with 'object_add' (support for 'props' sub-object is now dropped from qemu, but libvirt would still use it) and also to allow further updates of capability test data, as the build would fail now because of the tripwire which was added to prevent not noticing that -object was qapified. Peter Krempa (13): qemuxml2argvdata: Remove unused output file 'disk-network-tlsx509.x86_64-latest.args' virQEMUQAPISchemaTraverse: Fix quoting in comment qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED qemu: monitor: Make wrapping of 'props' of 'object-add' optional qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED qemu: command: Use JSON for QAPIfied -object directly tests: qemuxml2argv: Validate generation of JSON props for object-add qemumonitorjsontest: Remove tripwire guarding object-add QAPIfication tests: qemucapabilities: Update qemu caps for object-add qapification qemuxml2argvtest: Add DO_CAPS_LATEST variant of 'numatune-memnode' qemuxml2argvtest: Pin examples of -object usage to qemu-5.2 caps qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED src/libvirt_private.syms | 1 - src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 98 +- src/qemu/qemu_monitor.c | 78 +- src/qemu/qemu_monitor.h | 4 - src/qemu/qemu_qapi.c | 2 +- src/util/virqemu.c | 38 - src/util/virqemu.h | 3 - .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.replies | 5103 +++++++++++------ .../caps_6.0.0.x86_64.xml | 86 +- tests/qemumonitorjsontest.c | 14 - .../audio-alsa-best.x86_64-latest.args | 6 +- .../audio-alsa-full.x86_64-latest.args | 6 +- .../audio-alsa-minimal.x86_64-latest.args | 6 +- .../audio-coreaudio-best.x86_64-latest.args | 6 +- .../audio-coreaudio-full.x86_64-latest.args | 6 +- ...audio-coreaudio-minimal.x86_64-latest.args | 6 +- ...udio-default-nographics.x86_64-latest.args | 6 +- .../audio-default-sdl.x86_64-latest.args | 6 +- .../audio-default-spice.x86_64-latest.args | 6 +- .../audio-default-vnc.x86_64-latest.args | 6 +- .../audio-file-best.x86_64-latest.args | 6 +- .../audio-file-full.x86_64-latest.args | 6 +- .../audio-file-minimal.x86_64-latest.args | 6 +- .../audio-jack-full.x86_64-latest.args | 6 +- .../audio-jack-minimal.x86_64-latest.args | 6 +- .../audio-many-backends.x86_64-latest.args | 6 +- .../audio-none-best.x86_64-latest.args | 6 +- .../audio-none-full.x86_64-latest.args | 6 +- .../audio-none-minimal.x86_64-latest.args | 6 +- .../audio-oss-best.x86_64-latest.args | 6 +- .../audio-oss-full.x86_64-latest.args | 6 +- .../audio-oss-minimal.x86_64-latest.args | 6 +- .../audio-pulseaudio-best.x86_64-latest.args | 6 +- .../audio-pulseaudio-full.x86_64-latest.args | 6 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 6 +- .../audio-sdl-best.x86_64-latest.args | 6 +- .../audio-sdl-full.x86_64-latest.args | 6 +- .../audio-sdl-minimal.x86_64-latest.args | 6 +- .../audio-spice-best.x86_64-latest.args | 6 +- .../audio-spice-full.x86_64-latest.args | 6 +- .../audio-spice-minimal.x86_64-latest.args | 6 +- .../blkdeviotune-group-num.x86_64-latest.args | 6 +- ...blkdeviotune-max-length.x86_64-latest.args | 6 +- .../blkdeviotune-max.x86_64-latest.args | 6 +- .../channel-unix-guestfwd.x86_64-latest.args | 6 +- .../console-virtio-unix.x86_64-latest.args | 6 +- .../controller-virtio-scsi.x86_64-latest.args | 6 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 6 +- .../cpu-translation.x86_64-latest.args | 6 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 6 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +- .../disk-aio-io_uring.x86_64-latest.args | 6 +- .../disk-aio.x86_64-latest.args | 6 +- ...-backing-chains-noindex.x86_64-latest.args | 12 +- .../disk-cache.x86_64-latest.args | 6 +- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +- ...m-empty-network-invalid.x86_64-latest.args | 6 +- .../disk-cdrom-network.x86_64-latest.args | 6 +- .../disk-cdrom-tray.x86_64-latest.args | 6 +- .../disk-cdrom.x86_64-latest.args | 6 +- .../disk-copy_on_read.x86_64-latest.args | 6 +- .../disk-detect-zeroes.x86_64-latest.args | 6 +- .../disk-discard.x86_64-latest.args | 6 +- .../disk-error-policy.x86_64-latest.args | 6 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 6 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 6 +- .../disk-floppy.x86_64-latest.args | 6 +- .../disk-metadata-cache.x86_64-latest.args | 6 +- .../disk-network-gluster.x86_64-latest.args | 6 +- .../disk-network-http.x86_64-latest.args | 18 +- .../disk-network-iscsi.x86_64-latest.args | 18 +- .../disk-network-nbd.x86_64-latest.args | 6 +- .../disk-network-nfs.x86_64-latest.args | 6 +- .../disk-network-rbd.x86_64-latest.args | 12 +- .../disk-network-sheepdog.x86_64-latest.args | 6 +- ...isk-network-source-auth.x86_64-latest.args | 24 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 50 + ...isk-network-tlsx509-nbd.x86_64-latest.args | 18 +- .../disk-network-tlsx509.x86_64-latest.args | 90 - .../disk-nvme.x86_64-latest.args | 12 +- .../disk-readonly-disk.x86_64-latest.args | 6 +- .../disk-scsi-device-auto.x86_64-latest.args | 6 +- .../disk-scsi.x86_64-latest.args | 6 +- .../disk-shared.x86_64-latest.args | 6 +- .../disk-slices.x86_64-latest.args | 18 +- .../disk-transient.x86_64-latest.args | 6 +- .../disk-vhostuser.x86_64-latest.args | 8 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 55 + ...irtio-scsi-reservations.x86_64-latest.args | 14 +- .../eoi-disabled.x86_64-latest.args | 6 +- .../eoi-enabled.x86_64-latest.args | 6 +- .../fips-enabled.x86_64-latest.args | 6 +- .../floppy-drive-fat.x86_64-latest.args | 6 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +- .../genid-auto.x86_64-latest.args | 6 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 6 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +- .../graphics-egl-headless.x86_64-latest.args | 6 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +- .../graphics-vnc-power.x86_64-latest.args | 6 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 42 + ...graphics-vnc-tls-secret.x86_64-latest.args | 17 +- .../graphics-vnc-tls.x86_64-latest.args | 10 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 6 +- ...play-spice-egl-headless.x86_64-latest.args | 6 +- ...ev-display-spice-opengl.x86_64-latest.args | 6 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +- .../hostdev-scsi-lsi.x86_64-latest.args | 18 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 18 +- .../hugepages-memaccess3.x86_64-latest.args | 11 +- .../hugepages-nvdimm.x86_64-latest.args | 14 +- .../hyperv-off.x86_64-latest.args | 6 +- .../hyperv-panic.x86_64-latest.args | 6 +- .../hyperv-stimer-direct.x86_64-latest.args | 6 +- .../hyperv.x86_64-latest.args | 6 +- .../intel-iommu-aw-bits.x86_64-latest.args | 6 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 6 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 6 +- .../intel-iommu-eim.x86_64-latest.args | 6 +- .../intel-iommu.x86_64-latest.args | 6 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 57 + ...threads-virtio-scsi-pci.x86_64-latest.args | 10 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 6 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 112 + ...luks-disks-source-qcow2.x86_64-latest.args | 54 +- ...memory-default-hugepage.x86_64-latest.args | 9 +- .../memfd-memory-numa.x86_64-latest.args | 9 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 10 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 44 + ...ry-hotplug-nvdimm-align.x86_64-latest.args | 11 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 44 + ...ry-hotplug-nvdimm-label.x86_64-latest.args | 10 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 44 + ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 10 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 44 + ...hotplug-nvdimm-readonly.x86_64-latest.args | 10 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 10 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 45 + ...ory-hotplug-virtio-pmem.x86_64-latest.args | 10 +- .../mlock-off.x86_64-latest.args | 6 +- .../mlock-on.x86_64-latest.args | 6 +- .../net-vdpa.x86_64-latest.args | 6 +- .../net-vhostuser.x86_64-latest.args | 6 +- .../numatune-hmat.x86_64-latest.args | 16 +- .../numatune-memnode.x86_64-5.2.0.args | 43 + .../numatune-memnode.x86_64-latest.args | 43 + .../os-firmware-bios.x86_64-latest.args | 6 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +- ...os-firmware-efi-secboot.x86_64-latest.args | 6 +- .../os-firmware-efi.x86_64-latest.args | 6 +- .../parallel-unix-chardev.x86_64-latest.args | 6 +- ...cie-root-port-nohotplug.x86_64-latest.args | 6 +- .../pv-spinlock-disabled.x86_64-latest.args | 6 +- .../pv-spinlock-enabled.x86_64-latest.args | 6 +- .../qemu-ns.x86_64-latest.args | 6 +- .../serial-unix-chardev.x86_64-latest.args | 6 +- ...rtcard-passthrough-unix.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +- .../tpm-emulator.x86_64-latest.args | 6 +- .../tpm-passthrough-crb.x86_64-latest.args | 6 +- .../tpm-passthrough.x86_64-latest.args | 6 +- .../tseg-explicit-size.x86_64-latest.args | 6 +- .../usb-redir-unix.x86_64-latest.args | 6 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 10 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 10 +- ...host-user-gpu-secondary.x86_64-latest.args | 7 +- .../vhost-user-vga.x86_64-latest.args | 7 +- .../vhost-vsock-auto.x86_64-latest.args | 6 +- .../vhost-vsock.x86_64-latest.args | 6 +- ...eo-bochs-display-device.x86_64-latest.args | 6 +- ...video-qxl-device-vram64.x86_64-latest.args | 6 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 6 +- ...eo-ramfb-display-device.x86_64-latest.args | 6 +- .../virtio-9p-createmode.x86_64-latest.args | 6 +- .../virtio-9p-multidevs.x86_64-latest.args | 6 +- ...virtio-non-transitional.x86_64-latest.args | 8 +- ...-options-controller-ats.x86_64-latest.args | 6 +- ...ptions-controller-iommu.x86_64-latest.args | 6 +- ...tions-controller-packed.x86_64-latest.args | 6 +- ...virtio-options-disk-ats.x86_64-latest.args | 6 +- ...rtio-options-disk-iommu.x86_64-latest.args | 6 +- ...tio-options-disk-packed.x86_64-latest.args | 6 +- .../virtio-options-fs-ats.x86_64-latest.args | 6 +- ...virtio-options-fs-iommu.x86_64-latest.args | 6 +- ...irtio-options-fs-packed.x86_64-latest.args | 6 +- ...irtio-options-input-ats.x86_64-latest.args | 6 +- ...tio-options-input-iommu.x86_64-latest.args | 6 +- ...io-options-input-packed.x86_64-latest.args | 6 +- ...-options-memballoon-ats.x86_64-latest.args | 6 +- ...loon-freepage-reporting.x86_64-latest.args | 6 +- ...ptions-memballoon-iommu.x86_64-latest.args | 6 +- ...tions-memballoon-packed.x86_64-latest.args | 6 +- .../virtio-options-net-ats.x86_64-latest.args | 6 +- ...irtio-options-net-iommu.x86_64-latest.args | 6 +- ...rtio-options-net-packed.x86_64-latest.args | 6 +- .../virtio-options-rng-ats.x86_64-latest.args | 10 +- ...irtio-options-rng-iommu.x86_64-latest.args | 10 +- ...rtio-options-rng-packed.x86_64-latest.args | 10 +- ...irtio-options-video-ats.x86_64-latest.args | 6 +- ...tio-options-video-iommu.x86_64-latest.args | 6 +- ...io-options-video-packed.x86_64-latest.args | 6 +- .../virtio-options.x86_64-latest.args | 8 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 38 + .../virtio-rng-builtin.x86_64-latest.args | 8 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 39 + .../virtio-rng-egd-unix.x86_64-latest.args | 8 +- .../virtio-transitional.x86_64-latest.args | 8 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 6 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 6 +- .../x86_64-pc-graphics.x86_64-latest.args | 8 +- .../x86_64-pc-headless.x86_64-latest.args | 8 +- .../x86_64-q35-graphics.x86_64-latest.args | 8 +- .../x86_64-q35-headless.x86_64-latest.args | 8 +- tests/qemuxml2argvtest.c | 32 + 224 files changed, 4876 insertions(+), 2820 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args -- 2.29.2

2 15

Plans for the next release
by Jiri Denemark 23 Mar '21

23 Mar '21

We are getting close to the next release of libvirt. To aim for the release on Apr 01 I suggest entering the freeze on Froday Mar 26 and tagging RC2 on Tuesday Mar 30. I hope this works for everyone. Jirka

2 1

[PULL 0/2] MIPS patches for 2021-03-22
by Philippe Mathieu-Daudé 22 Mar '21

22 Mar '21

The following changes since commit bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-03-19 18:01:17 +0000) are available in the Git repository at: https://github.com/philmd/qemu.git tags/mips-fixes-20210322 for you to fetch changes up to 83bbc537a151730741c04e40d23711067330dab9: target/mips: Deprecate Trap-and-Emul KVM support (2021-03-22 11:28:04 +0100) ---------------------------------------------------------------- MIPS patches queue - Fix array overrun (Coverity CID 1450831) - Deprecate KVM TE (Trap-and-Emul) ---------------------------------------------------------------- Jiaxun Yang (1): target/mips: Deprecate Trap-and-Emul KVM support Peter Maydell (1): target/mips/mxu_translate.c: Fix array overrun for D16MIN/D16MAX docs/system/deprecated.rst | 9 +++++++++ target/mips/mxu_translate.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) -- 2.26.2

2 3

[libvirt PATCH v3 00/51] Refactor XML parsing boilerplate code
by Tim Wiederhake 22 Mar '21

22 Mar '21

This series replaces some recurring boilerplate code in src/conf/ regarding the extraction of a virTristate(Switch|Bool) XML attribute. The boilerplate code looks roughly like this, g_autofree char *str = NULL; if (str = virXMLPropString(node, ...)) { int val; if ((val = virTristateBoolTypeFromString(str)) <= 0) { virReportError(...) return -1; } def->... = 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. As a side effect, this makes the error messages for invalid values in these attributes much more consistent and catches some instances where e.g. `<foo bar="default"/>` would incorrectly be accepted. V1: https://listman.redhat.com/archives/libvir-list/2021-March/msg00853.html V2: https://listman.redhat.com/archives/libvir-list/2021-March/msg00994.html Changes since V2: * Fixed the -Wtautological-unsigned-enum-zero-compare issues in the first part of the series. These issues were solved later in the series, but this change makes it easier to bisect in the future. I was thinking about only re-sending the first couple of patches, but the latter part would have endet up with quite a few conflicts, so I am sending it in its entirety, again. Sorry for the spam! Cheers, Tim Tim Wiederhake (51): 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 virxml: Add virXMLPropTristateBool virxml: Add virXMLPropTristateSwitch domain_conf: Use virXMLPropTristateXXX in virDomainKeyWrapCipherDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVirtioOptionsParseXML domain_conf: Use virXMLPropTristateXXX in virDomainDeviceInfoParseXML domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNetworkParse domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNVMeParse domain_conf: Use virXMLPropTristateXXX in virDomainDiskDefDriverParseXML domain_conf: Use virXMLPropTristateXXX in virDomainActualNetDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceReconnectDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainNetDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseTCP domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseFile domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseLog domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLVNC domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSDL domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSpice domain_conf: Use virXMLPropTristateXXX in virDomainAudioCommonParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioJackParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioOSSParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainMemballoonDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainShmemDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainPerfEventDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainMemoryDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainIOMMUDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVsockDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainFeaturesDefParse domain_conf: Use virXMLPropTristateXXX in virDomainLoaderDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVcpuParse backup_conf: Use virXMLPropTristateXXX in virDomainBackupDiskDefParseXML backup_conf: Use virXMLPropTristateXXX in virDomainBackupDefParse device_conf: Use virXMLPropTristateXXX in virPCIDeviceAddressParseXML network_conf: Use virXMLPropTristateXXX in virNetworkForwardNatDefParseXML numa_conf: Use virXMLPropTristateXXX in virDomainNumaDefParseXML storage_adapter_conf: Use virXMLPropTristateXXX in virStorageAdapterParseXMLFCHost storage_conf: Use virXMLPropTristateXXX in virStoragePoolDefParseSource src/conf/backup_conf.c | 32 +- src/conf/device_conf.c | 8 +- src/conf/device_conf.h | 4 +- src/conf/domain_conf.c | 794 +++++++------------------------- src/conf/domain_conf.h | 28 +- src/conf/network_conf.c | 15 +- src/conf/numa_conf.c | 14 +- src/conf/storage_adapter_conf.c | 14 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 17 +- src/conf/storage_conf.h | 2 +- src/conf/storage_source_conf.h | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 3 +- src/qemu/qemu_hotplug.c | 2 +- src/util/virpci.h | 2 +- src/util/virxml.c | 82 ++++ src/util/virxml.h | 9 + 18 files changed, 301 insertions(+), 733 deletions(-) -- 2.26.2

3 56

[libvirt PATCH] qemu: Update asyncOwnerAPI when entering async job phase
by Jiri Denemark 22 Mar '21

22 Mar '21

In case an async job spans multiple APIs (e.g., incoming migration) the API that started the job is recorded as the asyncOwnerAPI even though it is no longer running and the owner thread is updated properly to the one currently handling the job. Let's also update asyncOwnerAPI to make it more obvious which is the current (or the most recent) API involved in the job. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domainjob.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index b58d6837ad..50cfc45f5b 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -711,7 +711,9 @@ qemuDomainObjSetJobPhase(virQEMUDriverPtr driver, qemuDomainAsyncJobTypeToString(priv->job.asyncJob), qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); - if (priv->job.asyncOwner && me != priv->job.asyncOwner) { + if (priv->job.asyncOwner == 0) { + priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); + } else if (me != priv->job.asyncOwner) { VIR_WARN("'%s' async job is owned by thread %llu", qemuDomainAsyncJobTypeToString(priv->job.asyncJob), priv->job.asyncOwner); -- 2.31.0

3 3

[libvirt PATCH 0/3] Misc Python-adjacent fixes
by Andrea Bolognani 22 Mar '21

22 Mar '21

Andrea Bolognani (3): gitignore: Ignore __pycache__ directory tests: Fix flake8 errors in virsh-auth syntax-check: Run flake8 on all Python scripts .gitignore | 3 +++ build-aux/syntax-check.mk | 6 ++++-- tests/virsh-auth | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 12 deletions(-) -- 2.26.3

2 8

[PATCH v2] target/mips: Deprecate Trap-and-Emul KVM support
by Jiaxun Yang 22 Mar '21

22 Mar '21

Upstream kernel had removed both host[1] and guest[2] support. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/commit/?id=4… [2]: https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/commit/?id=a… Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> --- v2: Fix up tittle and sphinx format (f4bug) Lost in the sea of emails :-) --- docs/system/deprecated.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 5e3a31c123..9286cdd475 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -292,6 +292,15 @@ The ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, and ``acl_remove`` commands are deprecated with no replacement. Authorization for VNC should be performed using the pluggable QAuthZ objects. +System accelerators +------------------- + +MIPS ``Trap-and-Emul`` KVM support (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''' + +The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed +from upstream kernel, declare it deprecated. + System emulator CPUS -------------------- -- 2.30.2

2 2

[libvirt PATCH 0/7] Change reallocation APIs to return void
by Jiri Denemark 22 Mar '21

22 Mar '21

2 8

[libvirt PATCH 0/2] qemu: Use g_auto* in a few more places
by Jiri Denemark 22 Mar '21

22 Mar '21

I'll be touching these functions soon, let's modernize them first. Jiri Denemark (2): qemu: Use g_autofree in qemuMigrationJobCheckStatus qemu: Use g_autoptr in qemuMonitorJSONSetCapabilities src/qemu/qemu_migration.c | 15 +++++---------- src/qemu/qemu_monitor_json.c | 19 ++++++++----------- 2 files changed, 13 insertions(+), 21 deletions(-) -- 2.31.0

2 3