- Devel - libvirt List Archives

[PATCH] qemu: support hotplug cdrom with usb/scsi bus
by minglei.liu 20 Jul '22

20 Jul '22

Qemu support hotplug cdrom device with usb or scsi bus, just unblock these devices in qemuDomainAttachDeviceDiskLiveInternal and qemuDomainDetachPrepDisk. Fixes: #261 Signed-off-by: minglei.liu <minglei.liu(a)smartx.com> --- src/qemu/qemu_hotplug.c | 13 +++- tests/qemuhotplugtest.c | 18 ++++++ .../qemuhotplug-cdrom-scsi.xml | 6 ++ .../qemuhotplug-cdrom-usb.xml | 6 ++ .../qemuhotplug-base-live+cdrom-scsi.xml | 60 +++++++++++++++++++ .../qemuhotplug-base-live+cdrom-usb.xml | 60 +++++++++++++++++++ 6 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 27e68370cf..d917086023 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -992,10 +992,9 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver, bool releaseSeclabel = false; int ret = -1; - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM || - disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("cdrom/floppy device hotplug isn't supported")); + _("floppy device hotplug isn't supported")); return -1; } @@ -1025,6 +1024,10 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cdrom device with virtio bus isn't supported")); + } if (qemuDomainEnsureVirtioAddress(&releaseVirtio, vm, dev) < 0) goto cleanup; break; @@ -5414,6 +5417,10 @@ qemuDomainDetachPrepDisk(virDomainObj *vm, case VIR_DOMAIN_DISK_DEVICE_CDROM: case VIR_DOMAIN_DISK_DEVICE_FLOPPY: + if ((virDomainDiskBus) disk->bus == VIR_DOMAIN_DISK_BUS_USB || + (virDomainDiskBus) disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { + break; + } virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("disk device type '%s' cannot be detached"), virDomainDiskDeviceTypeToString(disk->device)); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index e98d9845e8..3c9dac241a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -860,6 +860,24 @@ mymain(void) DO_TEST_DETACH("base-live", "guestfwd", false, false, "netdev_del", QMP_OK); + DO_TEST_ATTACH("base-live", "cdrom-usb", false, true, + "human-monitor-command", HMP("OK\\r\\n"), + "device_add", QMP_OK); + DO_TEST_DETACH("base-live", "cdrom-usb", true, true, + "device_del", QMP_OK); + DO_TEST_DETACH("base-live", "cdrom-usb", false, false, + "device_del", QMP_DEVICE_DELETED("usb-disk4") QMP_OK, + "human-monitor-command", HMP("")); + + DO_TEST_ATTACH("base-live", "cdrom-scsi", false, true, + "human-monitor-command", HMP("OK\\r\\n"), + "device_add", QMP_OK); + DO_TEST_DETACH("base-live", "cdrom-scsi", true, true, + "device_del", QMP_OK); + DO_TEST_DETACH("base-live", "cdrom-scsi", false, false, + "device_del", QMP_DEVICE_DELETED("scsi0-0-0-4") QMP_OK, + "human-monitor-command", HMP("")); + #define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail) \ do { \ cpudata.test = prefix; \ diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml new file mode 100644 index 0000000000..da8b94bb22 --- /dev/null +++ b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml @@ -0,0 +1,6 @@ +<disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/dev/null'/> + <target dev='sde' bus='scsi'/> + <readonly/> +</disk> diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml new file mode 100644 index 0000000000..efb974090c --- /dev/null +++ b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml @@ -0,0 +1,6 @@ +<disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/dev/null'/> + <target dev='sde' bus='usb'/> + <readonly/> +</disk> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml new file mode 100644 index 0000000000..c3242a582f --- /dev/null +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml @@ -0,0 +1,60 @@ +<domain type='kvm' id='7'> + <name>hotplug</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </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> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/dev/null'/> + <backingStore/> + <target dev='sde' bus='scsi'/> + <readonly/> + <alias name='scsi0-0-0-4'/> + <address type='drive' controller='0' bus='0' target='0' unit='4'/> + </disk> + <controller type='usb' index='0'> + <alias name='usb'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <alias name='ide'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <alias name='scsi0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <alias name='pci'/> + </controller> + <controller type='virtio-serial' index='0'> + <alias name='virtio-serial0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </controller> + <input type='mouse' bus='ps2'> + <alias name='input0'/> + </input> + <input type='keyboard' bus='ps2'> + <alias name='input1'/> + </input> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> + <seclabel type='none' model='none'/> +</domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml new file mode 100644 index 0000000000..89317f5dc8 --- /dev/null +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml @@ -0,0 +1,60 @@ +<domain type='kvm' id='7'> + <name>hotplug</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </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> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/dev/null'/> + <backingStore/> + <target dev='sde' bus='usb'/> + <readonly/> + <alias name='usb-disk4'/> + <address type='usb' bus='0' port='1'/> + </disk> + <controller type='usb' index='0'> + <alias name='usb'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <alias name='ide'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <alias name='scsi0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <alias name='pci'/> + </controller> + <controller type='virtio-serial' index='0'> + <alias name='virtio-serial0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </controller> + <input type='mouse' bus='ps2'> + <alias name='input0'/> + </input> + <input type='keyboard' bus='ps2'> + <alias name='input1'/> + </input> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> + <seclabel type='none' model='none'/> +</domain> -- 2.27.0

2 1

[PATCH] domain_conf: remove else after return / goto
by Kristina Hanicova 20 Jul '22

20 Jul '22

Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_conf.c | 55 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 44a01ab628..bc4b74c1c8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4084,8 +4084,8 @@ virDomainObjGetPersistentDef(virDomainXMLOption *xmlopt, if (domain->newDef) return domain->newDef; - else - return domain->def; + + return domain->def; } @@ -4223,8 +4223,8 @@ virDomainObjGetOneDefState(virDomainObj *vm, if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG) return vm->newDef; - else - return vm->def; + + return vm->def; } @@ -6029,7 +6029,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, VIR_XML_PROP_NONZERO, &scsisrc->sgio)) < 0) { return -1; - } else if (rv > 0) { + } + + if (rv > 0) { if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { virReportError(VIR_ERR_XML_ERROR, "%s", _("sgio is only supported for scsi host device")); @@ -6041,8 +6043,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, VIR_XML_PROP_NONE, &scsisrc->rawio)) < 0) { return -1; - } else if (rv > 0 && - def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { + } + + if (rv > 0 && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { virReportError(VIR_ERR_XML_ERROR, "%s", _("rawio is only supported for scsi host device")); return -1; @@ -8056,15 +8059,15 @@ virDomainControllerModelTypeFromString(const virDomainControllerDef *def, { if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) return virDomainControllerModelSCSITypeFromString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) return virDomainControllerModelUSBTypeFromString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) return virDomainControllerModelPCITypeFromString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) return virDomainControllerModelIDETypeFromString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) return virDomainControllerModelVirtioSerialTypeFromString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA) return virDomainControllerModelISATypeFromString(model); return -1; @@ -8077,15 +8080,15 @@ virDomainControllerModelTypeToString(virDomainControllerDef *def, { if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) return virDomainControllerModelSCSITypeToString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) return virDomainControllerModelUSBTypeToString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) return virDomainControllerModelPCITypeToString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) return virDomainControllerModelIDETypeToString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) return virDomainControllerModelVirtioSerialTypeToString(model); - else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA) return virDomainControllerModelISATypeToString(model); return NULL; @@ -9915,9 +9918,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def, ctxt->node = cur; - if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0) { + if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0) goto error; - } else if (nsources > 0) { + + if (nsources > 0) { /* Parse only the first source element since only one is used * for chardev devices, the only exception is UDP type, where * user can specify two source elements. */ @@ -9926,7 +9930,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def, _("only one source element is allowed for " "character device")); goto error; - } else if (nsources > 2) { + } + if (nsources > 2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("only two source elements are allowed for " "character device")); @@ -10006,9 +10011,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def, } } - if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0) { + if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0) goto error; - } else if (nlogs == 1) { + + if (nlogs == 1) { if (virDomainChrSourceDefParseLog(def, logs[0]) < 0) goto error; } else if (nlogs > 1) { @@ -10018,9 +10024,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def, goto error; } - if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0) { + if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0) goto error; - } else if (nprotocols == 1) { + + if (nprotocols == 1) { if (virDomainChrSourceDefParseProtocol(def, protocols[0]) < 0) goto error; } else if (nprotocols > 1) { -- 2.35.3

2 2

[PATCH] schemas: Update ref acpi for devices
by Han Han 20 Jul '22

20 Jul '22

According to a9fe9569ab, the <acpi index='NNN'/> is only for PCI devices. Remove the ref acpi from devices channel, smartcard, tpm, redirdev, panic, hub because none of them has PCI address. And add the ref acpi to iommu device. Fixes: a9fe9569ab Signed-off-by: Han Han <hhan(a)redhat.com> --- src/conf/schemas/domaincommon.rng | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index faa2561665..2f07c25430 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -5409,9 +5409,6 @@ <optional> <ref name="alias"/> </optional> - <optional> - <ref name="acpi"/> - </optional> <optional> <ref name="address"/> </optional> @@ -5453,9 +5450,6 @@ </interleave> </group> </choice> - <optional> - <ref name="alias"/> - </optional> <optional> <ref name="acpi"/> </optional> @@ -5486,9 +5480,6 @@ <optional> <ref name="alias"/> </optional> - <optional> - <ref name="acpi"/> - </optional> <optional> <ref name="address"/> </optional> @@ -5661,6 +5652,9 @@ </optional> </element> </optional> + <optional> + <ref name="acpi"/> + </optional> <optional> <ref name="address"/> </optional> @@ -5772,9 +5766,6 @@ <optional> <ref name="alias"/> </optional> - <optional> - <ref name="acpi"/> - </optional> <optional> <ref name="address"/> </optional> @@ -5794,9 +5785,6 @@ <optional> <ref name="alias"/> </optional> - <optional> - <ref name="acpi"/> - </optional> <optional> <ref name="address"/> </optional> @@ -8048,9 +8036,6 @@ <optional> <ref name="alias"/> </optional> - <optional> - <ref name="acpi"/> - </optional> <optional> <ref name="address"/> </optional> -- 2.37.1

2 1

[PATCH] domain_conf: rewrite if else condition
by Kristina Hanicova 20 Jul '22

20 Jul '22

This patch prevents nesting of if conditions and makes the code cleaner. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_conf.c | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 44a01ab628..6b81c61056 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5309,18 +5309,18 @@ virDomainDeviceAddressParseXML(xmlNodePtr address, { g_autofree char *type = virXMLPropString(address, "type"); - if (type) { - if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown address type '%s'"), type); - return -1; - } - } else { + if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No type specified for device address")); return -1; } + if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown address type '%s'"), type); + return -1; + } + switch ((virDomainDeviceAddressType) info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0) @@ -5996,20 +5996,20 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, * <hostdev>. (the functions we're going to call expect address * type to already be known). */ - if (type) { - if ((def->source.subsys.type - = virDomainHostdevSubsysTypeFromString(type)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host device source address type '%s'"), - type); - return -1; - } - } else { + if (!type) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing source address type")); return -1; } + if ((def->source.subsys.type + = virDomainHostdevSubsysTypeFromString(type)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown host device source address type '%s'"), + type); + return -1; + } + if (!(sourcenode = virXPathNode("./source", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <source> element in hostdev device")); @@ -6304,20 +6304,20 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, * <hostdev>. (the functions we're going to call expect address * type to already be known). */ - if (type) { - if ((def->source.caps.type - = virDomainHostdevCapsTypeFromString(type)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host device source address type '%s'"), - type); - return -1; - } - } else { + if (!type) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing source address type")); return -1; } + if ((def->source.caps.type + = virDomainHostdevCapsTypeFromString(type)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown host device source address type '%s'"), + type); + return -1; + } + if (!virXPathNode("./source", ctxt)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <source> element in hostdev device")); -- 2.35.3

2 1

[PATCH 0/5] hypervisor: move job object into hypervisor
by Kristina Hanicova 20 Jul '22

20 Jul '22

This series moves generalized qemu job object into hypervisor/ and replaces all other hypervisor-specific job objects. Kristina Hanicova (5): qemu & hypervisor: move job object into hypervisor hypervisor: domain_job: rename members in virDomainObjPrivateJobCallbacks LXC: use virDomainJobObj libxl: use virDomainJobObj CH: use virDomainJobObj src/ch/ch_domain.c | 4 +- src/ch/ch_domain.h | 9 +---- src/hypervisor/domain_job.h | 62 ++++++++++++++++++++++++++++++ src/libxl/libxl_domain.c | 6 +-- src/libxl/libxl_domain.h | 11 +----- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_domain.h | 9 +---- src/qemu/qemu_domain.c | 10 ++--- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_domainjob.c | 26 ++++++------- src/qemu/qemu_domainjob.h | 66 +++----------------------------- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration.h | 2 +- src/qemu/qemu_migration_params.c | 2 +- src/qemu/qemu_process.c | 12 +++--- 15 files changed, 106 insertions(+), 121 deletions(-) -- 2.35.3

2 6

[PATCH] hypervisor: domain_job: add and edit description
by Kristina Hanicova 20 Jul '22

20 Jul '22

Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/hypervisor/domain_job.c | 2 ++ src/hypervisor/domain_job.h | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 5939d93e47..6a0fbd42b3 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -1,4 +1,6 @@ /* + * domain_job.c: job functions shared between hypervisor drivers + * * Copyright (C) 2022 Red Hat, Inc. * SPDX-License-Identifier: LGPL-2.1-or-later */ diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 30f950ec23..b12e0c8e17 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -1,4 +1,6 @@ /* + * domain_job.h: job functions shared between hypervisor drivers + * * Copyright (C) 2022 Red Hat, Inc. * SPDX-License-Identifier: LGPL-2.1-or-later */ @@ -122,7 +124,8 @@ struct _virDomainJobData { char *errmsg; /* optional error message for failed completed jobs */ void *privateData; /* private data of hypervisors */ - virDomainJobDataPrivateDataCallbacks *privateDataCb; /* callbacks of private data, hypervisor based */ + virDomainJobDataPrivateDataCallbacks *privateDataCb; /* callbacks of private data, + hypervisor based */ }; -- 2.35.3

2 1

[PATCH] qemu: domainjob: remove async variable from qemuDomainObjBeginJobInternal()
by Kristina Hanicova 20 Jul '22

20 Jul '22

This patch removes variable 'async', which is used only once, and replaces it with direct comparison with an enum member. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_domainjob.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 1f6d976558..7c6b697959 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -875,7 +875,6 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, unsigned long long now; unsigned long long then; bool nested = job == VIR_JOB_ASYNC_NESTED; - bool async = job == VIR_JOB_ASYNC; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); const char *blocker = NULL; const char *agentBlocker = NULL; @@ -903,7 +902,8 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, then = now + QEMU_JOB_WAIT_TIME; retry: - if ((!async && job != VIR_JOB_DESTROY) && + if (job != VIR_JOB_ASYNC && + job != VIR_JOB_DESTROY && cfg->maxQueuedJobs && priv->job.jobsQueued > cfg->maxQueuedJobs) { goto error; -- 2.35.3

2 1

[libvirt PATCH] nodedev: support 'mtty' device for testing
by Jonathon Jongsma 20 Jul '22

20 Jul '22

It would be nice to be able to test the mediated device capabilities without having physical hardware which supports it. The 'mtty' kernel module presents a virtual parent device which is capable of creating 'fake' mediated devices, and as such it would be useful for testing. However, the 'mtty' device is not part of an existing device subsystem (e.g. PCI, etc), so libvirt ignores it and it does not get added to the node device list. And because it does not get added to the node device list, it cannot be used to create child mdevs using `virsh nodedev-create`. There is already a node device type capability VIR_NODE_DEV_CAP_MDEV_TYPES that indicates whether a device supports creating child mediated devices, but libvirt assumes that this is a nested capability (in other words, it assumes that the primary capability of a device is something like PCI). If we allow this MDEV_TYPES capability to be a primary device capability, then we can support virtual devices like 'mtty' as a parent for mediated devices. See https://bugzilla.redhat.com/show_bug.cgi?id=2107031 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/node_device_conf.c | 41 +++++++++++++++++++++++++++- src/conf/node_device_conf.h | 13 +++++++++ src/libvirt_private.syms | 2 ++ src/node_device/node_device_driver.c | 5 +++- src/node_device/node_device_udev.c | 25 +++++++++++++++++ src/util/virmdev.c | 28 +++++++++++++++++++ src/util/virmdev.h | 4 +++ 7 files changed, 116 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 364bb489bd..d5bfc098b2 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -772,6 +772,10 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def) data->ap_matrix.nmdev_types); break; case VIR_NODE_DEV_CAP_MDEV_TYPES: + virNodeDeviceCapMdevTypesFormat(&buf, + data->mdev_parent.mdev_types, + data->mdev_parent.nmdev_types); + break; case VIR_NODE_DEV_CAP_FC_HOST: case VIR_NODE_DEV_CAP_VPORTS: case VIR_NODE_DEV_CAP_VPD: @@ -2674,6 +2678,11 @@ virNodeDevCapsDefFree(virNodeDevCapsDef *caps) g_free(data->ap_matrix.mdev_types); break; case VIR_NODE_DEV_CAP_MDEV_TYPES: + for (i = 0; i < data->mdev_parent.nmdev_types; i++) + virMediatedDeviceTypeFree(data->mdev_parent.mdev_types[i]); + g_free(data->mdev_parent.mdev_types); + g_free(data->mdev_parent.address); + break; case VIR_NODE_DEV_CAP_DRM: case VIR_NODE_DEV_CAP_FC_HOST: case VIR_NODE_DEV_CAP_VPORTS: @@ -2729,6 +2738,11 @@ virNodeDeviceUpdateCaps(virNodeDeviceDef *def) &cap->data.ap_matrix) < 0) return -1; break; + case VIR_NODE_DEV_CAP_MDEV_TYPES: + if (virNodeDeviceGetMdevParentDynamicCaps(def->sysfs_path, + &cap->data.mdev_parent) < 0) + return -1; + break; /* all types that (supposedly) don't require any updates * relative to what's in the cache. @@ -2742,7 +2756,6 @@ virNodeDeviceUpdateCaps(virNodeDeviceDef *def) case VIR_NODE_DEV_CAP_FC_HOST: case VIR_NODE_DEV_CAP_VPORTS: case VIR_NODE_DEV_CAP_SCSI_GENERIC: - case VIR_NODE_DEV_CAP_MDEV_TYPES: case VIR_NODE_DEV_CAP_MDEV: case VIR_NODE_DEV_CAP_CCW_DEV: case VIR_NODE_DEV_CAP_VDPA: @@ -3193,6 +3206,24 @@ virNodeDeviceGetAPMatrixDynamicCaps(const char *sysfsPath, return 0; } +/* virNodeDeviceGetMdevParentDynamicCaps() get info that is stored in sysfs + * about devices related to this device, i.e. things that can change + * without this device itself changing. These must be refreshed + * anytime full XML of the device is requested, because they can + * change with no corresponding notification from the kernel/udev. + */ +int +virNodeDeviceGetMdevParentDynamicCaps(const char *sysfsPath, + virNodeDevCapMdevParent *mdev_parent) +{ + if (virNodeDeviceGetMdevTypesCaps(sysfsPath, + &mdev_parent->mdev_types, + &mdev_parent->nmdev_types) < 0) + return -1; + return 0; +} + + #else int @@ -3229,4 +3260,12 @@ virNodeDeviceGetAPMatrixDynamicCaps(const char *sysfsPath G_GNUC_UNUSED, return -1; } +int +virNodeDeviceGetMdevParentDynamicCaps(const char *sysfsPath G_GNUC_UNUSED, + virNodeDevCapMdevParent *mdev_parent G_GNUC_UNUSED) +{ + return -1; +} + + #endif /* __linux__ */ diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index a234b4147b..21622c62ac 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -306,6 +306,14 @@ struct _virNodeDevCapAPMatrix { size_t nmdev_types; }; + +typedef struct _virNodeDevCapMdevParent virNodeDevCapMdevParent; +struct _virNodeDevCapMdevParent { + virMediatedDeviceType **mdev_types; + size_t nmdev_types; + char *address; +}; + typedef struct _virNodeDevCapData virNodeDevCapData; struct _virNodeDevCapData { virNodeDevCapType type; @@ -327,6 +335,7 @@ struct _virNodeDevCapData { virNodeDevCapAPCard ap_card; virNodeDevCapAPQueue ap_queue; virNodeDevCapAPMatrix ap_matrix; + virNodeDevCapMdevParent mdev_parent; }; }; @@ -453,6 +462,10 @@ int virNodeDeviceGetAPMatrixDynamicCaps(const char *sysfsPath, virNodeDevCapAPMatrix *ap_matrix); +int +virNodeDeviceGetMdevParentDynamicCaps(const char *sysfsPath, + virNodeDevCapMdevParent *mdev_parent); + int virNodeDeviceUpdateCaps(virNodeDeviceDef *def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f4732f1742..1a5fce22e5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -866,6 +866,7 @@ virNodeDeviceDefParseNode; virNodeDeviceDefParseString; virNodeDeviceGetAPMatrixDynamicCaps; virNodeDeviceGetCSSDynamicCaps; +virNodeDeviceGetMdevParentDynamicCaps; virNodeDeviceGetPCIDynamicCaps; virNodeDeviceGetSCSIHostCaps; virNodeDeviceGetSCSITargetCaps; @@ -2723,6 +2724,7 @@ virMediatedDeviceListStealIndex; virMediatedDeviceModelTypeFromString; virMediatedDeviceModelTypeToString; virMediatedDeviceNew; +virMediatedDeviceParentGetAddress; virMediatedDeviceSetUsedBy; virMediatedDeviceTypeFree; virMediatedDeviceTypeReadAttrs; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 0178ae8b66..fa3cfcf24c 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -672,6 +672,10 @@ nodeDeviceObjFormatAddress(virNodeDeviceObj *obj) addr = g_strdup(caps->data.ap_matrix.addr); break; + case VIR_NODE_DEV_CAP_MDEV_TYPES: + addr = g_strdup(caps->data.mdev_parent.address); + break; + case VIR_NODE_DEV_CAP_SYSTEM: case VIR_NODE_DEV_CAP_USB_DEV: case VIR_NODE_DEV_CAP_USB_INTERFACE: @@ -684,7 +688,6 @@ nodeDeviceObjFormatAddress(virNodeDeviceObj *obj) case VIR_NODE_DEV_CAP_VPORTS: case VIR_NODE_DEV_CAP_SCSI_GENERIC: case VIR_NODE_DEV_CAP_DRM: - case VIR_NODE_DEV_CAP_MDEV_TYPES: case VIR_NODE_DEV_CAP_MDEV: case VIR_NODE_DEV_CAP_CCW_DEV: case VIR_NODE_DEV_CAP_VDPA: diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 3d69bdedae..e76c1a36b8 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -457,6 +457,28 @@ udevProcessPCI(struct udev_device *device, } +static int +udevProcessMdevParent(struct udev_device *device, + virNodeDeviceDef *def) +{ + virNodeDevCapMdevParent *mdev_parent = &def->caps->data.mdev_parent; + + udevGenerateDeviceName(device, def, NULL); + + if (virMediatedDeviceParentGetAddress(def->sysfs_path, &mdev_parent->address) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to find address for mdev parent device '%s'"), + def->name); + return -1; + } + + if (virNodeDeviceGetMdevParentDynamicCaps(def->sysfs_path, mdev_parent) < 0) + return -1; + + return 0; +} + + static int drmGetMinorType(int minor) { @@ -1349,6 +1371,8 @@ udevGetDeviceType(struct udev_device *device, *type = VIR_NODE_DEV_CAP_VDPA; else if (STREQ_NULLABLE(subsystem, "matrix")) *type = VIR_NODE_DEV_CAP_AP_MATRIX; + else if (STREQ_NULLABLE(subsystem, "mtty")) + *type = VIR_NODE_DEV_CAP_MDEV_TYPES; VIR_FREE(subsystem); } @@ -1404,6 +1428,7 @@ udevGetDeviceDetails(struct udev_device *device, case VIR_NODE_DEV_CAP_AP_MATRIX: return udevProcessAPMatrix(device, def); case VIR_NODE_DEV_CAP_MDEV_TYPES: + return udevProcessMdevParent(device, def); case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_SYSTEM: case VIR_NODE_DEV_CAP_FC_HOST: diff --git a/src/util/virmdev.c b/src/util/virmdev.c index eb566982b1..41d4cef8b9 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -520,6 +520,34 @@ void virMediatedDeviceAttrFree(virMediatedDeviceAttr *attr) } +#define MDEV_BUS_DIR "/sys/class/mdev_bus" + + +int +virMediatedDeviceParentGetAddress(const char *sysfspath, + char **address) +{ + g_autoptr(DIR) dir = NULL; + struct dirent *entry; + if (virDirOpen(&dir, MDEV_BUS_DIR) < 0) + return -1; + + /* check if one of the links in /sys/class/mdev_bus/ points at the sysfs + * path for this device. If so, the link name is treated as the 'address' + * for the mdev parent */ + while (virDirRead(dir, &entry, MDEV_BUS_DIR) > 0) { + g_autofree char *tmppath = g_strdup_printf("%s/%s", MDEV_BUS_DIR, + entry->d_name); + + if (virFileLinkPointsTo(tmppath, sysfspath)) { + *address = g_strdup(entry->d_name); + return 0; + } + } + + return -1; +} + #ifdef __linux__ ssize_t diff --git a/src/util/virmdev.h b/src/util/virmdev.h index 4d3655a091..bc8306d0e1 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -149,5 +149,9 @@ virMediatedDeviceGetMdevTypes(const char *sysfspath, virMediatedDeviceType ***types, size_t *ntypes); +int +virMediatedDeviceParentGetAddress(const char *sysfspath, + char **address); + G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMediatedDevice, virMediatedDeviceFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree); -- 2.35.3

2 1

[libvirt PATCH v2 0/5] Ask qemu about migration blockers
by Eugenio Pérez 20 Jul '22

20 Jul '22

There are some hardcoded migration blockers in libvirt, like having a net vhost-vdpa device. While it's true that they cannot be migrated at the moment, there are plans to be able to migrate them soon. They'll put a migration blockers in the cases where you cannot migrate them. Ask qemu about then before rejecting the migration. In case the question is not possible, assume they're not migratable. Eugenio Pérez (4): qemu_monitor_json: Add qemuMonitorJSONGetMigrationBlockers qemu_monitor: add support for get qemu migration blockers qemu_migration: get migration blockers before hardcoded checks qemu_migrate: Do not forbif vDPA devices if can query blockers Jonathon Jongsma (1): qemu: introduce capability QEMU_MIGRATION_BLOCKED_REASONS src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 38 ++++++++++++++++++- src/qemu/qemu_monitor.c | 11 ++++++ src/qemu/qemu_monitor.h | 4 ++ src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 ++ .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + 18 files changed, 104 insertions(+), 1 deletion(-) -- 2.31.1

4 21

[PATCH 0/2] schemas: Drop <interleave/> from capabilities schemas
by Michal Privoznik 20 Jul '22

20 Jul '22

*** BLURB HERE *** Michal Prívozník (2): capabilityschemadata: Fix order of <features/> in caps-test2.xml schemas: Drop <interleave/> from capabilities schemas src/conf/schemas/capability.rng | 160 +++++++++++----------- src/conf/schemas/domaincaps.rng | 80 +++++------ tests/capabilityschemadata/caps-test2.xml | 8 +- 3 files changed, 119 insertions(+), 129 deletions(-) -- 2.35.1

3 4

[PATCH] spec: Restart sockets even when libvirtd is inactive
by Jim Fehlig 20 Jul '22

20 Jul '22

By default libvirtd will terminate itself after 120 seconds, so it is likely that the daemon will not be running at package upgrade. Try restarting sockets even if the daemon is inactive. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Assuming sockets need restarted on package update? libvirt.spec.in | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9d788b790f..5201a14431 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1365,16 +1365,19 @@ then # own the sockets again when it comes back up. Thus we must # do this particular ordering, so that we get libvirtd # running with socket activation in use + is_active=no /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 if test $? = 0 then + is_active=yes /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || : - - /bin/systemctl try-restart \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket >/dev/null 2>&1 || : - + fi + /bin/systemctl try-restart \ + libvirtd.socket \ + libvirtd-ro.socket \ + libvirtd-admin.socket >/dev/null 2>&1 || : + if test "$is_active" = yes + then /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : fi fi -- 2.36.1

2 1

[libvirt PATCH] qemu_migration: Delete vDPA check
by Eugenio Pérez 20 Jul '22

20 Jul '22

Currently, the migration code denies migration as long as the VM has a vhost-vDPA device. While it's true that vhost-vDPA devices cannot be migrated at the moment, there are plans to be able to migrate them soon. Libvirt must treat it equal to vhost-kernel devices: Not all of them can be migrated (the ones that do not expose the feature VHOST_F_LOG_ALL cannot be migrated). So checks like this one should work for all vhost devices equally. A more accurate solution is to ask qemu if it has an active migration blocker at that moment. Hoever, that require synchronization to avoid qemu to add one between the query and the actual migration command. Signed-off-by: Eugenio Pérez <eperezma(a)redhat.com> --- src/qemu/qemu_migration.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9c3fd41761..4ddf027c83 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1546,12 +1546,6 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, virDomainNetDef *net = vm->def->nets[i]; qemuSlirp *slirp; - if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("vDPA devices cannot be migrated")); - return false; - } - slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp; if (slirp && !qemuSlirpHasFeature(slirp, QEMU_SLIRP_FEATURE_MIGRATE)) { -- 2.31.1

4 11

[libvirt PATCH] conf: add missing break on a switch case
by Jonathon Jongsma 19 Jul '22

19 Jul '22

This was not causing any problems because all cases below were empty, but in order to avoid future misbehavior, add a break to this case. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 51746229fc..364bb489bd 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -770,7 +770,7 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def) virNodeDeviceCapMdevTypesFormat(&buf, data->ap_matrix.mdev_types, data->ap_matrix.nmdev_types); - + break; case VIR_NODE_DEV_CAP_MDEV_TYPES: case VIR_NODE_DEV_CAP_FC_HOST: case VIR_NODE_DEV_CAP_VPORTS: -- 2.35.3

2 1

[PATCH 0/7] Refactor closecallback use in LXC
by Peter Krempa 19 Jul '22

19 Jul '22

The end-goal is to remove 'virCloseCallbacksGetConn'. Peter Krempa (7): virLXCProcessStop: Add 'cleanupFlags' parameter virLXCProcessStart: Pass in virConnect object only when registering autodestroy virLXCProcessReboot: Simplify cleanup virLXCProcessAutostartAll: Remove unused 'conn' virLXCProcessAutostartDomain: Refactor control flow and variable use virLXCProcessReboot: Remove the need to re-register autodestroy callback virclosecallbacks: Remove unused virCloseCallbacksGetConn src/hypervisor/virclosecallbacks.c | 24 ----- src/hypervisor/virclosecallbacks.h | 3 - src/libvirt_private.syms | 1 - src/lxc/lxc_driver.c | 17 ++-- src/lxc/lxc_process.c | 141 +++++++++++------------------ src/lxc/lxc_process.h | 8 +- 6 files changed, 69 insertions(+), 125 deletions(-) -- 2.36.1

2 8

[PATCH 0/2] Two simple virBuffer*() usage fixes
by Michal Privoznik 19 Jul '22

19 Jul '22

*** BLURB HERE *** Michal Prívozník (2): qemu_capabilities: Indent <cpudata/> properly domain_conf: Switch to virBufferAddLit for literal strings src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_capabilities.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.35.1

2 3

Plans for the next release
by Jiri Denemark 19 Jul '22

19 Jul '22

We are getting close to the next release of libvirt. To aim for the release on Aug 01 I suggest entering the freeze on Tuesday Jul 26 and tagging RC2 on Friday Jul 29. I hope this works for everyone. Jirka

1 0

[PATCH 0/2] Fix build with glib-2.73.2
by Michal Privoznik 18 Jul '22

18 Jul '22

3 6

[libvirt PATCH 0/9] [RFC] Dynamic CPU models
by Tim Wiederhake 18 Jul '22

18 Jul '22

libvirt and qemu cpu models are out of sync. libvirt cpu models are considered static and never changing, whereas qemu cpu models have changed over time. This leads to problems and confusion for users, as the cpu models they specify may have different features than what they expect. This series introduces two new APIs to enumerate and retrieve cpu models dynamically from the hypervisor at runtime, allowing the user to make use of cpu models from newer hypervisor versions even if libvirt is not aware of them. These two new functions are intended as building blocks onto which higher-level functionality can be build, e.g. the ability to specify a hypervisor cpu model directly in a domain xml. With these two functions alone this has to be done manually for now, i.e. enumerate the available cpu models, retrieve the cpu description and manually insert it into the domain xml accordingly: $ virsh hypervisor-cpu-models --arch x86_64 Name Alias ---------------------------------------------------- max host base qemu64-v1 qemu64 qemu64-v1 qemu32-v1 qemu32 qemu32-v1 phenom-v1 phenom phenom-v1 (...) $ virsh hypervisor-cpu-definition --machine pc --arch x86_64 qemu64 <cpu> <model>qemu64</model> <feature name='cmov'/> <feature name='mmx'/> <feature name='xd'/> <feature name='x-intel-pt-auto-level'/> <feature name='kvm_asyncpf'/> <feature name='kvm-asyncpf'/> <feature name='legacy-cache'/> <feature name='vmware-cpuid-freq'/> <feature name='mce'/> <feature name='mca'/> <feature name='msr'/> <feature name='fxsr'/> <feature name='cpuid-0xb'/> <feature name='kvm_pv_eoi'/> <feature name='pni'/> <feature name='x2apic'/> <feature name='i64'/> <feature name='pae'/> <feature name='pat'/> <feature name='sse'/> <feature name='kvm_nopiodelay'/> <feature name='kvm-nopiodelay'/> <feature name='kvmclock-stable-bit'/> <feature name='hypervisor'/> <feature name='syscall'/> <feature name='x-migrate-smi-count'/> <feature name='full-cpuid-auto-level'/> <feature name='sse3'/> <feature name='sse2'/> <feature name='kvm-pv-eoi'/> <feature name='cx8'/> <feature name='pge'/> <feature name='fill-mtrr-mask'/> <feature name='cx16'/> <feature name='de'/> <feature name='clflush'/> <feature name='tsc'/> <feature name='fpu'/> <feature name='check'/> <feature name='apic'/> <feature name='kvm-steal-time'/> <feature name='kvm_steal_time'/> <feature name='kvmclock'/> <feature name='l3-cache'/> <feature name='nx'/> <feature name='tcg-cpuid'/> <feature name='lm'/> <feature name='pse'/> <feature name='sep'/> <feature name='kvm'/> <feature name='lahf-lm'/> <feature name='lahf_lm'/> <feature name='mtrr'/> <feature name='pse36'/> </cpu> The returned cpu description is currently completely unfiltered, as can be seen by the duplicate entries differing only in "-" vs. "_" usage, inclusion of experimental feature flags and generally, flags that are not recognized by libvirt. One possibility to adress this would be to extend virQEMUCapsCPUFeatureTranslate. Before I continue with this, I would love to hear other people's thoughts, comments and potential use cases. Cheers, Tim Tim Wiederhake (9): qemuMonitorCPUDefInfo: Add alias libvirt: introduce virConnectGetHypervisorCPUModelNames public API remote: Add RPC support for the virConnectGetHypervisorCPUModelNames API qemu: implement virConnectGetHypervisorCPUModelNames API tools: Report hypervisor cpu model names libvirt: introduce virConnectGetHypervisorCPUModelDefinition public API remote: Add support for the virConnectGetHypervisorCPUModelDefinition API qemu: Implement virConnectGetHypervisorCPUModelDefinition API tools: Report hypervisor cpu model definitions docs/manpages/virsh.rst | 27 ++++++ include/libvirt/libvirt-host.h | 13 +++ src/driver-hypervisor.h | 17 ++++ src/libvirt-host.c | 109 +++++++++++++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 105 ++++++++++++++++++++++ src/qemu/qemu_monitor.c | 2 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 3 + src/remote/remote_daemon_dispatch.c | 76 ++++++++++++++++ src/remote/remote_driver.c | 100 +++++++++++++++++++++ src/remote/remote_protocol.x | 37 +++++++- src/remote_protocol-structs | 27 ++++++ tools/virsh-host.c | 132 ++++++++++++++++++++++++++++ 14 files changed, 650 insertions(+), 1 deletion(-) -- 2.31.1

2 22

[merged][libvirt PATCH] docs: Fix typos
by Tim Wiederhake 18 Jul '22

18 Jul '22

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/drvqemu.rst | 2 +- docs/testing.rst | 2 +- docs/testtck.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index c9f2432268..c33706ccea 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -449,7 +449,7 @@ for libvirt to check compatibility prior to migration. If using ``host-model`` the target host hardware and software deployment must expose a superset of the features of the source host CPU. If using ``host-passthrough`` the target host CPU and software deployment must -always expose a superset of the fetures, however, it is further strongly +always expose a superset of the features, however, it is further strongly recommended that the source and destination hosts be identical in every way. diff --git a/docs/testing.rst b/docs/testing.rst index 21abf42080..a597c3ed07 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -30,7 +30,7 @@ valuable marker when accepting upstream contributions. Therefore, it is recommended to run libvirt builds against your changes in various containers to either locally or by using GitLab's shared CI runners to make sure everything runs cleanly before submitting your patches. The images themselves come from -libvirt's GitLab container registry, but this can be overriden if needed, see +libvirt's GitLab container registry, but this can be overridden if needed, see below. Registry diff --git a/docs/testtck.rst b/docs/testtck.rst index 6264b40de7..100a278acd 100644 --- a/docs/testtck.rst +++ b/docs/testtck.rst @@ -33,7 +33,7 @@ happens. Using TCK --------- -TCK can be used independently of the enviroment, i.e. both on your local host +TCK can be used independently of the environment, i.e. both on your local host or in a VM. We strongly recommend using a VM for the tests as TCK might affect your current host setup, see `Running TCK`_. -- 2.36.1

1 0

[PATCH 0/7] qemu: Remove unused code for tuning migration parameters
by Peter Krempa 15 Jul '22

15 Jul '22

All qemu versions supported by libvirt allow setting everything via migration parameters which is also the preferred code path in libvirt. Remove the legacy code. Peter Krempa (7): qemu: Always assume support for QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH qemu: capabilities: Retire QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH qemu: driver: Always assume support for QEMU_CAPS_MIGRATION_PARAM_DOWNTIME qemu: capabilties: Retire QEMU_CAPS_MIGRATION_PARAM_DOWNTIME qemu: Always assume support for QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE qemu: capabilities: Retire QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE qemu: monitor: Remove unused migration property getters/setters src/qemu/qemu_capabilities.c | 9 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_driver.c | 125 ++++++------------ src/qemu/qemu_migration.c | 53 +++----- src/qemu/qemu_migration_params.c | 18 --- src/qemu/qemu_monitor.c | 55 -------- src/qemu/qemu_monitor.h | 11 -- src/qemu/qemu_monitor_json.c | 96 -------------- src/qemu/qemu_monitor_json.h | 15 --- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 - .../caps_3.1.0.x86_64.xml | 3 - .../caps_4.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 - .../caps_4.0.0.riscv32.xml | 3 - .../caps_4.0.0.riscv64.xml | 3 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 - .../caps_4.0.0.x86_64.xml | 3 - .../caps_4.1.0.x86_64.xml | 3 - .../caps_4.2.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 - .../caps_4.2.0.x86_64.xml | 3 - .../caps_5.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 - .../caps_5.0.0.riscv64.xml | 3 - .../caps_5.0.0.x86_64.xml | 3 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 3 - .../caps_5.1.0.x86_64.xml | 3 - .../caps_5.2.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 3 - .../caps_5.2.0.riscv64.xml | 3 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 - .../caps_5.2.0.x86_64.xml | 3 - .../caps_6.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 3 - .../caps_6.0.0.x86_64.xml | 3 - .../caps_6.1.0.x86_64.xml | 3 - .../caps_6.2.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 3 - .../caps_6.2.0.x86_64.xml | 3 - .../caps_7.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 3 - .../caps_7.0.0.x86_64.xml | 3 - .../caps_7.1.0.x86_64.xml | 3 - tests/qemumonitorjsontest.c | 39 ------ 45 files changed, 59 insertions(+), 473 deletions(-) -- 2.36.1

2 8

[libvirt PATCH] util: remove virObjectUnref() adapters
by Jonathon Jongsma 15 Jul '22

15 Jul '22

These wrapper functions were used to adapt the virObjectUnref() function signature for different callbacks. But in commit 0d184072, the virObjectUnref() function was changed to return a void instead of a bool, so these adapters are no longer necessary. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/admin/admin_remote.c | 4 ++-- src/bhyve/bhyve_monitor.c | 2 +- src/conf/object_event.c | 2 +- src/conf/virdomainobjlist.c | 8 ++++---- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 4 ++-- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 10 +++++----- src/libvirt_private.syms | 2 -- src/qemu/qemu_domain.c | 2 +- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 8 ++++---- src/rpc/gendispatch.pl | 2 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 4 ++-- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetdaemon.c | 2 +- src/rpc/virnetserverclient.c | 4 ++-- src/rpc/virnetserverservice.c | 6 +++--- src/util/virobject.c | 30 ---------------------------- src/util/virobject.h | 6 ------ tests/qemustatusxml2xmltest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tools/virsh-console.c | 6 +++--- 27 files changed, 42 insertions(+), 80 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 83a6be2b97..012488bff3 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -165,7 +165,7 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) virObjectRef(conn->closeCallback); virNetClientSetCloseCallback(priv->client, remoteAdminClientCloseFunc, conn->closeCallback, - virObjectFreeCallback); + virObjectUnref); if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, @@ -195,7 +195,7 @@ remoteAdminConnectClose(virAdmConnectPtr conn) } virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback, - virObjectFreeCallback); + virObjectUnref); virNetClientClose(priv->client); rv = 0; diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index 6788b83c70..ae602b5c39 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -82,7 +82,7 @@ bhyveMonitorRegister(bhyveMonitor *mon) VIR_EVENT_HANDLE_HANGUP, bhyveMonitorIO, mon, - virObjectFreeCallback); + virObjectUnref); if (mon->watch < 0) { VIR_DEBUG("failed to add event handle for mon %p", mon); virObjectUnref(mon); diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 3c998eda7f..62bbfb33bc 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -876,7 +876,7 @@ virObjectEventStateRegisterID(virConnectPtr conn, if ((state->timer = virEventAddTimeout(-1, virObjectEventTimer, state, - virObjectFreeCallback)) < 0) { + virObjectUnref)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not initialize domain event timer")); goto cleanup; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index f16b963eb0..2569454ff8 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -73,8 +73,8 @@ virDomainObjList *virDomainObjListNew(void) if (!(doms = virObjectRWLockableNew(virDomainObjListClass))) return NULL; - doms->objs = virHashNew(virObjectFreeHashData); - doms->objsName = virHashNew(virObjectFreeHashData); + doms->objs = virHashNew(virObjectUnref); + doms->objsName = virHashNew(virObjectUnref); return doms; } @@ -217,7 +217,7 @@ virDomainObjListFindByName(virDomainObjList *doms, * tables. Once successfully added into a table, increase the * reference count since upon removal in virHashRemoveEntry * the virObjectUnref will be called since the hash tables were - * configured to call virObjectFreeHashData when the object is + * configured to call virObjectUnref when the object is * removed from the hash table. * * Returns 0 on success with 3 references and locked @@ -453,7 +453,7 @@ virDomainObjListRename(virDomainObjList *doms, /* Increment the refcnt for @new_name. We're about to remove * the @old_name which will cause the refcnt to be decremented - * via the virObjectUnref call made during the virObjectFreeHashData + * via the virObjectUnref call made during the virObjectUnref * as a result of removing something from the object list hash * table as set up during virDomainObjListNew. */ virObjectRef(dom); diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index c2b81b984f..1ec1c9d1b7 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -140,7 +140,7 @@ virInterfaceObjListNew(void) if (!(interfaces = virObjectRWLockableNew(virInterfaceObjListClass))) return NULL; - interfaces->objsName = virHashNew(virObjectFreeHashData); + interfaces->objsName = virHashNew(virObjectUnref); return interfaces; } diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index ddb325cdbd..46b499db58 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -326,7 +326,7 @@ virNetworkObjListNew(void) if (!(nets = virObjectRWLockableNew(virNetworkObjListClass))) return NULL; - nets->objs = virHashNew(virObjectFreeHashData); + nets->objs = virHashNew(virObjectUnref); return nets; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 26498fc498..4c22484d11 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -465,7 +465,7 @@ virNodeDeviceObjListNew(void) if (!(devs = virObjectRWLockableNew(virNodeDeviceObjListClass))) return NULL; - devs->objs = virHashNew(virObjectFreeHashData); + devs->objs = virHashNew(virObjectUnref); return devs; } diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 53713d815a..9a46fa06b9 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -66,7 +66,7 @@ virNWFilterBindingObjListNew(void) if (!(bindings = virObjectRWLockableNew(virNWFilterBindingObjListClass))) return NULL; - bindings->objs = virHashNew(virObjectFreeHashData); + bindings->objs = virHashNew(virObjectUnref); return bindings; } @@ -131,7 +131,7 @@ virNWFilterBindingObjListFindByPortDev(virNWFilterBindingObjList *bindings, * tables. Once successfully added into a table, increase the * reference count since upon removal in virHashRemoveEntry * the virObjectUnref will be called since the hash tables were - * configured to call virObjectFreeHashData when the object is + * configured to call virObjectUnref when the object is * removed from the hash table. * * Returns 0 on success with 2 references and locked diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 92985c4b63..4032cd1e9a 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -118,7 +118,7 @@ virSecretObjListNew(void) if (!(secrets = virObjectRWLockableNew(virSecretObjListClass))) return NULL; - if (!(secrets->objs = virHashNew(virObjectFreeHashData))) { + if (!(secrets->objs = virHashNew(virObjectUnref))) { virObjectUnref(secrets); return NULL; } diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 238d4678a2..e1465c8376 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -151,9 +151,9 @@ virStorageVolObjListNew(void) if (!(vols = virObjectRWLockableNew(virStorageVolObjListClass))) return NULL; - vols->objsKey = virHashNew(virObjectFreeHashData); - vols->objsName = virHashNew(virObjectFreeHashData); - vols->objsPath = virHashNew(virObjectFreeHashData); + vols->objsKey = virHashNew(virObjectUnref); + vols->objsName = virHashNew(virObjectUnref); + vols->objsPath = virHashNew(virObjectUnref); return vols; } @@ -378,8 +378,8 @@ virStoragePoolObjListNew(void) if (!(pools = virObjectRWLockableNew(virStoragePoolObjListClass))) return NULL; - pools->objs = virHashNew(virObjectFreeHashData); - pools->objsName = virHashNew(virObjectFreeHashData); + pools->objs = virHashNew(virObjectUnref); + pools->objsName = virHashNew(virObjectUnref); return pools; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1e757389e6..f4732f1742 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2978,8 +2978,6 @@ virClassForObjectRWLockable; virClassIsDerivedFrom; virClassName; virClassNew; -virObjectFreeCallback; -virObjectFreeHashData; virObjectIsClass; virObjectListFree; virObjectListFreeCount; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 60ed358871..94b2e3118c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1764,7 +1764,7 @@ qemuDomainObjPrivateAlloc(void *opaque) if (!(priv->devs = virChrdevAlloc())) return NULL; - priv->blockjobs = virHashNew(virObjectFreeHashData); + priv->blockjobs = virHashNew(virObjectUnref); /* agent commands block by default, user can choose different behavior */ priv->agentTimeout = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK; diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 645be6eafd..912f3f9f94 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -440,7 +440,7 @@ int daemonAddClientStream(virNetServerClient *client, if (virStreamEventAddCallback(stream->st, 0, daemonStreamEvent, client, - virObjectFreeCallback) < 0) + virObjectUnref) < 0) return -1; virObjectRef(client); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 94566069f0..0ca365c4cc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1096,7 +1096,7 @@ doRemoteOpen(virConnectPtr conn, virObjectRef(priv->closeCallback); virNetClientSetCloseCallback(priv->client, remoteClientCloseFunc, - priv->closeCallback, virObjectFreeCallback); + priv->closeCallback, virObjectUnref); if (!(priv->remoteProgram = virNetClientProgramNew(REMOTE_PROGRAM, REMOTE_PROTOCOL_VERSION, @@ -1301,7 +1301,7 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv) virNetClientSetCloseCallback(priv->client, NULL, - priv->closeCallback, virObjectFreeCallback); + priv->closeCallback, virObjectUnref); virNetClientClose(priv->client); g_clear_pointer(&priv->client, virObjectUnref); @@ -6142,7 +6142,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, st->driver = &remoteStreamDrv; st->privateData = netst; - st->ff = virObjectFreeCallback; + st->ff = virObjectUnref; args.cookie_in.cookie_in_val = (char *)cookiein; args.cookie_in.cookie_in_len = cookieinlen; @@ -7082,7 +7082,7 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn, st->driver = &remoteStreamDrv; st->privateData = netst; - st->ff = virObjectFreeCallback; + st->ff = virObjectUnref; if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3_PARAMS, (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_args, diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index a64ff3e73f..5f2b163ea0 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1837,7 +1837,7 @@ elsif ($mode eq "client") { print "\n"; print " st->driver = &remoteStreamDrv;\n"; print " st->privateData = netst;\n"; - print " st->ff = virObjectFreeCallback;\n"; + print " st->ff = virObjectUnref;\n"; } if ($call->{ProcName} eq "SupportsFeature") { diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index b7ee6fb169..434cc2c7c9 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -275,7 +275,7 @@ virKeepAliveStart(virKeepAlive *ka, timeout = ka->interval - delay; ka->intervalStart = now - (ka->interval - timeout); ka->timer = virEventAddTimeout(timeout * 1000, virKeepAliveTimer, - ka, virObjectFreeCallback); + ka, virObjectUnref); if (ka->timer < 0) goto cleanup; diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 3f79c03a58..1202b0f30c 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -658,7 +658,7 @@ int virNetClientRegisterAsyncIO(virNetClient *client) VIR_EVENT_HANDLE_READABLE, virNetClientIncomingEvent, client, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(client); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to register async IO callback")); @@ -688,7 +688,7 @@ int virNetClientRegisterKeepAlive(virNetClient *client) if (!(ka = virKeepAliveNew(-1, 0, client, virNetClientKeepAliveSendCB, virNetClientKeepAliveDeadCB, - virObjectFreeCallback))) + virObjectUnref))) return -1; /* keepalive object has a reference to client */ diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index a03f67e542..e0e3178111 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -727,7 +727,7 @@ int virNetClientStreamEventAddCallback(virNetClientStream *st, virEventAddTimeout(-1, virNetClientStreamEventTimer, st, - virObjectFreeCallback)) < 0) { + virObjectUnref)) < 0) { virObjectUnref(st); goto cleanup; } diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index ac12d2d412..c4f5bbdce5 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -142,7 +142,7 @@ virNetDaemonNew(void) if (!(dmn = virObjectLockableNew(virNetDaemonClass))) return NULL; - dmn->servers = virHashNew(virObjectFreeHashData); + dmn->servers = virHashNew(virObjectUnref); #ifndef WIN32 dmn->sigwrite = dmn->sigread = -1; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index bb70856351..d57ca07167 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -202,7 +202,7 @@ static int virNetServerClientRegisterEvent(virNetServerClient *client) mode, virNetServerClientDispatchEvent, client, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(client); return -1; } @@ -1521,7 +1521,7 @@ virNetServerClientInitKeepAlive(virNetServerClient *client, if (!(ka = virKeepAliveNew(interval, count, client, virNetServerClientKeepAliveSendCB, virNetServerClientKeepAliveDeadCB, - virObjectFreeCallback))) + virObjectUnref))) return -1; /* keepalive object has a reference to client */ diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 214eae1acb..682b2091c1 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -152,7 +152,7 @@ virNetServerServiceNewSocket(virNetSocket **socks, virObjectRef(svc); svc->timer = virEventAddTimeout(-1, virNetServerServiceTimerFunc, - svc, virObjectFreeCallback); + svc, virObjectUnref); if (svc->timer < 0) { virObjectUnref(svc); goto error; @@ -169,7 +169,7 @@ virNetServerServiceNewSocket(virNetSocket **socks, 0, virNetServerServiceAccept, svc, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(svc); goto error; } @@ -361,7 +361,7 @@ virNetServerService *virNetServerServiceNewPostExecRestart(virJSONValue *object) 0, virNetServerServiceAccept, svc, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(svc); goto error; } diff --git a/src/util/virobject.c b/src/util/virobject.c index d1cd4d32f1..b74d74a545 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -598,36 +598,6 @@ virClassName(virClass *klass) } -/** - * virObjectFreeCallback: - * @opaque: a pointer to a virObject instance - * - * Provides identical functionality to virObjectUnref, - * but with the signature matching the virFreeCallback - * typedef. - */ -void virObjectFreeCallback(void *opaque) -{ - virObjectUnref(opaque); -} - - -/** - * virObjectFreeHashData: - * @opaque: a pointer to a virObject instance - * @name: ignored, name of the hash key being deleted - * - * Provides identical functionality to virObjectUnref, - * but with the signature matching the GDestroyNotify - * typedef used with hash tables. - */ -void -virObjectFreeHashData(void *opaque) -{ - virObjectUnref(opaque); -} - - /** * virObjectListFree: * @list: A pointer to a NULL-terminated list of object pointers to free diff --git a/src/util/virobject.h b/src/util/virobject.h index 4b941ac215..8c06c1b929 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -104,12 +104,6 @@ virObjectIsClass(void *obj, virClass *klass) ATTRIBUTE_NONNULL(2); -void -virObjectFreeCallback(void *opaque); - -void -virObjectFreeHashData(void *opaque); - void * virObjectLockableNew(virClass *klass) ATTRIBUTE_NONNULL(1); diff --git a/tests/qemustatusxml2xmltest.c b/tests/qemustatusxml2xmltest.c index cd43820551..db82a1a980 100644 --- a/tests/qemustatusxml2xmltest.c +++ b/tests/qemustatusxml2xmltest.c @@ -78,7 +78,7 @@ mymain(void) int ret = 0; g_autofree char *fakerootdir = NULL; g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); - g_autoptr(GHashTable) capscache = virHashNew(virObjectFreeHashData); + g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); g_autoptr(virConnect) conn = NULL; struct testQemuConf testConf = { .capslatest = capslatest, .capscache = capscache, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5b40a0d7f5..b2da42cb1f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -835,7 +835,7 @@ mymain(void) g_autofree char *fakerootdir = NULL; g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); g_autoptr(GHashTable) qapiSchemaCache = virHashNew((GDestroyNotify) g_hash_table_unref); - g_autoptr(GHashTable) capscache = virHashNew(virObjectFreeHashData); + g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); struct testQemuConf testConf = { .capslatest = capslatest, .capscache = capscache, .qapiSchemaCache = qapiSchemaCache }; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 58929b68c1..68e5041bfd 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -122,7 +122,7 @@ mymain(void) g_autofree char *fakerootdir = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); - g_autoptr(GHashTable) capscache = virHashNew(virObjectFreeHashData); + g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); g_autoptr(virConnect) conn = NULL; struct testQemuConf testConf = { .capslatest = capslatest, .capscache = capscache, diff --git a/tools/virsh-console.c b/tools/virsh-console.c index 13ee811a92..6bfb44a190 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -451,7 +451,7 @@ virshRunConsole(vshControl *ctl, VIR_EVENT_HANDLE_READABLE, virConsoleEventOnStdin, con, - virObjectFreeCallback)) < 0) { + virObjectUnref)) < 0) { virObjectUnref(con); goto cleanup; } @@ -461,7 +461,7 @@ virshRunConsole(vshControl *ctl, 0, virConsoleEventOnStdout, con, - virObjectFreeCallback)) < 0) { + virObjectUnref)) < 0) { virObjectUnref(con); goto cleanup; } @@ -471,7 +471,7 @@ virshRunConsole(vshControl *ctl, VIR_STREAM_EVENT_READABLE, virConsoleEventOnStream, con, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(con); goto cleanup; } -- 2.35.3

2 1

[libvirt PATCH v2 00/10] docs: Expand documentation on the CI/testing topic
by Erik Skultety 14 Jul '22

14 Jul '22

This series was inspired by QEMU's documentation on CI and focuses on the following: - adds documentation on how to add a custom runner to the libvirt project or its fork, mainly in context of running functional testing - replaces the old 'testsuites' article with a more detailed landing page describing different types of testing available in libvirt - updates the TCK documentation with details on how TCK should be installed and used nowadays Since v1: - described the --force argument with TCK usage - moved the article about adding new platforms to libvirt-ci and linked it from our docs -> corresponding MR here: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/295 -> ^the MR must merged **FIRST**! - moved Podman prerequistes for local container builds before Docker Here's a fresh website pipeline with artifacts: https://gitlab.com/eskultety/libvirt/-/jobs/2722840726 Erik Skultety (10): docs: Move the CI dashboard to its own RST module docs: Provide more information about the TCK test suite docs: Provide an article on how to add a custom runner to the project docs: Provide an article on testing docs: Replace testsuites article with the new 'testing' article docs: Drop the testsuites article docs: Change the CI headline from "CI Testing" to "CI" docs: ci: Add info about the two major types of jobs our CI runs docs: ci: Add a section on how to add a new platform to libvirt CI docs: ci: Add a brief section on how to run the CI workload locally docs/ci-dashboard.rst | 216 ++++++++++++++++++++++++++++++++++++++ docs/ci-runners.rst | 86 +++++++++++++++ docs/ci.rst | 237 ++++++------------------------------------ docs/docs.rst | 10 +- docs/meson.build | 4 +- docs/testing.rst | 172 ++++++++++++++++++++++++++++++ docs/testsuites.rst | 37 ------- docs/testtck.rst | 99 ++++++++++++++++-- 8 files changed, 602 insertions(+), 259 deletions(-) create mode 100644 docs/ci-dashboard.rst create mode 100644 docs/ci-runners.rst create mode 100644 docs/testing.rst delete mode 100644 docs/testsuites.rst -- 2.36.1

2 14

[PATCH 0/3] qemu: add an API for "query-stats" QMP command
by Amneesh Singh 14 Jul '22

14 Jul '22

QEMU is gaining introspectable statistics which can be queried via the "query-stats" QMP command. This patchset aims to add an API for the same. The returned JSON for "query-stats" is an array of objects containing their own respective array of statistics. Patch 1 adds the API which returns the deserialized JSON in the form of a GPtrArray of GHashTables. Patch 2 adds the "query-stats" to QEMU capabilities. Patch 3 uses the API to query the halt poll success time and the halt poll failure time. v2 -> v3 ======== Sorry for the late patchset, I was under the impression I had sent it on Monday but apparently, I did not. [1/3]: - use a single enum for all the statistics. - use QEMU_MONITOR_QUERY_STATS_NAME_LAST as the sentinel value for the provider constructor. - relevant changes to enum values. [2/3]: - fix comment spacing [3/3] - better checks v1 -> v2 ======== I have been tinkering with the v1 patchset and have rewrote the v2 patches a couple of times. I believe the current patchset is still not perfect and would appreciate some reviews. I have another patch or two written but they do not make any significant changes to the current patchset. [1/3]: - use virBitmap instead of an array of strings for statistics. - add enums for the stat names and add qemuMonitorQueryStatsNameTypeToString to switch between the "ToString" functions based on the target type. - change qemuMonitorQueryStatsProviderNew to a variadic function that takes stat enum values with the sentinel value being -1. [2/3]: - No changes [3/3]: - Add relevant monitor related checks to check if the domain is active. - Acquire and release qemuMonitorObj lock before and after calling qemuMonitorQueryStats respectively. - Add the check for privileged access. Relevant QEMU patches can be found here: https://lore.kernel.org/all/20220530150714.756954-1-pbonzini@redhat.com/ This patchset is part of the 2022 GSOC contributor project. Amneesh Singh (3): qemu_monitor: add qemuMonitorQueryStats qemu_capabilities: add "query-stats" QMP command to the QEMU capabilities qemu_driver: use qemuMonitorQueryStats to extract halt poll time src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 69 ++++++++++++++++--- src/qemu/qemu_monitor.c | 70 +++++++++++++++++++ src/qemu/qemu_monitor.h | 45 ++++++++++++ src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++ 7 files changed, 315 insertions(+), 8 deletions(-) -- 2.36.1

1 0

[PATCH v2 0/6] conf: Introduce @guestReset to hostdev's <source/>
by Michal Privoznik 13 Jul '22

13 Jul '22

v2 of: https://listman.redhat.com/archives/libvir-list/2022-July/232756.html diff to v2: - Fixed capabilities files per Jano's review Michal Prívozník (6): tests: Update hostdev-usb-* hostdev-pci-* xml2xml and xml2argv tests tests: Fix qemu replies wrt usb-host properties conf: Introduce @guestReset to hostdev's <source/> qemu_capabilities: Track usb-host.guest-resets-all capability qemu_validate: Validate that QEMU's capable of guestReset qemu: Generate cmd line for guestReset docs/formatdomain.rst | 15 +++++++- src/conf/domain_conf.c | 18 +++++++++ src/conf/domain_conf.h | 13 +++++++ src/conf/schemas/domaincommon.rng | 9 +++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 21 ++++++++++ src/qemu/qemu_validate.c | 8 ++++ .../caps_3.1.0.ppc64.replies | 15 -------- .../caps_3.1.0.x86_64.replies | 15 -------- .../caps_4.0.0.aarch64.replies | 10 ----- .../caps_4.0.0.ppc64.replies | 10 ----- .../caps_4.0.0.riscv32.replies | 10 ----- .../caps_4.0.0.riscv64.replies | 10 ----- .../caps_4.0.0.s390x.replies | 10 ----- .../caps_4.0.0.x86_64.replies | 10 ----- .../caps_4.1.0.x86_64.replies | 10 ----- .../caps_4.2.0.aarch64.replies | 5 --- .../caps_4.2.0.aarch64.xml | 1 + .../caps_4.2.0.ppc64.replies | 5 --- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../caps_4.2.0.s390x.replies | 5 --- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.replies | 5 --- .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + .../hostdev-pci-address-device.args | 34 ----------------- ...tdev-pci-address-device.x86_64-latest.args | 38 +++++++++++++++++++ .../hostdev-pci-address-device.xml | 2 +- .../qemuxml2argvdata/hostdev-pci-address.args | 33 ---------------- .../hostdev-pci-address.x86_64-latest.args | 37 ++++++++++++++++++ .../qemuxml2argvdata/hostdev-pci-address.xml | 2 +- .../hostdev-usb-address-device-boot.args | 34 ----------------- ...usb-address-device-boot.x86_64-latest.args | 38 +++++++++++++++++++ .../hostdev-usb-address-device-boot.xml | 2 +- .../hostdev-usb-address-device.args | 34 ----------------- ...tdev-usb-address-device.x86_64-latest.args | 38 +++++++++++++++++++ .../hostdev-usb-address-device.xml | 2 +- .../qemuxml2argvdata/hostdev-usb-address.args | 33 ---------------- .../hostdev-usb-address.x86_64-latest.args | 37 ++++++++++++++++++ .../qemuxml2argvdata/hostdev-usb-address.xml | 4 +- tests/qemuxml2argvtest.c | 10 ++--- ... => hostdev-pci-address.x86_64-latest.xml} | 7 +++- ... => hostdev-usb-address.x86_64-latest.xml} | 9 +++-- tests/qemuxml2xmltest.c | 4 +- 62 files changed, 320 insertions(+), 307 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.args create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.args create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args rename tests/qemuxml2xmloutdata/{hostdev-pci-address.xml => hostdev-pci-address.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{hostdev-usb-address.xml => hostdev-usb-address.x86_64-latest.xml} (83%) -- 2.35.1

2 8

[libvirt PATCH] docs: replace ARRAY_CARDINALITY with G_N_ELEMENTS
by Daniel P. Berrangé 13 Jul '22

13 Jul '22

Fix docs illustrating call with an obsolete macro. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/kbase/internals/locking.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/kbase/internals/locking.rst b/docs/kbase/internals/locking.rst index 50d2b92d57..7a863ab4b2 100644 --- a/docs/kbase/internals/locking.rst +++ b/docs/kbase/internals/locking.rst @@ -127,7 +127,7 @@ locks, this will be done from the libvirtd process. }; mgr = virLockManagerNew(lockPlugin, VIR_LOCK_MANAGER_TYPE_DOMAIN, - ARRAY_CARDINALITY(params), + G_N_ELEMENTS(params), params, 0))); @@ -171,7 +171,7 @@ however, a process may voluntarily give up the lock by running }; mgr = virLockManagerNew(lockPlugin, VIR_LOCK_MANAGER_TYPE_DOMAIN, - ARRAY_CARDINALITY(params), + G_N_ELEMENTS(params), params, 0))); -- 2.36.1

2 1

[libvirt PATCH 00/10] docs: Expand documentation on the CI/testing topic
by Erik Skultety 13 Jul '22

13 Jul '22

This series was inspired by QEMU's documentation on CI and focuses on the following: - adds documentation on how to add a custom runner to the libvirt project or its fork, mainly in context of running functional testing - replaces the old 'testsuites' article with a more detailed landing page describing different types of testing available in libvirt - updates the TCK documentation with details on how TCK should be installed and used nowadays For sure we can add lots more content related to testing in libvirt but I think this series provides a solid foundation that can be easily expanded on in the future. Here's the website build artifact to see what it'll look like eventually: https://gitlab.com/eskultety/libvirt/-/jobs/2709823650 Erik Skultety (10): docs: Move the CI dashboard to its own RST module docs: Provide more information about the TCK test suite docs: Provide an article on how to add a custom runner to the project docs: Provide an article on testing docs: Replace testsuites article with the new 'testing' article docs: Drop the testsuites article docs: Change the CI headline from "CI Testing" to "CI" docs: ci: Add info about the two major types of jobs our CI runs docs: ci: Add a section on how to add a new platform to libvirt CI docs: ci: Add a brief section on how to run the CI workload locally docs/ci-dashboard.rst | 216 +++++++++++++++++++++++++++++++++++ docs/ci-runners.rst | 86 ++++++++++++++ docs/ci.rst | 255 +++++++++++------------------------------- docs/docs.rst | 10 +- docs/meson.build | 4 +- docs/testing.rst | 176 +++++++++++++++++++++++++++++ docs/testsuites.rst | 37 ------ docs/testtck.rst | 92 +++++++++++++-- 8 files changed, 631 insertions(+), 245 deletions(-) create mode 100644 docs/ci-dashboard.rst create mode 100644 docs/ci-runners.rst create mode 100644 docs/testing.rst delete mode 100644 docs/testsuites.rst -- 2.36.1

2 20

[PATCH 0/5] conf: Introduce @guestReset to hostdev's <source/>
by Michal Privoznik 13 Jul '22

13 Jul '22

There are couple of examples where this knob would be useful: https://bugs.launchpad.net/qemu/+bug/1846451 (look for those cmd line passthrough hacks), and one pretty recent request: https://listman.redhat.com/archives/libvir-list/2022-June/232611.html The last patch uses info from Kraxel's patch (which he posted after our private discussion): https://lists.gnu.org/archive/html/qemu-devel/2022-07/msg01733.html Michal Prívozník (5): tests: Update hostdev-usb-* hostdev-pci-* xml2xml and xml2argv tests conf: Introduce @guestReset to hostdev's <source/> qemu_capabilities: Track usb-host.guest-resets-all capability qemu_validate: Validate that QEMU's capable of guestReset qemu: Generate cmd line for guestReset docs/formatdomain.rst | 15 +++++++- src/conf/domain_conf.c | 18 +++++++++ src/conf/domain_conf.h | 13 +++++++ src/conf/schemas/domaincommon.rng | 9 +++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 21 ++++++++++ src/qemu/qemu_validate.c | 8 ++++ .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + .../hostdev-pci-address-device.args | 34 ----------------- ...tdev-pci-address-device.x86_64-latest.args | 38 +++++++++++++++++++ .../hostdev-pci-address-device.xml | 2 +- .../qemuxml2argvdata/hostdev-pci-address.args | 33 ---------------- .../hostdev-pci-address.x86_64-latest.args | 37 ++++++++++++++++++ .../qemuxml2argvdata/hostdev-pci-address.xml | 2 +- .../hostdev-usb-address-device-boot.args | 34 ----------------- ...usb-address-device-boot.x86_64-latest.args | 38 +++++++++++++++++++ .../hostdev-usb-address-device-boot.xml | 2 +- .../hostdev-usb-address-device.args | 34 ----------------- ...tdev-usb-address-device.x86_64-latest.args | 38 +++++++++++++++++++ .../hostdev-usb-address-device.xml | 2 +- .../qemuxml2argvdata/hostdev-usb-address.args | 33 ---------------- .../hostdev-usb-address.x86_64-latest.args | 37 ++++++++++++++++++ .../qemuxml2argvdata/hostdev-usb-address.xml | 4 +- tests/qemuxml2argvtest.c | 10 ++--- ... => hostdev-pci-address.x86_64-latest.xml} | 7 +++- ... => hostdev-usb-address.x86_64-latest.xml} | 9 +++-- tests/qemuxml2xmltest.c | 4 +- 58 files changed, 329 insertions(+), 187 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.args create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.args create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args rename tests/qemuxml2xmloutdata/{hostdev-pci-address.xml => hostdev-pci-address.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{hostdev-usb-address.xml => hostdev-usb-address.x86_64-latest.xml} (83%) -- 2.35.1

3 11

[PATCH 0/5] Follow up fixes for IOThreads
by Michal Privoznik 13 Jul '22

13 Jul '22

Couple of issues were found with my recent work on IOThread and its pool size limits. Here are fixes. Michal Prívozník (5): domain_conf: Format <defaultiothread/> more often domain_conf: Format iothread IDs more often qemu: Make IOThread changing more robust qemuDomainSetIOThreadParams: Accept VIR_DOMAIN_AFFECT_CONFIG flag virsh: Implement --config for iothreadset src/conf/domain_conf.c | 50 ++++++++++---------- src/qemu/qemu_driver.c | 101 +++++++++++++++++++++++------------------ tools/virsh-domain.c | 8 ++++ 3 files changed, 90 insertions(+), 69 deletions(-) -- 2.35.1

2 6

[PATCH 0/4] qemu: Report supported TPM version in domcaps
by Michal Privoznik 13 Jul '22

13 Jul '22

*** BLURB HERE *** Michal Prívozník (4): docs: Document TPM portion of domcaps virtpm: Introduce TPM-1.2 and TPM-2.0 capabilieis domcaps: Introduce TPM backendVersion qemu: Report supported TPM version in domcaps docs/formatdomaincaps.rst | 36 ++++++++++++++++++++++++++++++++++ src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/qemu/qemu_capabilities.c | 15 +++++++++++--- src/util/virtpm.c | 2 ++ src/util/virtpm.h | 2 ++ 6 files changed, 54 insertions(+), 3 deletions(-) -- 2.35.1

2 8

[libvirt PATCH v2] docs: add info about factors affecting CPU compatibility
by Daniel P. Berrangé 13 Jul '22

13 Jul '22

While libvirt solves most of the problem of ensuring compatibility, when there is incompatibility it can be hard for users to track down the cause. Everything knows to check the physical CPU model, but there are a surprisingly large number of other factors influencing compatibility. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In v2: - Also mention nested virt docs/drvqemu.rst | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index c174bdb4cf..c9f2432268 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -416,6 +416,89 @@ following command should be run as root, prior to starting libvirtd libvirt will then place each virtual machine in a cgroup at ``/dev/cgroup/libvirt/qemu/$VMNAME/`` + +Live migration compatibility +---------------------------- + +Many factors can affect the ability to live migrate a guest between a pair +of hosts. It is critical that when QEMU is started on the destination host, +the exposed guest machine ABI matches what was exposed by the existing QEMU +process on the source host. To facilitate this, when libvirt receives a +guest configuration document, it will attempt to expand any features that +were not specified, to ensure a stable guest machine ABI. Mostly this involves +adding address information to all devices, and adding controllers to attach +the devices to. + +Certain features that affect the guest ABI, however, may only be known at the +time the guest is started and can be influenced by features of the host OS +and its hardware. This means that even if the guest XML configuration is the +same, it may still be impossible to migrate the guest between two hosts. + +Migration CPU model compatibility +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The most common problems with migration compatibility surround the use of +the guest CPU ``host-model`` or ``host-passthrough`` modes. Both of these +modes attempt to expose the full host CPU featureset to the guest. The +``host-model`` mode attempts to expose as many features as possible while +retaining the ability to accurately check compatibility between hosts prior +to migration running. The ``host-passthrough`` mode attempts to expose the +host CPU as precisely as possible, but with the cost that it is not possible +for libvirt to check compatibility prior to migration. + +If using ``host-model`` the target host hardware and software deployment +must expose a superset of the features of the source host CPU. If using +``host-passthrough`` the target host CPU and software deployment must +always expose a superset of the fetures, however, it is further strongly +recommended that the source and destination hosts be identical in every +way. + +In both cases, there are a number of factors that will influence the CPU +features available to the guest + +* **Physical CPU model** - the core constraint on what features are available. + Check ``/proc/cpuinfo`` for CPU model name. +* **Firmware revision (BIOS/UEFI/etc)** - firmware updates may bundle microcode + updates which arbitrarily add or remove CPU features, typically in response + to new hardware vulnerabilities. Check ``dmidecode`` for details on ``x86`` + and ``aarch64`` platforms for firmware version, and ``/proc/cpuinfo`` for + associated microcode version (if not updated by the OS). +* **Firmware settings** - certain firmware settings can affect accessibility of + features. For example, turning on/off SMT/HT not only affects the number + of logical CPUs available to the OS, but can indirectly influence other + factors such as the number of performance counters available for use. Check + the firmware specific configuration interface. +* **Host kernel version** - the host kernel software version may have a + need to block certain physical CPU features from use in the guest. It can + also emulate certain features that may not exist in the silicon, for example, + x2apic. Check ``uname -r`` output for kernel version. +* **Host kernel settings** - the kernel command line options can be used to + block certain physical CPU features from use in the guest, for example, + ``tsx=off``, ``l1tf=...`` or ``nosmt``. Check ``/proc/cmdline`` and + ``/etc/modprobe.d/*.conf``. +* **microcode update version** - while the firmware will load the initial + microcode in to the CPU, the OS may ship packages providing newer microcode + updates since these can be deployed on a more timely manner than firmware + updates. These updates can arbitrarily load add or remove CPU features. + Check ``/proc/cpuinfo`` for microcode version. +* **QEMU version** - even when the kernel supports exposing a CPU feature to + the guest, an update in the QEMU emulator version will be required to unlock + its usage with a guest, except with ``host-passthrough``. Check the output + of ``$QEMU -version``. +* **libvirt version** - even when the kernel and QEMU support exposing a CPU + feature to the guest, an update in the libvirt version will be required to + unlock its usage with a guest, except with ``host-passthrough``. Check + ``virsh version``. +* **Nested virtualization** - due to the limitations of nested virtualization, + a L1 nested host may not be able to expose the same featureset as a bare + metal host, even if everything else is the same. + +The ``virsh capabilities`` output will provide information on the high level +CPU model, its features, microcode version. Most of the time this will provide +enough information to know whether the CPUs of two hosts will be compatible. +If there are unexpected differences though, checking the above list of +influencing factors can reveal where the difference arises from. + Import and export of libvirt domain XML configs ----------------------------------------------- -- 2.36.1

2 1

[libvirt PATCH] docs: add info about factors affecting CPU compatibility
by Daniel P. Berrangé 12 Jul '22

12 Jul '22

While libvirt solves most of the problem of ensuring compatibility, when there is incompatibility it can be hard for users to track down the cause. Everything knows to check the physical CPU model, but there are a surprisingly large number of other factors influencing compatibility. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/drvqemu.rst | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index c174bdb4cf..3344df4fb6 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -416,6 +416,86 @@ following command should be run as root, prior to starting libvirtd libvirt will then place each virtual machine in a cgroup at ``/dev/cgroup/libvirt/qemu/$VMNAME/`` + +Live migration compatibility +---------------------------- + +Many factors can affect the ability to live migrate a guest between a pair +of hosts. It is critical that when QEMU is started on the destination host, +the exposed guest machine ABI matches what was exposed by the existing QEMU +process on the source host. To facilitate this, when libvirt receives a +guest configuration document, it will attempt to expand any features that +were not specified, to ensure a stable guest machine ABI. Mostly this involves +adding address information to all devices, and adding controllers to attach +the devices to. + +Certain features that affect the guest ABI, however, may only be known at the +time the guest is started and can be influenced by features of the host OS +and its hardware. This means that even if the guest XML configuration is the +same, it may still be impossible to migrate the guest between two hosts. + +Migration CPU model compatibility +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The most common problems with migration compatibility surround the use of +the guest CPU ``host-model`` or ``host-passthrough`` modes. Both of these +modes attempt to expose the full host CPU featureset to the guest. The +``host-model`` mode attempts to expose as many features as possible while +retaining the ability to accurately check compatibility between hosts prior +to migration running. The ``host-passthrough`` mode attempts to expose the +host CPU as precisely as possible, but with the cost that it is not possible +for libvirt to check compatibility prior to migration. + +If using ``host-model`` the target host hardware and software deployment +must expose a superset of the features of the source host CPU. If using +``host-passthrough`` the target host CPU and software deployment must +always expose a superset of the fetures, however, it is further strongly +recommended that the source and destination hosts be identical in every +way. + +In both cases, there are a number of factors that will influence the CPU +features available to the guest + +* **Physical CPU model** - the core constraint on what features are available. + Check ``/proc/cpuinfo`` for CPU model name. +* **Firmware revision (BIOS/UEFI/etc)** - firmware updates may bundle microcode + updates which arbitrarily add or remove CPU features, typically in response + to new hardware vulnerabilities. Check ``dmidecode`` for details on ``x86`` + and ``aarch64`` platforms for firmware version, and ``/proc/cpuinfo`` for + associated microcode version (if not updated by the OS). +* **Firmware settings** - certain firmware settings can affect accessibility of + features. For example, turning on/off SMT/HT not only affects the number + of logical CPUs available to the OS, but can indirectly influence other + factors such as the number of performance counters available for use. Check + the firmware specific configuration interface. +* **Host kernel version** - the host kernel software version may have a + need to block certain physical CPU features from use in the guest. It can + also emulate certain features that may not exist in the silicon, for example, + x2apic. Check ``uname -r`` output for kernel version. +* **Host kernel settings** - the kernel command line options can be used to + block certain physical CPU features from use in the guest, for example, + ``tsx=off``, ``l1tf=...`` or ``nosmt``. Check ``/proc/cmdline`` and + ``/etc/modprobe.d/*.conf``. +* **microcode update version** - while the firmware will load the initial + microcode in to the CPU, the OS may ship packages providing newer microcode + updates since these can be deployed on a more timely manner than firmware + updates. These updates can arbitrarily load add or remove CPU features. + Check ``/proc/cpuinfo`` for microcode version. +* **QEMU version** - even when the kernel supports exposing a CPU feature to + the guest, an update in the QEMU emulator version will be required to unlock + its usage with a guest, except with ``host-passthrough``. Check the output + of ``$QEMU -version``. +* **libvirt version** - even when the kernel and QEMU support exposing a CPU + feature to the guest, an update in the libvirt version will be required to + unlock its usage with a guest, except with ``host-passthrough``. Check + ``virsh version``. + +The ``virsh capabilities`` output will provide information on the high level +CPU model, its features, microcode version. Most of the time this will provide +enough information to know whether the CPUs of two hosts will be compatible. +If there are unexpected differences though, checking the above list of +influencing factors can reveal where the difference arises from. + Import and export of libvirt domain XML configs ----------------------------------------------- -- 2.36.1

1 0

[PATCH] remote: conf: Mention that 'virtproxyd' doesn't require the '--listen' flag
by Peter Krempa 12 Jul '22

12 Jul '22

'virtproxyd' doesn't have the '--listen' parameter and it's enough just to enable the corresponding option in the config. The config file is generic for all the daemons and we just omit/adjust some sections. Adding a separate mechanism to omit the note about the '--listen' parameter would be overkill so mention explicitly that it's required only for libvirtd and not virtproxyd. The section is omitted for other daemons. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2094641 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/remote/libvirtd.conf.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in index defe6b83d0..929d3922e9 100644 --- a/src/remote/libvirtd.conf.in +++ b/src/remote/libvirtd.conf.in @@ -8,8 +8,10 @@ # # Flag listening for secure TLS connections on the public TCP/IP port. -# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to -# have any effect. +# +# To enable listening sockets with the 'libvirtd' daemon it's also required to +# pass the --listen flag on the commandline of the daemon. +# This is not needed with 'virtproxyd'. # # This setting is not required or honoured if using systemd socket # activation. @@ -21,8 +23,10 @@ #listen_tls = 0 # Listen for unencrypted TCP connections on the public TCP/IP port. -# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to -# have any effect. +# +# To enable listening sockets with the 'libvirtd' daemon it's also required to +# pass the --listen flag on the commandline of the daemon. +# This is not needed with 'virtproxyd'. # # This setting is not required or honoured if using systemd socket # activation. -- 2.36.1

2 1

[(pushed) PATCH] docs: formatstorage: Format XML namespace definition as code block
by Peter Krempa 12 Jul '22

12 Jul '22

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Trivial. docs/formatstorage.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatstorage.rst b/docs/formatstorage.rst index 83d7d141ac..a8149e450c 100644 --- a/docs/formatstorage.rst +++ b/docs/formatstorage.rst @@ -470,9 +470,9 @@ option in libvirt, and thus should never be used in production. options for the mount command via the "-o" option for the ``fs`` or ``netfs`` type storage pools. In order to designate that the Storage Pool will be using the mechanism, the ``pool`` element must be modified to provide the XML - namespace attribute syntax as follows: + namespace attribute syntax as follows:: - xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0' + xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0' The ``fs:mount_opts`` defines the mount options by specifying multiple ``fs:option`` subelements with the attribute ``name`` specifying the mount -- 2.36.1

1 0

[PATCH] ci: Regenerate files with new lcitool
by Peter Krempa 11 Jul '22

11 Jul '22

Apart from other changes this fixes failures with builds on FreeBSD. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Note that this is based on lcitool with the following MR merged: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/290 which is necessary to fix FreeBSD12: https://gitlab.com/pipo.sk/libvirt/-/pipelines/584873900 ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/containers/centos-stream-8.Dockerfile | 1 + ci/containers/centos-stream-9.Dockerfile | 14 ++++-- ci/gitlab.yml | 22 +++++++++ ci/gitlab/build-templates.yml | 12 +++-- ci/gitlab/builds.yml | 60 ++++++++++++------------ ci/gitlab/container-templates.yml | 8 ++-- ci/gitlab/containers.yml | 43 ++++++++++------- 9 files changed, 105 insertions(+), 59 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index e8b06b32e1..b3b3d7a187 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index e8b06b32e1..b3b3d7a187 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 82cbd7cde7..1614cd9b56 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -11,6 +11,7 @@ RUN dnf distro-sync -y && \ dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ + dnf install -y epel-next-release && \ dnf install -y \ audit-libs-devel \ augeas \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 34ff3a06eb..5d0b5ffc6c 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -9,14 +9,14 @@ FROM quay.io/centos/centos:stream9 RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y crb && \ - dnf install -y \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \ - https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm && \ + dnf install -y epel-release && \ + dnf install -y epel-next-release && \ dnf install -y \ audit-libs-devel \ augeas \ bash-completion \ ca-certificates \ + ccache \ clang \ cpp \ cyrus-sasl-devel \ @@ -50,6 +50,7 @@ RUN dnf distro-sync -y && \ librbd-devel \ libselinux-devel \ libssh-devel \ + libssh2-devel \ libtirpc-devel \ libwsman-devel \ libxml2 \ @@ -81,9 +82,14 @@ RUN dnf distro-sync -y && \ yajl-devel && \ dnf autoremove -y && \ dnf clean all -y && \ - rpm -qa | sort > /packages.txt + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index cab4e6074c..ea0f847789 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -4,6 +4,28 @@ # # https://gitlab.com/libvirt/libvirt-ci + +# Variables that can be set to control the behaviour of +# pipelines that are run +# +# - RUN_ALL_CONTAINERS - build all containers +# even if they don't have any changes detected +# +# These can be set as git push options +# +# $ git push -o ci.variable=RUN_ALL_CONTAINERS=1 +# +# Aliases can be set for common usage +# +# $ git config --local alias.push-all-ctr "push -o ci.variable=RUN_ALL_CONTAINERS=1" +# +# Allowing the less verbose invokation +# +# $ git push-all-ctr +# +# Pipeline variables can also be set in the repository +# pipeline config globally, or set against scheduled pipelines + include: - local: '/ci/gitlab/container-templates.yml' - local: '/ci/gitlab/build-templates.yml' diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 20d22914c2..605788dab9 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -9,7 +9,9 @@ image: $CI_REGISTRY_IMAGE/ci-$NAME:latest stage: builds rules: - - if: '$LIBVIRT_JOB_OPTIONAL' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never + - if: '$JOB_OPTIONAL' when: manual allow_failure: true - when: on_success @@ -19,7 +21,9 @@ image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest stage: builds rules: - - if: '$LIBVIRT_JOB_OPTIONAL' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never + - if: '$JOB_OPTIONAL' when: manual allow_failure: true - when: on_success @@ -52,9 +56,9 @@ - cat ci/cirrus/$NAME.yml - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml rules: - - if: "$CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null" + - if: '$CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null' when: never - - if: '$LIBVIRT_JOB_OPTIONAL' + - if: '$JOB_OPTIONAL' when: manual allow_failure: true - when: on_success diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 3ce110d39e..443c1ac299 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -14,7 +14,7 @@ x86_64-almalinux-8: optional: true allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: almalinux-8 RPM: skip @@ -48,7 +48,7 @@ x86_64-alpine-315: optional: true allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: alpine-315 @@ -107,7 +107,7 @@ x86_64-debian-11: optional: true allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -223,7 +223,7 @@ x86_64-ubuntu-2204: optional: true allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: ubuntu-2204 @@ -251,7 +251,7 @@ aarch64-debian-10: allow_failure: true variables: CROSS: aarch64 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -263,7 +263,7 @@ armv6l-debian-10: allow_failure: true variables: CROSS: armv6l - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -286,7 +286,7 @@ i686-debian-10: allow_failure: true variables: CROSS: i686 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -298,7 +298,7 @@ mips-debian-10: allow_failure: true variables: CROSS: mips - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -310,7 +310,7 @@ mips64el-debian-10: allow_failure: true variables: CROSS: mips64el - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -322,7 +322,7 @@ mipsel-debian-10: allow_failure: true variables: CROSS: mipsel - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -334,7 +334,7 @@ ppc64le-debian-10: allow_failure: true variables: CROSS: ppc64le - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -346,7 +346,7 @@ s390x-debian-10: allow_failure: true variables: CROSS: s390x - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-10 @@ -358,7 +358,7 @@ aarch64-debian-11: allow_failure: false variables: CROSS: aarch64 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -370,7 +370,7 @@ armv6l-debian-11: allow_failure: false variables: CROSS: armv6l - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -382,7 +382,7 @@ armv7l-debian-11: allow_failure: false variables: CROSS: armv7l - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -394,7 +394,7 @@ i686-debian-11: allow_failure: false variables: CROSS: i686 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -406,7 +406,7 @@ mips64el-debian-11: allow_failure: false variables: CROSS: mips64el - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -418,7 +418,7 @@ mipsel-debian-11: allow_failure: false variables: CROSS: mipsel - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -430,7 +430,7 @@ ppc64le-debian-11: allow_failure: false variables: CROSS: ppc64le - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -442,7 +442,7 @@ s390x-debian-11: allow_failure: false variables: CROSS: s390x - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11 @@ -454,7 +454,7 @@ aarch64-debian-sid: allow_failure: false variables: CROSS: aarch64 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -466,7 +466,7 @@ armv6l-debian-sid: allow_failure: false variables: CROSS: armv6l - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -478,7 +478,7 @@ armv7l-debian-sid: allow_failure: false variables: CROSS: armv7l - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -490,7 +490,7 @@ i686-debian-sid: allow_failure: false variables: CROSS: i686 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -502,7 +502,7 @@ mips64el-debian-sid: allow_failure: false variables: CROSS: mips64el - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -514,7 +514,7 @@ mipsel-debian-sid: allow_failure: false variables: CROSS: mipsel - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -526,7 +526,7 @@ ppc64le-debian-sid: allow_failure: false variables: CROSS: ppc64le - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -538,7 +538,7 @@ s390x-debian-sid: allow_failure: false variables: CROSS: s390x - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid @@ -550,7 +550,7 @@ mingw32-fedora-36: allow_failure: false variables: CROSS: mingw32 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: fedora-36 @@ -584,7 +584,7 @@ mingw64-fedora-rawhide: allow_failure: true variables: CROSS: mingw64 - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: fedora-rawhide diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templates.yml index c71d03c759..0e52f147bb 100644 --- a/ci/gitlab/container-templates.yml +++ b/ci/gitlab/container-templates.yml @@ -10,7 +10,7 @@ # - Push to default branch: # -> rebuild if dockerfile changed, no cache # - Otherwise -# -> rebuild if LIBVIRT_CI_CONTAINERS=1, no cache, +# -> rebuild if RUN_ALL_CONTAINERS=1, no cache, # to pick up new published distro packages or # recover from deleted tag # @@ -40,16 +40,18 @@ after_script: - docker logout rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' when: on_success changes: - ci/gitlab/container-templates.yml - ci/containers/$NAME.Dockerfile - - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $LIBVIRT_CI_CONTAINERS == "1"' + - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $RUN_ALL_CONTAINERS == "1"' when: on_success - if: '$CI_PROJECT_NAMESPACE == "libvirt"' when: never - - if: '$LIBVIRT_JOB_OPTIONAL' + - if: '$JOB_OPTIONAL' when: manual allow_failure: true - when: on_success diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 7cdf3eb9a0..3835a19216 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -25,6 +25,7 @@ x86_64-alpine-315-container: extends: .container_job allow_failure: false variables: + JOB_OPTIONAL: 1 NAME: alpine-315 @@ -126,6 +127,7 @@ aarch64-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-aarch64 @@ -133,6 +135,7 @@ armv6l-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-armv6l @@ -147,6 +150,7 @@ i686-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-i686 @@ -154,6 +158,7 @@ mips-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-mips @@ -161,6 +166,7 @@ mips64el-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-mips64el @@ -168,6 +174,7 @@ mipsel-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-mipsel @@ -175,6 +182,7 @@ ppc64le-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-ppc64le @@ -182,6 +190,7 @@ s390x-debian-10-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-s390x @@ -189,7 +198,7 @@ aarch64-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-aarch64 @@ -197,7 +206,7 @@ armv6l-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-armv6l @@ -205,7 +214,7 @@ armv7l-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-armv7l @@ -213,7 +222,7 @@ i686-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-i686 @@ -221,7 +230,7 @@ mips64el-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-mips64el @@ -229,7 +238,7 @@ mipsel-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-mipsel @@ -237,7 +246,7 @@ ppc64le-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-ppc64le @@ -245,7 +254,7 @@ s390x-debian-11-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-11-cross-s390x @@ -253,7 +262,7 @@ aarch64-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-aarch64 @@ -261,7 +270,7 @@ armv6l-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-armv6l @@ -269,7 +278,7 @@ armv7l-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-armv7l @@ -277,7 +286,7 @@ i686-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-i686 @@ -285,7 +294,7 @@ mips64el-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-mips64el @@ -293,7 +302,7 @@ mipsel-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-mipsel @@ -301,7 +310,7 @@ ppc64le-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-ppc64le @@ -309,7 +318,7 @@ s390x-debian-sid-container: extends: .container_job allow_failure: false variables: - LIBVIRT_JOB_OPTIONAL: 1 + JOB_OPTIONAL: 1 NAME: debian-sid-cross-s390x @@ -317,6 +326,7 @@ mingw32-fedora-36-container: extends: .container_job allow_failure: false variables: + JOB_OPTIONAL: 1 NAME: fedora-36-cross-mingw32 @@ -338,4 +348,5 @@ mingw64-fedora-rawhide-container: extends: .container_job allow_failure: true variables: + JOB_OPTIONAL: 1 NAME: fedora-rawhide-cross-mingw64 -- 2.36.1

2 1

[PATCH] vircpi: Add PCIe 5.0 and 6.0 link speeds
by Michal Privoznik 11 Jul '22

11 Jul '22

The PCIe 5.0 and PCIe 6.0 standards define new link speeds: 32GT/s and 64GT/s, respectively. Update our internal enum to include these new speeds. Otherwise we format incorrect XML: <pci-express> <link validity='cap' port='0' speed='(null)' width='16'/> <link validity='sta' speed='16' width='16'/> </pci-express> Like all "good" specifications, these are also locked behind a login portal. But we can look at pciutils' source code: [1] and [2]. 1: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c… 2: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c… Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2105231 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virpci.c | 2 +- src/util/virpci.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 03d1d7b074..7800966963 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -45,7 +45,7 @@ VIR_LOG_INIT("util.pci"); VIR_ENUM_IMPL(virPCIELinkSpeed, VIR_PCIE_LINK_SPEED_LAST, - "", "2.5", "5", "8", "16", + "", "2.5", "5", "8", "16", "32", "64" ); VIR_ENUM_IMPL(virPCIStubDriver, diff --git a/src/util/virpci.h b/src/util/virpci.h index b9b9cd7b34..4d9193f24e 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -83,6 +83,8 @@ typedef enum { VIR_PCIE_LINK_SPEED_5, VIR_PCIE_LINK_SPEED_8, VIR_PCIE_LINK_SPEED_16, + VIR_PCIE_LINK_SPEED_32, + VIR_PCIE_LINK_SPEED_64, VIR_PCIE_LINK_SPEED_LAST } virPCIELinkSpeed; -- 2.35.1

2 1

[PATCH] virsh: Require --xpath for dumpxml
by Michal Privoznik 08 Jul '22

08 Jul '22

Historically, the dumpxml command reject any unknown arguments, for instance: virsh dumpxml fedora xxx However, after v8.5.0-rc1~31 the second argument ('xxx') is treated as an XPath, but it's not that clearly visible. Therefore, require the --xpath switch, like this: virsh dumpxml fedora --xpath xxx Yes, this breaks already released virsh, but I think we can argue that the pool of users of this particular function is very small. The sooner we do this change, the better. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 43034f2f81..a181ae005f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10461,6 +10461,7 @@ static const vshCmdOptDef opts_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, + .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, -- 2.35.1

3 3

[PATCH] qemu_monitor_json: Implement logic for setting iothread.thread-pool-{min, max}
by Michal Privoznik 07 Jul '22

07 Jul '22

When virDomainSetIOThreadParams() API is called, well its QEMU impl: qemuDomainSetIOThreadParams() then typed params are parsed by qemuDomainIOThreadParseParams() into this qemuMonitorIOThreadInfo struct. In the struct we have a <int, bool> pair for every IOThread attribute we can tune through monitor. The struct is then passed to qemuMonitorJSONSetIOThread() which looks at the bool and if set then the corresponding attribute is set to given value. Each attribute is thus changed in a separate call. While this works for attributes independent of each other ("poll-max-ns", "poll-grow", "poll-shrink"), it does not always work for the other attributes ("thread-pool-min" and "thread-pool-max"). The limitation here is that the lower boundary (minimum) has to be lower (or equal to) the upper boundary (maximum) at all times. This means, that in some cases we might need to set attributes in reversed order to meet the constraint. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/339 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3aad2ab212..80696de731 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7428,6 +7428,7 @@ qemuMonitorJSONSetIOThread(qemuMonitor *mon, { g_autofree char *path = NULL; qemuMonitorJSONObjectProperty prop; + bool setMaxFirst = false; path = g_strdup_printf("/objects/iothread%u", iothreadInfo->iothread_id); @@ -7443,8 +7444,32 @@ qemuMonitorJSONSetIOThread(qemuMonitor *mon, VIR_IOTHREAD_SET_PROP("poll-max-ns", poll_max_ns); VIR_IOTHREAD_SET_PROP("poll-grow", poll_grow); VIR_IOTHREAD_SET_PROP("poll-shrink", poll_shrink); - VIR_IOTHREAD_SET_PROP("thread-pool-min", thread_pool_min); - VIR_IOTHREAD_SET_PROP("thread-pool-max", thread_pool_max); + + if (iothreadInfo->set_thread_pool_min && + iothreadInfo->set_thread_pool_max) { + int curr_max = -1; + + /* By default, the minimum is set first, followed by the maximum. But + * if the current maximum is below the minimum we want to set we need + * to set the maximum first. Otherwise would get an error because we + * would be attempting to shift minimum above maximum. */ + prop.type = QEMU_MONITOR_OBJECT_PROPERTY_INT; + if (qemuMonitorJSONGetObjectProperty(mon, path, + "thread-pool-max", &prop) < 0) + return -1; + curr_max = prop.val.iv; + + if (curr_max < iothreadInfo->thread_pool_min) + setMaxFirst = true; + } + + if (setMaxFirst) { + VIR_IOTHREAD_SET_PROP("thread-pool-max", thread_pool_max); + VIR_IOTHREAD_SET_PROP("thread-pool-min", thread_pool_min); + } else { + VIR_IOTHREAD_SET_PROP("thread-pool-min", thread_pool_min); + VIR_IOTHREAD_SET_PROP("thread-pool-max", thread_pool_max); + } #undef VIR_IOTHREAD_SET_PROP -- 2.35.1

2 1

[PATCH RFC v2 0/3] qemu: add an API for "query-stats" QMP command
by Amneesh Singh 07 Jul '22

07 Jul '22

QEMU is gaining introspectable statistics which can be queried via the "query-stats" QMP command. This patchset aims to add an API for the same. The returned JSON for "query-stats" is an array of objects containing their own respective array of statistics. Patch 1 adds the API which returns the deserialized JSON in the form of a GPtrArray of GHashTables. Patch 2 adds the "query-stats" to QEMU capabilities. Patch 3 uses the API to query the halt poll success time and the halt poll failure time. v1 -> v2 ======== I have been tinkering with the v1 patchset and have rewrote the v2 patches a couple of times. I believe the current patchset is still not perfect and would appreciate some reviews. I have another patch or two written but they do not make any significant changes to the current patchset. [1/3]: - use virBitmap instead of an array of strings for statistics. - add enums for the stat names and add qemuMonitorQueryStatsNameTypeToString to switch between the "ToString" functions based on the target type. - change qemuMonitorQueryStatsProviderNew to a variadic function that takes stat enum values with the sentinel value being -1. [2/3]: - No changes [3/3]: - Add relevant monitor related checks to check if the domain is active. - Acquire and release qemuMonitorObj lock before and after calling qemuMonitorQueryStats respectively. - Add the check for privileged access. Relevant QEMU patches can be found here: https://lore.kernel.org/all/20220530150714.756954-1-pbonzini@redhat.com/ This patchset is part of the 2022 GSOC contributor project. Amneesh Singh (3): qemu_monitor: add qemuMonitorQueryStats qemu_capabilities: add "query-stats" QMP command to the QEMU capabilities qemu_driver: use qemuMonitorQueryStats to extract halt poll time src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 70 ++++++++++++++++--- src/qemu/qemu_monitor.c | 106 ++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 56 +++++++++++++++ src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++ 7 files changed, 363 insertions(+), 8 deletions(-) -- 2.36.1

2 6

[PATCH 00/11] Test case cleanups
by Peter Krempa 07 Jul '22

07 Jul '22

These patches originate from my upcoming series bumping minimum qemu version to 4.2 and are valid even without the qemu version bump. Peter Krempa (11): test: domaincaps: Remove old test data qemuxml2(argv|xml)test: Drop qemu-3.1 version of 'cpu-Icelake-Server-pconfig' qemuxml2argvtest: Drop 'qemu-4.1' versions of hyperv tests qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)' cases to VIR_TEST_CAPS_LATEST qemuxml2argvtest: Remove qemu-4.0 versions of cpu feature test cases qemuxml2argvtest: Convert 'net-user' case to _LATEST qemuxml2argvtest: Make 'qemu-ns' test case more stable qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the block setting fake host cpu qemu: Remove qemu-4.0 version of 'cpu-translation' test case qemucapabilitiestest: Fake proper version for 'caps_4.2.0.ppc64' case qemucapabilitiestest: Fake proper version for 'caps_4.2.0.aarch64' case .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 191 --------------- .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 204 ---------------- tests/domaincapsdata/qemu_2.11.0.s390x.xml | 219 ----------------- tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 191 --------------- .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 212 ---------------- .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 222 ----------------- .../qemu_2.12.0-virt.aarch64.xml | 172 ------------- tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 166 ------------- tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 136 ----------- tests/domaincapsdata/qemu_2.12.0.s390x.xml | 219 ----------------- tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 212 ---------------- .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 208 ---------------- .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 220 ----------------- tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 138 ----------- tests/domaincapsdata/qemu_3.0.0.s390x.xml | 226 ------------------ tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 208 ---------------- .../caps_4.2.0.aarch64.replies | 4 +- .../caps_4.2.0.aarch64.xml | 2 +- .../caps_4.2.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 +- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 33 --- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 31 --- ...gs => cpu-eoi-disabled.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/cpu-eoi-disabled.xml | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 31 --- ...rgs => cpu-eoi-enabled.x86_64-latest.args} | 13 +- tests/qemuxml2argvdata/cpu-eoi-enabled.xml | 2 +- .../cpu-translation.x86_64-4.0.0.args | 33 --- .../eoi-enabled.x86_64-4.0.0.args | 32 --- .../hyperv-panic.x86_64-4.0.0.args | 31 --- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 31 --- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 32 --- .../net-user.x86_64-4.0.0.args | 35 --- ...4.0.0.args => net-user.x86_64-latest.args} | 18 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 32 --- .../pv-spinlock-enabled.x86_64-4.0.0.args | 32 --- tests/qemuxml2argvdata/qemu-ns.xml | 1 - tests/qemuxml2argvtest.c | 24 +- ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 32 --- tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +- tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +- .../qemu-ns.x86_64-latest.xml | 1 - tests/qemuxml2xmltest.c | 1 - 43 files changed, 41 insertions(+), 3578 deletions(-) delete mode 100644 tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.11.0.s390x.xml delete mode 100644 tests/domaincapsdata/qemu_2.11.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_2.12.0.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_2.12.0.ppc64.xml delete mode 100644 tests/domaincapsdata/qemu_2.12.0.s390x.xml delete mode 100644 tests/domaincapsdata/qemu_2.12.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_3.0.0.ppc64.xml delete mode 100644 tests/domaincapsdata/qemu_3.0.0.s390x.xml delete mode 100644 tests/domaincapsdata/qemu_3.0.0.x86_64.xml delete mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-eoi-disabled.args rename tests/qemuxml2argvdata/{hyperv-off.x86_64-4.0.0.args => cpu-eoi-disabled.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-eoi-enabled.args rename tests/qemuxml2argvdata/{eoi-disabled.x86_64-4.0.0.args => cpu-eoi-enabled.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args rename tests/qemuxml2argvdata/{qemu-ns.x86_64-4.0.0.args => net-user.x86_64-latest.args} (61%) delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml -- 2.36.1

2 13

[PATCH 0/3] conf: Separate domain post parse code into domain_postparse.c
by Michal Privoznik 07 Jul '22

07 Jul '22

*** BLURB HERE *** Michal Prívozník (3): domain_conf: Unexport virDomainDefPostParseDeviceIteratorData conf: Separate domain post parse code into domain_postparse.c domain_postparse: Move error messages onto single line po/POTFILES | 1 + src/conf/domain_conf.c | 1446 +--------------------------------- src/conf/domain_conf.h | 10 - src/conf/domain_postparse.c | 1466 +++++++++++++++++++++++++++++++++++ src/conf/domain_postparse.h | 37 + src/conf/domain_validate.c | 11 +- src/conf/meson.build | 1 + src/libvirt_private.syms | 5 +- src/libxl/xen_xl.c | 1 + src/libxl/xen_xm.c | 1 + src/lxc/lxc_native.c | 1 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_process.c | 1 + src/vmx/vmx.c | 1 + 14 files changed, 1525 insertions(+), 1458 deletions(-) create mode 100644 src/conf/domain_postparse.c create mode 100644 src/conf/domain_postparse.h -- 2.35.1

2 4

[PATCH] docs: Fix syntax error for defaultiothread
by Han Han 07 Jul '22

07 Jul '22

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index a4e3c39928..89b627f4bd 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -715,7 +715,7 @@ host/guest with many LUNs. :since:`Since 1.2.8 (QEMU only)` <iothread id="6"/> <iothread id="8" thread_pool_min="2" thread_pool_max="32"/> </iothreadids> - <defaultiothread thread_pool_min="8" thread_pool_max="16"> + <defaultiothread thread_pool_min="8" thread_pool_max="16"/> ... </domain> -- 2.36.1

2 1

[PATCH] schemas: rng: Make secret optional in storage vol
by Han Han 07 Jul '22

07 Jul '22

For a qcow2 storage volume with luks encryption created by qemu-img, its dumped storage vol XML has no secret element in encryption: <volume type='file'> ... <encryption format='luks'> </encryption> ... </volume> That will cause a failure in rng validation. Fix that validation failure. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/conf/schemas/storagecommon.rng | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng index 10f1bc6a15..76714c9aad 100644 --- a/src/conf/schemas/storagecommon.rng +++ b/src/conf/schemas/storagecommon.rng @@ -24,17 +24,19 @@ </choice> </attribute> </optional> - <interleave> - <ref name="secret"/> - <optional> - <element name="cipher"> - <ref name="keycipher"/> - </element> - <element name="ivgen"> - <ref name="keyivgen"/> - </element> - </optional> - </interleave> + <optional> + <interleave> + <ref name="secret"/> + <optional> + <element name="cipher"> + <ref name="keycipher"/> + </element> + <element name="ivgen"> + <ref name="keyivgen"/> + </element> + </optional> + </interleave> + </optional> </element> </define> -- 2.36.1

2 1

[PATCH] virt-xml-validate: Fix incorrect wildcards for XML roots
by Han Han 07 Jul '22

07 Jul '22

To match the XML roots domainCapabilities and storagepoolCapabilities, the wildcards should be *domainCap* and *storagepoolCap*. Fixes: 7b0e2e4a55 Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virt-xml-validate.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index e444ef2fbc..2d5ba510ab 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -86,7 +86,7 @@ if [ -z "$TYPE" ]; then *domainbackup*) TYPE="domainbackup" ;; - *domaincaps*) + *domainCap*) TYPE="domaincaps" ;; *domain*) @@ -98,7 +98,7 @@ if [ -z "$TYPE" ]; then *network*) TYPE="network" ;; - *storagepoolcaps*) + *storagepoolCap*) TYPE="storagepoolcaps" ;; *pool*) -- 2.36.1

2 1

[PATCH] domain_validate: Properly terminate switch() in virDomainIOMMUDefValidate()
by Michal Privoznik 04 Jul '22

04 Jul '22

In my previous commit I've introduced virDomainIOMMUDefValidate() function with a switch() statement. However, two cases in it, though empty, were not terminated with a break statement which made compiler complain. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Merged under trivial rule. src/conf/domain_validate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index d35451c26a..57d4e63a26 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2598,6 +2598,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: case VIR_DOMAIN_IOMMU_MODEL_LAST: + break; } return 0; -- 2.35.1

1 0

Re: Incomplete information in the website Wiki for libvirt.org
by Martin Kletzander 04 Jul '22

04 Jul '22

On Fri, Jul 01, 2022 at 04:37:55AM -0500, Uriel Emmanuel Pelaez Hernández wrote: >Dear Web Marster from wiki.libvirt.org, > >I tried to look for the libvirtd, the demon that is suppose to run under >Linux/Unix environment, >but your site didn't show any information. Only a statement appeared: >"Create the page libvirtd " > Hi, we are slowly migrating the wiki pages to knowledge base articles due to various issues with the wiki. >Please, update your site or suggest any other weblink with the information. > Have a look at our docs page: https://libvirt.org/docs.html where you might find what you are looking for. There is a particular page about daemons here: https://libvirt.org/daemons.html >In theory CygWin use your package, but the information is incomplete too, >about this issue. > >I send this mail to these both Email address by the information displayed >in your wiki, about the contact address to solve this kind of problems. > Unfortunately I am not sure what are you trying to solve, so I don't know what clearer pointers to give you. >By now, Google Service in my region is deprecated, so the information that >the WebBrowser display is not the best. > >I send this request from my Email of Graduated Student form the University >domain. > >Best Regards, >Mr. Peláez Uriel. >Mexico City Have a nice day, Martin

1 0

[PATCH 0/3] IOMMU improvements
by Michal Privoznik 04 Jul '22

04 Jul '22

These are inspired by: https://bugzilla.redhat.com/show_bug.cgi?id=2101633 While there are some missing info to fix the actual but, I've noticed couple of areas for improvement while investigating the bug. Michal Prívozník (3): qemu_domain_address: Drop needless virDomainIOMMUModel typecast docs: Document <address/> for IOMMU device domain_validate: Disallow non-virtio IOMMU with an <address/> docs/formatdomain.rst | 3 +++ src/conf/domain_validate.c | 25 ++++++++++++++++++++++++- src/qemu/qemu_domain_address.c | 4 ++-- 3 files changed, 29 insertions(+), 3 deletions(-) -- 2.35.1

2 4

[libvirt PATCH] [pushed] Fix spelling
by Tim Wiederhake 04 Jul '22

04 Jul '22

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/kbase/secureboot.rst | 2 +- src/qemu/qemu_migration.c | 2 +- src/rpc/virnetmessage.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/kbase/secureboot.rst b/docs/kbase/secureboot.rst index ebd9d56da8..8f151c1f2a 100644 --- a/docs/kbase/secureboot.rst +++ b/docs/kbase/secureboot.rst @@ -49,7 +49,7 @@ snippet: </os> Versions older than 7.2.0 require manually providing all information -about the firmware and are not covered here. Plese refer to `the +about the firmware and are not covered here. Please refer to `the relevant documentation <../formatdomain.html#operating-system-booting>`__ for details. diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 368995085f..9c3fd41761 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2726,7 +2726,7 @@ qemuMigrationAnyCanResume(virDomainObj *vm, /* This should never happen since POSTCOPY_RESUME is newer than * CHANGE_PROTECTION, but let's check it anyway in case we're talking to - * a weired client. + * a weird client. */ if (job == VIR_ASYNC_JOB_MIGRATION_OUT && expectedPhase < QEMU_MIGRATION_PHASE_PERFORM_RESUME && diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index d298d30d57..ceba1a5a8e 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -437,7 +437,7 @@ int virNetMessageDecodePayload(virNetMessage *msg, * virNetMessageEncodePayloadRaw: * @msg: message to encode payload into * @data: data to encode into @msg - * @len: lenght of @data + * @len: length of @data * * Encodes message payload. If @data is NULL or @len is 0 an empty message is * encoded. -- 2.36.1

1 0

[libvirt PATCH] conf: fix error message for wrong thread_pool_size
by Ján Tomko 01 Jul '22

01 Jul '22

Fix the copy-and-paste error by referring to the correct variable. Fixes: 0df2e7df80452f81edbfeb0ee355235b533346a9 https://bugzilla.redhat.com/show_bug.cgi?id=2103132 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fb8bf4cfec..2c2f23242e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9949,7 +9949,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, virStrToLong_i(thread_pool_size, NULL, 10, &def->thread_pool_size) < 0) { virReportError(VIR_ERR_XML_ERROR, _("cannot parse thread pool size '%s' for virtiofs"), - queue_size); + thread_pool_size); goto error; } -- 2.35.3

1 0

[PATCH] storagepoolxml2argvtest: Fix output data for 'pool-netfs-protocol-ver'
by Peter Krempa 01 Jul '22

01 Jul '22

The storage pool tests have host-specific versions which I neglected to update in commit c44930d932203b4a58dccbbeaa814fff6cea8216 thus breaking the test-suite on non-linux OSes. Fixes: c44930d932203b4a58dccbbeaa814fff6cea8216 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as a build-fix. .../pool-netfs-protocol-ver-freebsd.argv | 2 +- tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv index 32cdaebcff..20954ef50c 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv @@ -1,5 +1,5 @@ mount \ --o nosuid,noexec,nfsvers=3 \ +-o nosuid,noexec,nfsvers=4.1 \ -t nfs \ localhost:/var/lib/libvirt/images \ /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv index ed157883c0..9afc6090b8 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv @@ -1,5 +1,5 @@ mount \ --o nfsvers=3 \ +-o nfsvers=4.1 \ -t nfs \ localhost:/var/lib/libvirt/images \ /mnt -- 2.36.1

1 0

[PATCHv2] storage: pool: Allow more intricate nfs protocol versions
by Peter Krempa 01 Jul '22

01 Jul '22

Treat the 'protocolVer' field as a string so that e.g. '4.1' can be used. Forbid only ',' in the string as it's a separator of arguments for mount options. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- v2: - forbid ',' in the version string. docs/formatstorage.rst | 2 +- src/conf/schemas/storagepool.rng | 4 +--- src/conf/storage_conf.c | 17 ++++++++--------- src/conf/storage_conf.h | 2 +- src/storage/storage_util.c | 4 ++-- .../pool-netfs-protocol-ver-linux.argv | 2 +- .../pool-netfs-protocol-ver.xml | 2 +- .../pool-netfs-protocol-ver.xml | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/docs/formatstorage.rst b/docs/formatstorage.rst index ef15c0ac5c..83d7d141ac 100644 --- a/docs/formatstorage.rst +++ b/docs/formatstorage.rst @@ -350,7 +350,7 @@ following child elements: ``protocol`` For a ``netfs`` Storage Pool provide a mechanism to define which NFS protocol version number will be used to contact the server's NFS service. The - attribute ``ver`` accepts an unsigned integer as the version number to use. + attribute ``ver`` accepts the version number to use. :since:`Since 5.1.0` ``vendor`` Provides optional information about the vendor of the storage device. This diff --git a/src/conf/schemas/storagepool.rng b/src/conf/schemas/storagepool.rng index bd24b8b8d0..d81ead532a 100644 --- a/src/conf/schemas/storagepool.rng +++ b/src/conf/schemas/storagepool.rng @@ -577,9 +577,7 @@ <ref name="sourcefmtnetfs"/> <optional> <element name="protocol"> - <attribute name="ver"> - <ref name="unsignedInt"/> - </attribute> + <attribute name="ver"/> </element> </optional> <optional> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 5da0bf20dd..79f16aadf3 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -483,6 +483,7 @@ virStoragePoolSourceClear(virStoragePoolSource *source) virStorageAuthDefFree(source->auth); VIR_FREE(source->vendor); VIR_FREE(source->product); + VIR_FREE(source->protocolVer); } @@ -526,7 +527,6 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, virStoragePoolOptions *options; int n; g_autoptr(virStorageAuthDef) authdef = NULL; - g_autofree char *ver = NULL; g_autofree xmlNodePtr *nodeset = NULL; g_autofree char *sourcedir = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) @@ -634,7 +634,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, } /* Option protocol version string (NFSvN) */ - if ((ver = virXPathString("string(./protocol/@ver)", ctxt))) { + if ((source->protocolVer = virXPathString("string(./protocol/@ver)", ctxt))) { if ((source->format != VIR_STORAGE_POOL_NETFS_NFS) && (source->format != VIR_STORAGE_POOL_NETFS_AUTO)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -643,10 +643,11 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, virStoragePoolFormatFileSystemNetTypeToString(source->format)); return -1; } - if (virStrToLong_uip(ver, NULL, 0, &source->protocolVer) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("storage pool protocol ver '%s' is malformed"), - ver); + + if (strchr(source->protocolVer, ',')) { + virReportError(VIR_ERR_XML_DETAIL, + _("storage pool protocol ver '%s' must not contain ','"), + source->protocolVer); return -1; } } @@ -1099,9 +1100,7 @@ virStoragePoolSourceFormat(virBuffer *buf, if (src->auth) virStorageAuthDefFormat(buf, src->auth); - if (src->protocolVer) - virBufferAsprintf(buf, "<protocol ver='%u'/>\n", src->protocolVer); - + virBufferEscapeString(buf, "<protocol ver='%s'/>\n", src->protocolVer); virBufferEscapeString(buf, "<vendor name='%s'/>\n", src->vendor); virBufferEscapeString(buf, "<product name='%s'/>\n", src->product); diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index de39c3f294..a1bf243935 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -213,7 +213,7 @@ struct _virStoragePoolSource { int format; /* Protocol version value for netfs */ - unsigned int protocolVer; + char *protocolVer; }; typedef struct _virStoragePoolTarget virStoragePoolTarget; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 6ed2078b65..3871718b09 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -4201,8 +4201,8 @@ virStorageBackendFileSystemMountCmd(const char *cmdstr, virCommand *cmd = NULL; g_autofree char *nfsVers = NULL; - if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer > 0) - nfsVers = g_strdup_printf("nfsvers=%u", def->source.protocolVer); + if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer) + nfsVers = g_strdup_printf("nfsvers=%s", def->source.protocolVer); cmd = virCommandNew(cmdstr); if (netauto) diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv index dac46a074f..da3e0c5927 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv @@ -1,5 +1,5 @@ mount \ --o nodev,nosuid,noexec,nfsvers=3 \ +-o nodev,nosuid,noexec,nfsvers=4.1 \ -t nfs \ localhost:/var/lib/libvirt/images \ /mnt diff --git a/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml b/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml index 40f3f94e41..f35992e3c8 100644 --- a/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml +++ b/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml @@ -8,7 +8,7 @@ <host name='localhost'/> <dir path='/var/lib/libvirt/images'/> <format type='nfs'/> - <protocol ver='3'/> + <protocol ver='4.1'/> </source> <target> <path>/mnt</path> diff --git a/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml b/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml index 5fcad1305b..74c2f5edfe 100644 --- a/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml +++ b/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml @@ -8,7 +8,7 @@ <host name='localhost'/> <dir path='/var/lib/libvirt/images'/> <format type='nfs'/> - <protocol ver='3'/> + <protocol ver='4.1'/> </source> <target> <path>/mnt</path> -- 2.36.1

2 1