- Devel - libvirt List Archives

[PATCH] build: Require glib >= 2.56
by Jim Fehlig 03 Mar '21

03 Mar '21

There are a few uses of g_autoslist in the qemu driver and likely more will come throughout the codebase in the future. g_autoslist first appeared in glib 2.56, so bump the minimum version. https://developer.gnome.org/glib/stable/glib-Miscellaneous-Macros.html#g-au… Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- libvirt.spec.in | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 29b476184d..8d8b900fbb 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -278,7 +278,7 @@ BuildRequires: systemd-units %if %{with_libxl} BuildRequires: xen-devel %endif -BuildRequires: glib2-devel >= 2.48 +BuildRequires: glib2-devel >= 2.56 BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: readline-devel diff --git a/meson.build b/meson.build index daa1475c99..c225df42d4 100644 --- a/meson.build +++ b/meson.build @@ -1038,7 +1038,7 @@ if fuse_dep.found() conf.set('WITH_FUSE', 1) endif -glib_version = '2.48.0' +glib_version = '2.56.0' glib_dep = dependency('glib-2.0', version: '>=' + glib_version) gobject_dep = dependency('gobject-2.0', version: '>=' + glib_version) if host_machine.system() == 'windows' -- 2.29.2

5 7

Some confusion about lsilogic controller
by xingchaochao 03 Mar '21

03 Mar '21

Hello, I have been confused by such a phenomenon recently. Libvirt is the master branch , and the VM is centos8.2(kernel is 4.18.0-193.el8.aarch64). When I hot-plug the scsi disk for a virtual machine without a virtio-scsi controller, libvirt will automatically generate an lsilogic controller for the scsi disk. <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none' io='native'/> <source file='/Images/xcc/tmp.img'/> <backingStore/> <target dev='sdt' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> linux-upcHIq:/Images/xcc # virsh list Id Name State ---------------------- 12 g1 running linux-upcHIq:/Images/xcc # virsh attach-device g1 disk.xml Device attached successfully linux-upcHIq:/Images/xcc # virsh dumpxml g1 | grep scsi <target dev='sdt' bus='scsi'/> <alias name='scsi0-0-0'/> <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> But this scsi disk cannot be found through the lsblk command inside the virtual machine. [root@localhost ~]# lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT vda 252:0 0 20G 0 disk ├─vda1 252:1 0 600M 0 part /boot/efi ├─vda2 252:2 0 1G 0 part /boot └─vda3 252:3 0 18.4G 0 part ├─cl-root 253:0 0 16.4G 0 lvm / └─cl-swap 253:1 0 2G 0 lvm [SWAP] After hot unplugging the scsi disk, I performed the hot unplug operation of the lsilogic controller. libvirt shows "Device detached successfully", but in fact, the lsilogic controller is not removed from the live XML and persistent XML. Through "virsh dumpxml vmname" and "virsh edit vmname", I can see <controller type='scsi' index='0' model='lsilogic'> is always there. linux-upcHIq:/Images/xcc # virsh detach-device g1 disk.xml Device detached successfully linux-upcHIq:/Images/xcc # virsh dumpxml g1 | grep scsi <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> linux-upcHIq:/Images/xcc # linux-upcHIq:/Images/xcc # cat lsi.xml <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> <address type='pci' domain='0x0000' bus='0x03' slot='0x05' function='0x0'/> </controller> linux-upcHIq:/Images/xcc # virsh detach-device g1 lsi.xml Device detached successfully linux-upcHIq:/Images/xcc # virsh dumpxml g1 | grep scsi <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> I am confused, why libvirt chooses to generate an lsilogic controller for the scsi disk when there is no scsi controller, instead of directly reporting an error and exiting the hot plug operation. After all, the scsi disk based on the lsilogic controller is not perceived inside the virtual machine, and lsilogic will remain in the XML file of the virtual machine.

2 2

[PATCH v2 00/31] qapi/qom: QAPIfy --object and object-add
by Kevin Wolf 03 Mar '21

03 Mar '21

This series adds a QAPI type for the properties of all user creatable QOM types and finally makes the --object command line option (in all binaries) and the object-add monitor commands (in QMP and HMP) use the new ObjectOptions union. This change improves things in more than just one way: 1. Documentation for QOM object types has always been lacking. Adding the schema, we get documentation for every property. 2. It prevents bugs by performing parts of the input validation (e.g. checking presence of mandatory properties) already in QAPI instead of relying on separate manual implementations in each class. 3. It provides QAPI introspection for user creatable objects. 4. Non-scalar properties are now supported everywhere because the command line parsers (including HMP) use the keyval parser now. If you are in the CC list and didn't expect this series, it's probably because you're the maintainer of one of the objects for which I'm adding a QAPI schema description. Please just have a look at the specific patch for your object and check whether the schema and its documentation make sense to you. You can ignore all other patches. In a next step after this series, we can add make use of the QAPI structs in the implementation of the object and separate their configuration from the runtime state. Specifically, the plan is to add a .configure() callback to ObjectClass that allows configuring the object in one place at creation time and keeping QOM property setters only for properties that can actually be changed at runtime. Paolo made an example of what the state could look like after this: https://wiki.qemu.org/Features/QOM-QAPI_integration Finally, the intention is to extend the QAPI schema to have separate 'object' entities and generate some of the code that was written manually in the intermediate state before. This series is available as a git tag at: https://repo.or.cz/qemu/kevin.git qapi-object-v2 v2: - Convert not only object-add, but all external interfaces so that the schema will always be enforced and mismatch between implementation and schema can't go unnoticed. - Rebased, covering properties and object types added since v1 (yes, things do become outdated rather quickly when you touch all user creatable objects) - Changed the "Since:" version number in the schema documentation to refer to the version when the object was introduced rather than 6.0 where the schema will (hopefully) be added - Probably some other minor changes Kevin Wolf (31): tests: Drop 'props' from object-add calls qapi/qom: Drop deprecated 'props' from object-add qapi/qom: Add ObjectOptions for iothread qapi/qom: Add ObjectOptions for authz-* qapi/qom: Add ObjectOptions for cryptodev-* qapi/qom: Add ObjectOptions for dbus-vmstate qapi/qom: Add ObjectOptions for memory-backend-* qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened' qapi/qom: Add ObjectOptions for throttle-group qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded' qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded' qapi/qom: Add ObjectOptions for can-* qapi/qom: Add ObjectOptions for colo-compare qapi/qom: Add ObjectOptions for filter-* qapi/qom: Add ObjectOptions for pr-manager-helper qapi/qom: Add ObjectOptions for confidential-guest-support qapi/qom: Add ObjectOptions for input-* qapi/qom: Add ObjectOptions for x-remote-object qapi/qom: QAPIfy object-add qom: Make "object" QemuOptsList optional qemu-storage-daemon: Implement --object with qmp_object_add() qom: Remove user_creatable_add_dict() qom: Factor out user_creatable_process_cmdline() qemu-io: Use user_creatable_process_cmdline() for --object qemu-img: Use user_creatable_process_cmdline() for --object qemu-nbd: Use user_creatable_process_cmdline() for --object qom: Add user_creatable_add_from_str() hmp: QAPIfy object_add qom: Add user_creatable_parse_str() vl: QAPIfy -object qom: Drop QemuOpts based interfaces qapi/authz.json | 62 +++ qapi/block-core.json | 27 ++ qapi/common.json | 52 +++ qapi/crypto.json | 159 +++++++ qapi/machine.json | 22 +- qapi/net.json | 20 - qapi/qom.json | 639 ++++++++++++++++++++++++++- qapi/ui.json | 13 +- docs/system/deprecated.rst | 25 +- docs/system/removed-features.rst | 5 + include/qom/object_interfaces.h | 106 ++--- hw/block/xen-block.c | 16 +- monitor/hmp-cmds.c | 17 +- monitor/misc.c | 2 - qemu-img.c | 239 ++-------- qemu-io.c | 33 +- qemu-nbd.c | 34 +- qom/object_interfaces.c | 168 +++---- qom/qom-qmp-cmds.c | 28 +- softmmu/vl.c | 109 +++-- storage-daemon/qemu-storage-daemon.c | 25 +- tests/check-qom-proplist.c | 42 +- tests/qtest/qmp-cmd-test.c | 16 +- tests/qtest/test-netfilter.c | 54 +-- hmp-commands.hx | 2 +- storage-daemon/qapi/qapi-schema.json | 1 + tests/qemu-iotests/087 | 8 +- tests/qemu-iotests/184 | 18 +- tests/qemu-iotests/218 | 2 +- tests/qemu-iotests/235 | 2 +- tests/qemu-iotests/245 | 4 +- tests/qemu-iotests/258 | 6 +- tests/qemu-iotests/258.out | 4 +- tests/qemu-iotests/295 | 2 +- tests/qemu-iotests/296 | 2 +- 35 files changed, 1270 insertions(+), 694 deletions(-) -- 2.29.2

5 81

[PATCH] build-aux: require GNU grep on FreeBSD
by Roman Bogorodskiy 03 Mar '21

03 Mar '21

FreeBSD 13.x and newer ship BSD grep which apparently has some performance issues causing certain syntax check tests to run longer than the default 30 seconds timeout used by meson. However, GNU grep is still available through the textproc/gnugrep port, so require it on FreeBSD if /usr/bin/grep is a BSD grep to make checks pass in a reasonable time. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- build-aux/Makefile.in | 1 + build-aux/meson.build | 24 +++++++++++++++++++----- build-aux/syntax-check.mk | 1 - 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/build-aux/Makefile.in b/build-aux/Makefile.in index 0424ff39fc..415a8df305 100644 --- a/build-aux/Makefile.in +++ b/build-aux/Makefile.in @@ -5,6 +5,7 @@ top_builddir = @top_builddir@ FLAKE8 = @flake8_path@ RUNUTF8 = @runutf8@ PYTHON = @PYTHON3@ +GREP = @GREP@ # include syntax-check.mk file include $(top_srcdir)/build-aux/syntax-check.mk diff --git a/build-aux/meson.build b/build-aux/meson.build index c506feefd2..c44ed6821c 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -10,18 +10,32 @@ syntax_check_conf.set('flake8_path', flake8_path) syntax_check_conf.set('runutf8', ' '.join(runutf8)) syntax_check_conf.set('PYTHON3', python3_prog.path()) -configure_file( - input: 'Makefile.in', - output: '@BASENAME@', - configuration: syntax_check_conf, -) + +grep_prog = find_program('grep') if host_machine.system() == 'freebsd' make_prog = find_program('gmake') + + grep_cmd = run_command(grep_prog, '--version') + if grep_cmd.stdout().startswith('grep (BSD grep') + grep_prog = find_program('/usr/local/bin/grep') + grep_cmd = run_command(grep_prog, '--version') + if grep_cmd.stdout().startswith('grep (BSD grep') + error('GNU grep not found') + endif + endif else make_prog = find_program('make') endif +syntax_check_conf.set('GREP', grep_prog.path()) + +configure_file( + input: 'Makefile.in', + output: '@BASENAME@', + configuration: syntax_check_conf, +) + rc = run_command( 'sed', '-n', 's/^\$sc_[a-zA-Z0-9_-]*\$:.*/\\1/p', diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index e51877648a..6f6603fa6f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -27,7 +27,6 @@ ME := build-aux/syntax-check.mk # of the module description. But some packages import this file directly, # ignoring the module description. AWK ?= awk -GREP ?= grep # FreeBSD (and probably some other OSes too) ships own version of sed(1), not # compatible with the GNU sed. GNU sed is available as gsed(1), so use this # instead -- 2.30.0

2 1

[PATCH 0/6] virCommand cleanups
by Peter Krempa 03 Mar '21

03 Mar '21

Some cleanups I've accumulated. Peter Krempa (6): virPipeImpl: Don't overwrite error virCommandAddEnvBuffer: Remove unused function util: vircommand: Add wrappers for virCommand error checking virCommandFDSet: Remove return value virCommandSetSendBuffer: Provide saner semantics commandtest: test27: Remove pointless 'cleanup' label src/libvirt_private.syms | 1 - src/qemu/qemu_tpm.c | 50 ++------- src/util/vircommand.c | 230 ++++++++++++++++++--------------------- src/util/vircommand.h | 9 +- src/util/virutil.c | 2 - tests/commandtest.c | 49 ++------- 6 files changed, 131 insertions(+), 210 deletions(-) -- 2.29.2

2 12

[PATCH] feat(usb-hostdev): add ability to filter by USB serial strings too
by Giel van Schijndel 03 Mar '21

03 Mar '21

This patch adds the ability to select a specific USB device when multiple are available with the same vendor and product IDs. As an example, I'm using this to pass through a specific USB mouse to my guest VM. I happen to have two of the exact same model (Logitech MX518), differing only in their serial number, and only wish to pass through one of them to my VM. An example of the config snippet I'm using with this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x046d'/> <product id='0xc08e'/> <serial>0D3087538362</serial> </source> </hostdev> Without this patch I would either get an error message on attempted startup, complaining about having found multiple devices with the same product or vendor id. Or alternatively I'd have to set the bus number and device number. Unfortunately the latter tends to change with every reboot, and in my case whenever my monitor comes out of standby (I'm using its builtin USB hub). --- docs/formatdomain.rst | 6 ++ docs/schemas/domaincommon.rng | 10 +++ src/conf/domain_conf.c | 15 ++++ src/conf/domain_conf.h | 3 +- src/hypervisor/virhostdev.c | 14 ++-- src/util/virusb.c | 66 ++++++++++++----- src/util/virusb.h | 2 + tests/virusbtest.c | 71 +++++++++++-------- .../sys_bus_usb/devices/1-1.5.4/serial | 1 + .../sys_bus_usb/devices/1-1.5.5/serial | 1 + .../sys_bus_usb/devices/1-1.5.6/serial | 1 + 11 files changed, 137 insertions(+), 53 deletions(-) create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 2587106191..6d011cc789 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3864,6 +3864,7 @@ for PCI (KVM only) and 1.0.6 for SCSI (KVM only)` : <source startupPolicy='optional'> <vendor id='0x1234'/> <product id='0xbeef'/> + <serial>TANT14-B4732</serial> </source> <boot order='2'/> </hostdev> @@ -4041,6 +4042,11 @@ or: optional drop if missing at any start attempt ========= ===================================================================== + :since:`Since 7.1.0`, the ``source`` element of USB devices may contain + the ``serial`` element which can be used in addition to ``vendor`` and + ``product`` to select a specific USB device if multiple devices with the + same vendor and product id are present. + ``pci`` PCI devices can only be described by their ``address``. :since:`Since 6.8.0 (Xen only)` , the ``source`` element of a PCI device diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e6de934456..d6eb29a9a8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5355,6 +5355,11 @@ <ref name="usbId"/> </attribute> </element> + <optional> + <element name="serial"> + <ref name="usbSerial"/> + </element> + </optional> </define> <define name="usbaddress"> <element name="address"> @@ -7053,6 +7058,11 @@ <param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param> </data> </define> + <define name="usbSerial"> + <data type="string"> + <param name="pattern">[A-Za-z0-9_\.\+\- ]+</param> + </data> + </define> <define name="usbVersion"> <data type="string"> <param name="pattern">[0-9]{1,2}.[0-9]{1,2}</param> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b731744f04..4967d62989 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3078,6 +3078,8 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def) VIR_FREE(def->source.subsys.u.scsi_host.wwpn); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + VIR_FREE(def->source.subsys.u.usb.serial); + break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: @@ -6703,6 +6705,16 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, "%s", _("usb product needs id")); return -1; } + } else if (!usbsrc->serial && + virXMLNodeNameEqual(cur, "serial")) { + g_autofree char *serial = virXMLNodeContentString(cur); + if (!serial) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("usb serial needs content")); + return -1; + } + + usbsrc->serial = g_steal_pointer(&serial); } else if (virXMLNodeNameEqual(cur, "address")) { g_autofree char *bus = NULL; g_autofree char *device = NULL; @@ -25089,6 +25101,9 @@ virDomainHostdevDefFormatSubsysUSB(virBufferPtr buf, if (usbsrc->vendor) { virBufferAsprintf(&sourceChildBuf, "<vendor id='0x%.4x'/>\n", usbsrc->vendor); virBufferAsprintf(&sourceChildBuf, "<product id='0x%.4x'/>\n", usbsrc->product); + if (usbsrc->serial) { + virBufferEscapeString(&sourceChildBuf, "<serial>%s</serial>\n", usbsrc->serial); + } } if (usbsrc->bus || usbsrc->device) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 930eed60de..a66b815901 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -227,12 +227,13 @@ VIR_ENUM_DECL(virDomainHostdevSubsysSCSIProtocol); struct _virDomainHostdevSubsysUSB { bool autoAddress; /* bus/device were filled automatically based - on vendor/product */ + on vendor/product (optionally serial) */ unsigned bus; unsigned device; unsigned vendor; unsigned product; + char *serial; }; struct _virDomainHostdevSubsysPCI { diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index 743aaa84d6..f9fd42b24d 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -1324,6 +1324,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb; unsigned vendor = usbsrc->vendor; unsigned product = usbsrc->product; + const char *serial = usbsrc->serial; unsigned bus = usbsrc->bus; unsigned device = usbsrc->device; bool autoAddress = usbsrc->autoAddress; @@ -1332,7 +1333,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, *usb = NULL; if (vendor && bus) { - rc = virUSBDeviceFind(vendor, product, bus, device, + rc = virUSBDeviceFind(vendor, product, serial, bus, device, NULL, autoAddress ? false : mandatory, usb); @@ -1354,7 +1355,8 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, if (vendor) { g_autoptr(virUSBDeviceList) devs = NULL; - rc = virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, &devs); + rc = virUSBDeviceFindByVendor(vendor, product, serial, NULL, mandatory, + &devs); if (rc < 0) { return -1; } else if (rc == 0) { @@ -1362,9 +1364,11 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, } else if (rc > 1) { if (autoAddress) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x were found," - " but none of them is at bus:%u device:%u"), - vendor, product, bus, device); + _("Multiple USB devices for %x:%x (serial: %s)" + " were found, but none of them is at bus:%u" + " device:%u"), + vendor, product, serial ? serial : "<none>", bus, + device); } else { virReportError(VIR_ERR_OPERATION_FAILED, _("Multiple USB devices for %x:%x, " diff --git a/src/util/virusb.c b/src/util/virusb.c index 6d897600e5..d945d71b98 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -81,21 +81,31 @@ static int virUSBOnceInit(void) VIR_ONCE_GLOBAL_INIT(virUSB); -static int virUSBSysReadFile(const char *f_name, const char *d_name, - int base, unsigned int *value) +static char* virUSBSysReadFile(const char *f_name, const char *d_name) { - g_autofree char *buf = NULL; g_autofree char *filename = NULL; - char *ignore = NULL; + char* buf; filename = g_strdup_printf(USB_SYSFS "/devices/%s/%s", d_name, f_name); if (virFileReadAll(filename, 1024, &buf) < 0) + return NULL; + + return buf; +} + +static int virUSBSysReadIntFile(const char *f_name, const char *d_name, + int base, unsigned int *value) +{ + g_autofree char *buf = NULL; + char *ignore = NULL; + + if (!(buf = virUSBSysReadFile(f_name, d_name))) return -1; if (virStrToLong_ui(buf, &ignore, base, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse usb file %s"), filename); + _("Could not parse usb file %s/%s"), d_name, f_name); return -1; } @@ -105,6 +115,7 @@ static int virUSBSysReadFile(const char *f_name, const char *d_name, static virUSBDeviceListPtr virUSBDeviceSearch(unsigned int vendor, unsigned int product, + const char *serial, unsigned int bus, unsigned int devno, const char *vroot, @@ -132,11 +143,11 @@ virUSBDeviceSearch(unsigned int vendor, if (strchr(de->d_name, ':')) continue; - if (virUSBSysReadFile("idVendor", de->d_name, + if (virUSBSysReadIntFile("idVendor", de->d_name, 16, &found_vend) < 0) goto cleanup; - if (virUSBSysReadFile("idProduct", de->d_name, + if (virUSBSysReadIntFile("idProduct", de->d_name, 16, &found_prod) < 0) goto cleanup; @@ -150,13 +161,31 @@ virUSBDeviceSearch(unsigned int vendor, goto cleanup; } - if (virUSBSysReadFile("devnum", de->d_name, + if (virUSBSysReadIntFile("devnum", de->d_name, 10, &found_devno) < 0) goto cleanup; - if ((flags & USB_DEVICE_FIND_BY_VENDOR) && - (found_prod != product || found_vend != vendor)) - continue; + if (flags & USB_DEVICE_FIND_BY_VENDOR) { + if (found_prod != product || found_vend != vendor) + continue; + + if (serial) { + g_autofree char *found_serial = virUSBSysReadFile("serial", de->d_name); + size_t len; + + if (!found_serial) + continue; + len = strlen(found_serial); + if (!len) + continue; + + if (found_serial[len - 1] == '\n') + found_serial[len - 1] = '\0'; + + if (strcmp(found_serial, serial)) + continue; + } + } if (flags & USB_DEVICE_FIND_BY_BUS) { if (found_bus != bus || found_devno != devno) @@ -188,6 +217,7 @@ virUSBDeviceSearch(unsigned int vendor, int virUSBDeviceFindByVendor(unsigned int vendor, unsigned int product, + const char *serial, const char *vroot, bool mandatory, virUSBDeviceListPtr *devices) @@ -195,7 +225,7 @@ virUSBDeviceFindByVendor(unsigned int vendor, virUSBDeviceListPtr list; int count; - if (!(list = virUSBDeviceSearch(vendor, product, 0, 0, + if (!(list = virUSBDeviceSearch(vendor, product, serial, 0, 0, vroot, USB_DEVICE_FIND_BY_VENDOR))) return -1; @@ -203,15 +233,16 @@ virUSBDeviceFindByVendor(unsigned int vendor, if (list->count == 0) { virObjectUnref(list); if (!mandatory) { - VIR_DEBUG("Did not find USB device %04x:%04x", - vendor, product); + VIR_DEBUG("Did not find USB device %04x:%04x (serial %s)", + vendor, product, serial ? serial : "<none>"); if (devices) *devices = NULL; return 0; } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %04x:%04x"), vendor, product); + _("Did not find USB device %04x:%04x (serial %s)"), + vendor, product, serial ? serial : "<none>"); return -1; } @@ -233,7 +264,7 @@ virUSBDeviceFindByBus(unsigned int bus, { virUSBDeviceListPtr list; - if (!(list = virUSBDeviceSearch(0, 0, bus, devno, + if (!(list = virUSBDeviceSearch(0, 0, NULL, bus, devno, vroot, USB_DEVICE_FIND_BY_BUS))) return -1; @@ -266,6 +297,7 @@ virUSBDeviceFindByBus(unsigned int bus, int virUSBDeviceFind(unsigned int vendor, unsigned int product, + const char *serial, unsigned int bus, unsigned int devno, const char *vroot, @@ -275,7 +307,7 @@ virUSBDeviceFind(unsigned int vendor, virUSBDeviceListPtr list; unsigned int flags = USB_DEVICE_FIND_BY_VENDOR|USB_DEVICE_FIND_BY_BUS; - if (!(list = virUSBDeviceSearch(vendor, product, bus, devno, + if (!(list = virUSBDeviceSearch(vendor, product, serial, bus, devno, vroot, flags))) return -1; diff --git a/src/util/virusb.h b/src/util/virusb.h index 42a3303952..c9d5330fac 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -45,12 +45,14 @@ int virUSBDeviceFindByBus(unsigned int bus, int virUSBDeviceFindByVendor(unsigned int vendor, unsigned int product, + const char* serial, const char *vroot, bool mandatory, virUSBDeviceListPtr *devices); int virUSBDeviceFind(unsigned int vendor, unsigned int product, + const char* serial, unsigned int bus, unsigned int devno, const char *vroot, diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 7df4e3aec3..cba4d57d9a 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -37,12 +37,14 @@ struct findTestInfo { const char *name; unsigned int vendor; unsigned int product; + const char *serial; unsigned int bus; unsigned int devno; const char *vroot; bool mandatory; int how; bool expectFailure; + unsigned int expectResults; }; static int testDeviceFileActor(virUSBDevicePtr dev, @@ -76,12 +78,12 @@ static int testDeviceFind(const void *opaque) switch (info->how) { case FIND_BY_ALL: - rv = virUSBDeviceFind(info->vendor, info->product, + rv = virUSBDeviceFind(info->vendor, info->product, info->serial, info->bus, info->devno, info->vroot, info->mandatory, &dev); break; case FIND_BY_VENDOR: - rv = virUSBDeviceFindByVendor(info->vendor, info->product, + rv = virUSBDeviceFindByVendor(info->vendor, info->product, info->serial, info->vroot, info->mandatory, &devs); break; case FIND_BY_BUS: @@ -117,6 +119,13 @@ static int testDeviceFind(const void *opaque) if (virUSBDeviceFileIterate(device, testDeviceFileActor, NULL) < 0) goto cleanup; } + + if (ndevs != info->expectResults) { + virReportError(VIR_ERR_INTERNAL_ERROR, "different amount of results" + " than expected (%zu != %u)", ndevs, + info->expectResults); + goto cleanup; + } break; } @@ -157,7 +166,7 @@ testUSBList(const void *opaque G_GNUC_UNUSED) goto cleanup; #define EXPECTED_NDEVS_ONE 3 - if (virUSBDeviceFindByVendor(0x1d6b, 0x0002, NULL, true, &devlist) < 0) + if (virUSBDeviceFindByVendor(0x1d6b, 0x0002, NULL, NULL, true, &devlist) < 0) goto cleanup; ndevs = virUSBDeviceListCount(devlist); @@ -181,7 +190,7 @@ testUSBList(const void *opaque G_GNUC_UNUSED) goto cleanup; #define EXPECTED_NDEVS_TWO 3 - if (virUSBDeviceFindByVendor(0x18d1, 0x4e22, NULL, true, &devlist) < 0) + if (virUSBDeviceFindByVendor(0x18d1, 0x4e22, NULL, NULL, true, &devlist) < 0) goto cleanup; ndevs = virUSBDeviceListCount(devlist); @@ -201,7 +210,7 @@ testUSBList(const void *opaque G_GNUC_UNUSED) EXPECTED_NDEVS_ONE + EXPECTED_NDEVS_TWO) < 0) goto cleanup; - if (virUSBDeviceFind(0x18d1, 0x4e22, 1, 20, NULL, true, &dev) < 0) + if (virUSBDeviceFind(0x18d1, 0x4e22, NULL, 1, 20, NULL, true, &dev) < 0) goto cleanup; if (!virUSBDeviceListFind(list, dev)) { @@ -235,48 +244,50 @@ mymain(void) { int rv = 0; -#define DO_TEST_FIND_FULL(name, vend, prod, bus, devno, vroot, mand, how, fail) \ +#define DO_TEST_FIND_FULL(name, vend, prod, serial, bus, devno, vroot, mand, how, fail, expected) \ do { \ - struct findTestInfo data = { name, vend, prod, bus, \ - devno, vroot, mand, how, fail \ + struct findTestInfo data = { name, vend, prod, serial, bus, \ + devno, vroot, mand, how, fail, expected \ }; \ if (virTestRun("USBDeviceFind " name, testDeviceFind, &data) < 0) \ rv = -1; \ } while (0) -#define DO_TEST_FIND(name, vend, prod, bus, devno) \ - DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \ - FIND_BY_ALL, false) -#define DO_TEST_FIND_FAIL(name, vend, prod, bus, devno) \ - DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \ - FIND_BY_ALL, true) +#define DO_TEST_FIND(name, vend, prod, serial, bus, devno, expected) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, bus, devno, NULL, true, \ + FIND_BY_ALL, false, expected) +#define DO_TEST_FIND_FAIL(name, vend, prod, serial, bus, devno) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, bus, devno, NULL, true, \ + FIND_BY_ALL, true, 0) #define DO_TEST_FIND_BY_BUS(name, bus, devno) \ - DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \ - FIND_BY_BUS, false) + DO_TEST_FIND_FULL(name, 101, 202, NULL, bus, devno, NULL, true, \ + FIND_BY_BUS, false, 1) #define DO_TEST_FIND_BY_BUS_FAIL(name, bus, devno) \ - DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \ - FIND_BY_BUS, true) + DO_TEST_FIND_FULL(name, 101, 202, NULL, bus, devno, NULL, true, \ + FIND_BY_BUS, true, 0) -#define DO_TEST_FIND_BY_VENDOR(name, vend, prod) \ - DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \ - FIND_BY_VENDOR, false) -#define DO_TEST_FIND_BY_VENDOR_FAIL(name, vend, prod) \ - DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \ - FIND_BY_VENDOR, true) +#define DO_TEST_FIND_BY_VENDOR(name, vend, prod, serial, expected) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, 123, 456, NULL, true, \ + FIND_BY_VENDOR, false, expected) +#define DO_TEST_FIND_BY_VENDOR_FAIL(name, vend, prod, serial) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, 123, 456, NULL, true, \ + FIND_BY_VENDOR, true, 0) - DO_TEST_FIND("Nexus", 0x18d1, 0x4e22, 1, 20); - DO_TEST_FIND_FAIL("Nexus wrong devnum", 0x18d1, 0x4e22, 1, 25); - DO_TEST_FIND_FAIL("Bogus", 0xf00d, 0xbeef, 1024, 768); + DO_TEST_FIND("Nexus", 0x18d1, 0x4e22, NULL, 1, 20, 1); + DO_TEST_FIND_FAIL("Nexus wrong devnum", 0x18d1, 0x4e22, NULL, 1, 25); + DO_TEST_FIND_FAIL("Bogus", 0xf00d, 0xbeef, NULL, 1024, 768); DO_TEST_FIND_BY_BUS("integrated camera", 1, 5); DO_TEST_FIND_BY_BUS_FAIL("wrong bus/devno combination", 2, 20); DO_TEST_FIND_BY_BUS_FAIL("missing bus", 5, 20); DO_TEST_FIND_BY_BUS_FAIL("missing devnum", 1, 158); - DO_TEST_FIND_BY_VENDOR("Nexus (multiple results)", 0x18d1, 0x4e22); - DO_TEST_FIND_BY_VENDOR_FAIL("Bogus vendor and product", 0xf00d, 0xbeef); - DO_TEST_FIND_BY_VENDOR_FAIL("Valid vendor", 0x1d6b, 0xbeef); + DO_TEST_FIND_BY_VENDOR("Nexus (multiple results)", 0x18d1, 0x4e22, NULL, 3); + DO_TEST_FIND_BY_VENDOR("Nexus (with serial)", 0x18d1, 0x4e22, "TANT14-B4732", 1); + DO_TEST_FIND_BY_VENDOR_FAIL("Bogus vendor and product", 0xf00d, 0xbeef, NULL); + DO_TEST_FIND_BY_VENDOR_FAIL("Valid vendor", 0x1d6b, 0xbeef, NULL); + DO_TEST_FIND_BY_VENDOR_FAIL("Bogus serial", 0x18d1, 0x4e22, "BOGUS"); if (virTestRun("USB List test", testUSBList, NULL) < 0) rv = -1; diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial new file mode 100644 index 0000000000..6bee213c08 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial @@ -0,0 +1 @@ +20200222113321 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial new file mode 100644 index 0000000000..14764cdc37 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial @@ -0,0 +1 @@ +0123:4b:01.7 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial new file mode 100644 index 0000000000..b20f2081b7 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial @@ -0,0 +1 @@ +TANT14-B4732 -- 2.27.0

1 1

[libvirt PATCH] cpu_map: Install x86_EPYC-Milan.xml
by Jiri Denemark 02 Mar '21

02 Mar '21

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 48f69f623c..013fc62a02 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -34,6 +34,7 @@ cpumap_data = [ 'x86_Dhyana.xml', 'x86_EPYC-IBPB.xml', 'x86_EPYC.xml', + 'x86_EPYC-Milan.xml', 'x86_EPYC-Rome.xml', 'x86_features.xml', 'x86_Haswell-IBRS.xml', -- 2.30.0

2 1

using libvirt 4.5 with upstream qemu
by Thanos Makatos 02 Mar '21

02 Mar '21

I'm trying to use QEMU master with libvirt 4.5 and QEMU seems to be hanging when I try to start a guest. My environment is a modified CentOS 7.9 installation using libvirt 4.5.0. When I use a modified version of QEMU 2.12 (reasonably close to the stock CentOS version) everything works fine. When I try to use a fairly recent version of QEMU (e.g. v5.2.0-729-g89ff714f4b). qemu 118657 1.6 0.0 0 0 ? Z 14:50 0:00 [qemu-kvm] <defunct> qemu 118664 0.0 0.0 207340 3560 ? Ssl 14:50 0:00 /usr/libexec/qemu-kvm -S -no-user-config -nodefaults -nographic -machine none,accel=kvm:tcg -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize qemu 118666 0.0 0.0 275008 13916 ? Sl 14:50 0:00 /usr/libexec/qemu-kvm -S -no-user-config -nodefaults -nographic -machine none,accel=kvm:tcg -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize /var/lib/libvirt/qemu/capabilities.pidfile contains the PID of the 2nd QEMU process and by experimenting I found that by killing the QEMU process NOT in the PID file the same thing happens again (maybe once more or twice) and then the guest boots fine. Does libvirt have some specific QEMU dependency? Is there some compatibility matrix I might have missed? I understand this may not be a supported configuration given that I'm not using vanilla libvirt/QEMU, however I'd appreciate some pointers so I can further debug this. I've trying debugging this in case there's some obvious error but didn't find anything interesting. Any ideas?

4 6

[libvirt PATCH] cpu_map: Add EPYC-Milan x86 CPU model
by Jiri Denemark 02 Mar '21

02 Mar '21

Introduced in QEMU 6.0.0 by 623972ceae091b31331ae4a1dc94fe5cbb891937 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/index.xml | 1 + src/cpu_map/x86_EPYC-Milan.xml | 92 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 src/cpu_map/x86_EPYC-Milan.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 2e0685df68..ffe1fa91e5 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -68,6 +68,7 @@ <include filename='x86_EPYC.xml'/> <include filename='x86_EPYC-IBPB.xml'/> <include filename='x86_EPYC-Rome.xml'/> + <include filename='x86_EPYC-Milan.xml'/>  <include filename='x86_Dhyana.xml'/> diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml new file mode 100644 index 0000000000..53f0cd6aac --- /dev/null +++ b/src/cpu_map/x86_EPYC-Milan.xml @@ -0,0 +1,92 @@ +<cpus> + <model name='EPYC-Milan'> + <decode host='on' guest='on'/> + <signature family='25' model='1'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='svme-addr-check'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> -- 2.30.0

2 1

[PATCH] libxl: Fix node device detach when driver unspecified
by Jim Fehlig 02 Mar '21

02 Mar '21

Commit 887dd0d331 caused a small regression in NodeDeviceDetach in the libxl driver when the 'driver' parameter is not specified. E.g. error: Failed to detach device pci_0000_0a_10_0 error: An error occurred, but the cause is unknown If the driver name is not specified, NULL is passed to virDomainDriverNodeDeviceDetachFlags, in which case virPCIDeviceSetStubDriver is never called to set the stub to pciback. Fix it by setting the driver to "xen" if it is not specified when invoking NodeDeviceDetach. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 75a8d46af0..348434ca72 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5777,6 +5777,9 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, virCheckFlags(0, -1); + if (!driverName) + driverName = "xen"; + if (driverName && STRNEQ(driverName, "xen")) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported driver name '%s'"), driverName); -- 2.29.2

2 1

[PATCH] hyperv: Fix 32bit compilation
by Cole Robinson 02 Mar '21

02 Mar '21

Example: ../src/hyperv/hyperv_driver.c:3007:54: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 7 has type ‘size_t’ {aka ‘unsigned int’} [-Werror=format=] 3007 | virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %lu"), i); Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed src/hyperv/hyperv_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 701456cdb3..e4f537bd12 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -3004,7 +3004,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) /* Attach serials */ for (i = 0; i < def->nserials; i++) { if (hypervDomainAttachSerial(domain, def->serials[i]) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %lu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %zu"), i); goto error; } } @@ -3012,7 +3012,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) /* Attach networks */ for (i = 0; i < def->nnets; i++) { if (hypervDomainAttachSyntheticEthernetAdapter(domain, def->nets[i], hostname) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach network %lu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach network %zu"), i); goto error; } } -- 2.29.2

2 1

[PATCH v2 0/3] Use g_autoptr and g_autofree
by Kristina Hanicova 02 Mar '21

02 Mar '21

This is v2 from https://listman.redhat.com/archives/libvir-list/2021-February/msg01129.html I changed variable names in patch 1/3 as suggested by Laine. Patches 2/3 and 3/3 have already been reviewed-by and I am sending them for completeness. This uses g_autofree (if possible) in file networkcommon_conf and g_autoptr instead of virNetDevIPRouteFree where possible. Kristina Hanicova (3): networkcommon_conf: Use g_autofree where possible Use g_autoptr instead of virNetDevIPRouteFree if possible Remove redundant variables/labels src/conf/domain_conf.c | 3 +- src/conf/networkcommon_conf.c | 90 +++++++++++++++-------------------- src/lxc/lxc_native.c | 10 ++-- src/vz/vz_sdk.c | 3 +- 4 files changed, 44 insertions(+), 62 deletions(-) -- 2.29.2

2 4

[libvirt PATCH 0/5] cpu_map: Sync with Qemu
by Tim Wiederhake 02 Mar '21

02 Mar '21

Qemu updated its list of known cpu features. Follow suit. Tim Wiederhake (5): cpu_map/sync_qemu_i386.py: Add mapping for amd-ssbd cpu_map/sync_qemu_i386.py: Add mapping for ibrs cpu_map/sync_qemu_i386.py: Add mapping for svme-addr-check cpumap: Add support for ibrs CPU feature cpumap: Add support for svme-addr-check CPU feature src/cpu_map/sync_qemu_i386.py | 3 +++ src/cpu_map/x86_features.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 + 4 files changed, 11 insertions(+) -- 2.26.2

2 6

[PATCH] tools: Fix dry run of libvirt_recover_xattrs.sh
by Michal Privoznik 02 Mar '21

02 Mar '21

The libvirt_recover_xattrs.sh script can be used to remove stale XATTRs that were left behind by secdrivers (which should happen only if there' an imbalance between set and restore calls). Anyway, the script has '-n' switch which is supposed to perform just a dry run, i.e. just to report which files have XATTRs set without any attempt to remove them. But, when rewriting the script a few months ago a typo was introduced which made the script report no files even if there were files with XATTRs. Fixes: 5377177f80da40ee7d47601400b50835f093715a Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/libvirt_recover_xattrs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt_recover_xattrs.sh b/tools/libvirt_recover_xattrs.sh index 59f1f3f476..be6ee84b5f 100755 --- a/tools/libvirt_recover_xattrs.sh +++ b/tools/libvirt_recover_xattrs.sh @@ -90,7 +90,7 @@ fix_xattrs() { for i in $(getfattr -R -d -m ${XATTR_PREFIX} --absolute-names ${DIR} 2>/dev/null | grep "^# file:" | cut -d':' -f 2); do if [ ${DRY_RUN} -ne 0 ]; then - getfattr -d -m $p --absolute-names $i | grep -v "^# file:" + getfattr -d -m ${XATTR_PREFIX} --absolute-names $i continue fi -- 2.26.2

2 1

[PATCH 0/4] qemu_tmp: Generate log file path for emulated TPMs more frequently
by Michal Privoznik 02 Mar '21

02 Mar '21

The real fix is in 2/4 and the rest is just cleanups. Long story short, the path to log file is not stored anywhere and thus is forgotten on libvirtd restart which means it's seclabel is not restored properly. Michal Prívozník (4): qemu_tpm: Move logfile path generation into a separate function qemu_tpm: Generate log file path among with storage path qemu_tpm: Drop @logDir argument from qemuTPMEmulatorPrepareHost() virtmp: Fix @path handling in virTPMEmulatorInit() src/qemu/qemu_extdevice.c | 6 +++--- src/qemu/qemu_tpm.c | 45 +++++++++++++++++++++++++++++---------- src/util/virtpm.c | 4 +--- 3 files changed, 38 insertions(+), 17 deletions(-) -- 2.26.2

2 8

[libvirt PATCH v4 00/25] Add support for persistent mediated devices
by Jonathon Jongsma 01 Mar '21

01 Mar '21

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

3 55

[PATCH] Use g_steal_pointer where possible
by Kristina Hanicova 01 Mar '21

01 Mar '21

Via coccinelle (not the hanbag!) spatches used: @ rule1 @ identifier a, b; symbol NULL; @@ - b = a; ... when != a - a = NULL; + b = g_steal_pointer(&a); @@ - *b = a; ... when != a - a = NULL; + *b = g_steal_pointer(&a); Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/admin/admin_server.c | 6 ++---- src/conf/capabilities.c | 3 +-- src/conf/netdev_bandwidth_conf.c | 3 +-- src/conf/virdomainobjlist.c | 3 +-- src/conf/virnwfilterobj.c | 3 +-- src/interface/interface_backend_netcf.c | 3 +-- src/interface/interface_backend_udev.c | 3 +-- src/qemu/qemu_driver.c | 12 ++++------- src/qemu/qemu_monitor_json.c | 27 +++++++++---------------- src/remote/remote_driver.c | 12 ++++------- src/rpc/virnetserver.c | 3 +-- src/util/virfile.c | 9 +++------ src/util/virlog.c | 6 ++---- src/util/virmdev.c | 3 +-- src/util/virsysinfo.c | 21 +++++++------------ src/util/virtypedparam.c | 3 +-- src/vbox/vbox_common.c | 3 +-- src/vz/vz_driver.c | 3 +-- tests/commandhelper.c | 3 +-- tools/virsh-checkpoint.c | 3 +-- tools/virsh-domain.c | 3 +-- 21 files changed, 45 insertions(+), 90 deletions(-) diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index ebc0cfb045..7d1a21a678 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -50,8 +50,7 @@ adminConnectListServers(virNetDaemonPtr dmn, goto cleanup; if (servers) { - *servers = srvs; - srvs = NULL; + *servers = g_steal_pointer(&srvs); } cleanup: if (ret > 0) @@ -179,8 +178,7 @@ adminServerListClients(virNetServerPtr srv, return -1; if (clients) { - *clients = clts; - clts = NULL; + *clients = g_steal_pointer(&clts); } virObjectListFreeCount(clts, ret); diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 69d9bb0e38..f610975ae5 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1501,9 +1501,8 @@ virCapabilitiesGetNUMASiblingInfo(int node, if (VIR_REALLOC_N(tmp, tmp_size) < 0) goto cleanup; - *siblings = tmp; *nsiblings = tmp_size; - tmp = NULL; + *siblings = g_steal_pointer(&tmp); tmp_size = 0; ret = 0; cleanup: diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 4fb7aa4e3d..ff25641b2c 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -205,8 +205,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth, if (!def->in && !def->out) VIR_FREE(def); - *bandwidth = def; - def = NULL; + *bandwidth = g_steal_pointer(&def); ret = 0; cleanup: diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 2521cd56c2..d37bbc94a6 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -1083,8 +1083,7 @@ virDomainObjListExport(virDomainObjListPtr domlist, goto cleanup; } - *domains = doms; - doms = NULL; + *domains = g_steal_pointer(&doms); } ret = nvms; diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 3157522eb2..f4bf1b083d 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -464,8 +464,7 @@ virNWFilterObjListExport(virConnectPtr conn, virNWFilterObjUnlock(obj); } - *filters = tmp_filters; - tmp_filters = NULL; + *filters = g_steal_pointer(&tmp_filters); ret = nfilters; cleanup: diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index e40a4cb108..f8613fea86 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -715,8 +715,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, if (tmp_iface_objs) { /* trim the array to the final size */ ignore_value(VIR_REALLOC_N(tmp_iface_objs, niface_objs + 1)); - *ifaces = tmp_iface_objs; - tmp_iface_objs = NULL; + *ifaces = g_steal_pointer(&tmp_iface_objs); } ret = niface_objs; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 6a94a45044..ab95b2e3ff 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -394,8 +394,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, /* Trim the array to its final size */ if (ifaces) { ignore_value(VIR_REALLOC_N(ifaces_list, count + 1)); - *ifaces = ifaces_list; - ifaces_list = NULL; + *ifaces = g_steal_pointer(&ifaces_list); } return count; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b9bbdf8d48..d1a3659774 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5097,8 +5097,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef, bitmap = NULL; } - *info = info_ret; - info_ret = NULL; + *info = g_steal_pointer(&info_ret); ret = targetDef->niothreadids; cleanup: @@ -9133,9 +9132,8 @@ qemuDomainGetPerfEvents(virDomainPtr dom, goto endjob; } - *params = par; *nparams = npar; - par = NULL; + *params = g_steal_pointer(&par); npar = 0; ret = 0; @@ -18729,8 +18727,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, virObjectUnlock(vm); } - *retStats = tmpstats; - tmpstats = NULL; + *retStats = g_steal_pointer(&tmpstats); ret = nstats; @@ -19259,9 +19256,8 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr *params, #undef ADD_BITMAP - *params = par; *nparams = npar; - par = NULL; + *params = g_steal_pointer(&par); ret = 0; cleanup: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f8c78d9093..819389f5f9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5820,8 +5820,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, } ret = n; - *machines = infolist; - infolist = NULL; + *machines = g_steal_pointer(&infolist); cleanup: if (infolist) { @@ -6268,8 +6267,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, } ret = n; - *commands = commandlist; - commandlist = NULL; + *commands = g_steal_pointer(&commandlist); cleanup: @@ -6327,8 +6325,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, } ret = n; - *events = eventlist; - eventlist = NULL; + *events = g_steal_pointer(&eventlist); cleanup: g_strfreev(eventlist); @@ -6472,8 +6469,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, } ret = n; - *types = typelist; - typelist = NULL; + *types = g_steal_pointer(&typelist); cleanup: g_strfreev(typelist); @@ -6542,8 +6538,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, } ret = n; - *paths = pathlist; - pathlist = NULL; + *paths = g_steal_pointer(&pathlist); cleanup: if (pathlist) { @@ -6779,8 +6774,7 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd, } ret = count; - *props = proplist; - proplist = NULL; + *props = g_steal_pointer(&proplist); cleanup: g_strfreev(proplist); @@ -6962,8 +6956,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, } ret = n; - *capabilities = list; - list = NULL; + *capabilities = g_steal_pointer(&list); cleanup: g_strfreev(list); @@ -7091,8 +7084,7 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon, } ret = n; - *capabilities = list; - list = NULL; + *capabilities = g_steal_pointer(&list); cleanup: VIR_FREE(list); @@ -8157,8 +8149,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, } *niothreads = n; - *iothreads = infolist; - infolist = NULL; + *iothreads = g_steal_pointer(&infolist); ret = 0; cleanup: diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a83cd866e7..31868269b1 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6299,8 +6299,7 @@ remoteConnectGetCPUModelNames(virConnectPtr conn, retmodels[i] = ret.models.models_val[i]; ret.models.models_val[i] = NULL; } - *models = retmodels; - retmodels = NULL; + *models = g_steal_pointer(&retmodels); } rv = ret.ret; @@ -7464,8 +7463,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, goto cleanup; } - *leases = leases_ret; - leases_ret = NULL; + *leases = g_steal_pointer(&leases_ret); } rv = ret.ret; @@ -7555,8 +7553,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, elem = NULL; } - *retStats = tmpret; - tmpret = NULL; + *retStats = g_steal_pointer(&tmpret); rv = ret.retStats.retStats_len; cleanup: @@ -7774,8 +7771,7 @@ remoteDomainInterfaceAddresses(virDomainPtr dom, } } } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + *ifaces = g_steal_pointer(&ifaces_ret); rv = ret.ifaces.ifaces_len; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f0b866a962..265400ecfa 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1146,8 +1146,7 @@ virNetServerGetClients(virNetServerPtr srv, } } - *clts = list; - list = NULL; + *clts = g_steal_pointer(&list); ret = nclients; cleanup: diff --git a/src/util/virfile.c b/src/util/virfile.c index 5710495bbf..7cb60e66d3 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -840,8 +840,7 @@ int virFileLoopDeviceAssociate(const char *file, } VIR_DEBUG("Attached loop device %s %d to %s", file, lofd, loname); - *dev = loname; - loname = NULL; + *dev = g_steal_pointer(&loname); ret = 0; @@ -3200,8 +3199,7 @@ virFileOpenTty(int *ttyprimary, char **ttyName, int rawmode) errno = rc; goto cleanup; } - *ttyName = name; - name = NULL; + *ttyName = g_steal_pointer(&name); } ret = 0; @@ -3637,9 +3635,8 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, tmp->deflt = tmp->size == default_hugepagesz; } - *ret_fs = fs; *ret_nfs = nfs; - fs = NULL; + *ret_fs = g_steal_pointer(&fs); nfs = 0; ret = 0; diff --git a/src/util/virlog.c b/src/util/virlog.c index cdfeba8251..00c0fcc457 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1658,8 +1658,7 @@ virLogParseOutputs(const char *src, virLogOutputPtr **outputs) } ret = noutputs; - *outputs = list; - list = NULL; + *outputs = g_steal_pointer(&list); cleanup: g_strfreev(strings); return ret; @@ -1708,8 +1707,7 @@ virLogParseFilters(const char *src, virLogFilterPtr **filters) } ret = nfilters; - *filters = list; - list = NULL; + *filters = g_steal_pointer(&list); cleanup: g_strfreev(strings); return ret; diff --git a/src/util/virmdev.c b/src/util/virmdev.c index db40fe8cc3..2b7f730bd1 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -95,8 +95,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr dev, if ((tmp = strchr(buf, '\n'))) *tmp = '\0'; - *device_api = buf; - buf = NULL; + *device_api = g_steal_pointer(&buf); return 0; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 995650334c..0016028254 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -258,8 +258,7 @@ virSysinfoParsePPCSystem(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; virSysinfoSystemDefFree(def); return ret; @@ -381,8 +380,7 @@ virSysinfoParseARMSystem(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; virSysinfoSystemDefFree(def); return ret; @@ -521,8 +519,7 @@ virSysinfoParseS390System(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; cleanup: virSysinfoSystemDefFree(def); @@ -686,8 +683,7 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios) def = NULL; } - *bios = def; - def = NULL; + *bios = g_steal_pointer(&def); ret = 0; virSysinfoBIOSDefFree(def); return ret; @@ -763,8 +759,7 @@ virSysinfoParseX86System(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; virSysinfoSystemDefFree(def); return ret; @@ -845,9 +840,8 @@ virSysinfoParseX86BaseBoard(const char *base, ignore_value(VIR_REALLOC_N(boards, nboards)); } - *baseBoard = boards; *nbaseBoard = nboards; - boards = NULL; + *baseBoard = g_steal_pointer(&boards); nboards = 0; ret = 0; cleanup: @@ -915,8 +909,7 @@ virSysinfoParseX86Chassis(const char *base, def = NULL; } - *chassisdef = def; - def = NULL; + *chassisdef = g_steal_pointer(&def); ret = 0; virSysinfoChassisDefFree(def); return ret; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index f9ab6f6042..c4c26a1183 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -706,9 +706,8 @@ virTypedParamsSerialize(virTypedParameterPtr params, j++; } - *remote_params_val = params_val; *remote_params_len = params_len; - params_val = NULL; + *remote_params_val = g_steal_pointer(&params_val); rv = 0; cleanup: diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 138403b034..0c4126bd38 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7583,8 +7583,7 @@ vboxConnectListAllDomains(virConnectPtr conn, /* safe to ignore, new size will be equal or less than * previous allocation */ ignore_value(VIR_REALLOC_N(doms, count + 1)); - *domains = doms; - doms = NULL; + *domains = g_steal_pointer(&doms); } ret = count; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 0ebcb06234..60ed286cee 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -3817,8 +3817,7 @@ vzConnectGetAllDomainStats(virConnectPtr conn, tmpstats[nstats++] = tmp; } - *retStats = tmpstats; - tmpstats = NULL; + *retStats = g_steal_pointer(&tmpstats); ret = nstats; cleanup: diff --git a/tests/commandhelper.c b/tests/commandhelper.c index b3c65ab3cc..ee06339392 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -116,8 +116,7 @@ static struct Arguments *parseArguments(int argc, char** argv) } } - ret = args; - args = NULL; + ret = g_steal_pointer(&args); return ret; } diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 6e68ba66ff..91f7c963c1 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -633,8 +633,7 @@ virshCheckpointListCollect(vshControl *ctl, qsort(checkpointlist->chks, checkpointlist->nchks, sizeof(*checkpointlist->chks), virshChkSorter); - ret = checkpointlist; - checkpointlist = NULL; + ret = g_steal_pointer(&checkpointlist); cleanup: virshCheckpointListFree(checkpointlist); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d40995f44d..3597190523 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5187,8 +5187,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, goto cleanup; ret = nparams; - *update_params = params; - params = NULL; + *update_params = g_steal_pointer(&params); cleanup: VIR_FREE(set_field); -- 2.29.2

2 2

[PATCH 0/2] backup: Don't try to update stats if VM isn't alive
by Peter Krempa 01 Mar '21

01 Mar '21

Doing so results in a crash. Peter Krempa (2): qemuBackupJobTerminate: Move cleanup of temp files earlier qemuBackupJobTerminate: Don't calculate backup job stats if VM isn't active src/qemu/qemu_backup.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) -- 2.29.2

2 3

[PATCH 0/4] Storage volume (crash) fixes
by Peter Krempa 01 Mar '21

01 Mar '21

Patch 1/4 should go into this release, the rest can wait. Peter Krempa (4): storageBackendProbeTarget: Check return value of virStorageSourceNewFromBacking storageBackendProbeTarget: Don't fail if backing store can't be parsed virStorageVolDefFormat: Extract formatting of source extents virStorageVolDefFormat: Don't format empty <source> src/conf/storage_conf.c | 59 +++++++++++-------- src/storage/storage_util.c | 5 +- .../storagevolxml2xmlout/vol-file-backing.xml | 2 - tests/storagevolxml2xmlout/vol-file-iso.xml | 2 - .../storagevolxml2xmlout/vol-file-naming.xml | 2 - tests/storagevolxml2xmlout/vol-file.xml | 2 - .../vol-gluster-dir-neg-uid.xml | 2 - .../storagevolxml2xmlout/vol-gluster-dir.xml | 2 - .../vol-logical-backing.xml | 2 - tests/storagevolxml2xmlout/vol-logical.xml | 2 - .../storagevolxml2xmlout/vol-luks-cipher.xml | 2 - tests/storagevolxml2xmlout/vol-luks.xml | 2 - tests/storagevolxml2xmlout/vol-partition.xml | 2 - .../vol-qcow2-0.10-lazy.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 2 - .../vol-qcow2-encryption.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2-luks.xml | 2 - .../vol-qcow2-nobacking.xml | 2 - .../vol-qcow2-nocapacity.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2.xml | 2 - tests/storagevolxml2xmlout/vol-sheepdog.xml | 2 - 22 files changed, 35 insertions(+), 69 deletions(-) -- 2.29.2

2 6

[PATCH] build-aux: increase tests timeout
by Roman Bogorodskiy 01 Mar '21

01 Mar '21

Meson default timeout for test() is 30 seconds. This may be not enough for some tests like sc_prohibit_nonreentrant or sc_libvirt_unmarked_diagnostics, so set it to 60 seconds. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- On my system these two tests always timeout with the default value. That's what I have after increasing timeout: 157/288 libvirt:syntax-check / sc_prohibit_nonreentrant OK 52.18s 183/288 libvirt:syntax-check / sc_libvirt_unmarked_diagnostics OK 31.48s build-aux/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/build-aux/meson.build b/build-aux/meson.build index c506feefd2..4acd5e16c1 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -44,6 +44,7 @@ if git potfiles_dep, ], suite: 'syntax-check', + timeout: 60, ) endforeach endif -- 2.30.0

3 5

Release of libvirt-7.1.0
by Jiri Denemark 01 Mar '21

01 Mar '21

The 7.1.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing any other feedback. Your work is greatly appreciated. * Portability * Implement Apple Silicon support libvirt now runs on the ARM-based Apple Silicon Macs. * New features * Introduce virtio-pmem ``<memory/>`` model The virtio-pmem is a virtio variant of NVDIMM and just like NVDIMM virtio-pmem also allows accessing host pages bypassing guest page cache. * Introduce ``<boot order/>`` for ``<filesystem>`` Booting is possible from virtiofs filesystems. Introduce an option to control the boot order, like we do for other bootable devices. * hyperv: implement new APIs The ``virDomainUndefine()``, ``virDomainUndefineFlags()``, ``virDomainDefineXML()``, ``virDomainAttachDevice()``, and ``virDomainAttachDeviceFlags()``, ``virConnectListAllNetworks()``, ``virConnectNumOfNetworks()``, ``virNetworkLookupByName()``, ``virNetworkLookupByUUID()``, ``virConnectNumOfDefinedNetworks()``, ``virConnectListDefinedNetworks()``, ``virNetworkGetAutostart()``, ``virNetworkIsActive()``, ``virNetworkIsPersistent()``, ``virNetworkGetXMLDesc()``, and ``virDomainScreenshot()``, APIs have been implemented in the Hyper-V driver. * Support <teaming> element in plain <hostdev> devices This is useful when libvirt doesn't have the privileges necessary to set the hostdev device's MAC address (which is a necessary part of the alternate <interface type='hostdev'>). * Introduce ``<disk type='vhostuser'>`` support Introduces support for QEMU vhost-user-blk device that can be used to access storage exported via the vhost-user protocol by daemons such as the ``qemu-storage-daemon``. * Bug fixes * qemu: Fix disk quiescing rollback when creating external snapshots If the qemu guest agent call to freeze filesystems failed when creating an external snapshot with ``VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE`` flag the filesystems would be unconditionally thawed. This could cause problems when the filesystems were frozen by an explicit call to ``virDomainFSFreeze`` since the guest agent then rejects any further freeze attempts once are filesystems frozen, an explicit freeze followed by a quiesced snapshot would fail and thaw filesystems. Users are also encouraged to use ``virDomainFSFreeze/Thaw`` manually instead of relying on ``VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE`` if they need finer grained control. * cgroups: Fix how we setup and configure cgroups on hosts with systemd When libvirt is running on host with systemd we register every VM with machined which creates the VM root cgroup for us as well. Before this fix we were directly modifying files in the VM root cgroup which was incorrect because all the files are managed by systemd. The implication was that any change done by libvirt to cgroup attributes supported by systemd could be removed which happens for example by running ``systemctl daemon-reload``. To fix the issue libvirt now uses DBus calls for some of the cgroup attributes that distribute the resources proportionally to the cgroup siblings and for the rest we have a new sub-cgroup that libvirt can managed directly. For more details why this is necessary see `systemd cgroup <https://systemd.io/CGROUP_DELEGATION/>`_ documentation. * qemu: Fix swtpm device with aarch64 The TPM TIS device name for x86 is ``tpm-tis``, whereas for aarch64 it is ``tpm-tis-device``. Fix the use of TPM TIS device with aarch64 by using the proper device name when building the QEMU command line. * libxl: Fix domain shutdown Commit fa30ee04a2 introduced the possibility of a race between the shutdown and death threads used to process domain shutdown and death events from libxl. On normal domain shutdown the shutdown thread handles all aspects of shutting down and cleaning up the domain. The death thread is only used to handle out-of-band domain destruction and is inhibited when domain shutdown is under libvirt's control. The race is avoided by also inhibiting the death thread when libvirt starts the shutdown thread. Enjoy. Jirka

1 0

Entering freeze for libvirt-7.1.0
by Jiri Denemark 25 Feb '21

25 Feb '21

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

1 1

[libvirt PATCH] qemu_domainjob: Make copy of owner API
by Jiri Denemark 25 Feb '21

25 Feb '21

Using the job owner API name directly works fine as long as it is a static string or the owner's thread is still running. However, this is not always the case. For example, when the owner API name is filled in a job when we're reconnecting to existing domains after daemon restart, the dynamically allocated owner name will disappear with the reconnecting thread. Any follow up usage of the pointer will read random memory. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domainjob.c | 12 ++++++------ src/qemu/qemu_process.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 3c2c6b9179..b58d6837ad 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -190,7 +190,7 @@ qemuDomainObjResetJob(qemuDomainJobObjPtr job) { job->active = QEMU_JOB_NONE; job->owner = 0; - job->ownerAPI = NULL; + g_clear_pointer(&job->ownerAPI, g_free); job->started = 0; } @@ -200,7 +200,7 @@ qemuDomainObjResetAgentJob(qemuDomainJobObjPtr job) { job->agentActive = QEMU_AGENT_JOB_NONE; job->agentOwner = 0; - job->agentOwnerAPI = NULL; + g_clear_pointer(&job->agentOwnerAPI, g_free); job->agentStarted = 0; } @@ -210,7 +210,7 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObjPtr job) { job->asyncJob = QEMU_ASYNC_JOB_NONE; job->asyncOwner = 0; - job->asyncOwnerAPI = NULL; + g_clear_pointer(&job->asyncOwnerAPI, g_free); job->asyncStarted = 0; job->phase = 0; job->mask = QEMU_JOB_DEFAULT_MASK; @@ -890,7 +890,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, obj, obj->def->name); priv->job.active = job; priv->job.owner = virThreadSelfID(); - priv->job.ownerAPI = virThreadJobGet(); + priv->job.ownerAPI = g_strdup(virThreadJobGet()); priv->job.started = now; } else { VIR_DEBUG("Started async job: %s (vm=%p name=%s)", @@ -901,7 +901,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; priv->job.asyncJob = asyncJob; priv->job.asyncOwner = virThreadSelfID(); - priv->job.asyncOwnerAPI = virThreadJobGet(); + priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); priv->job.asyncStarted = now; priv->job.current->started = now; } @@ -917,7 +917,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); priv->job.agentActive = agentJob; priv->job.agentOwner = virThreadSelfID(); - priv->job.agentOwnerAPI = virThreadJobGet(); + priv->job.agentOwnerAPI = g_strdup(virThreadJobGet()); priv->job.agentStarted = now; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bfa742577f..398f63282e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3732,7 +3732,7 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver, /* Restore the config of the async job which is not persisted */ priv->jobs_queued++; priv->job.asyncJob = QEMU_ASYNC_JOB_BACKUP; - priv->job.asyncOwnerAPI = virThreadJobGet(); + priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); priv->job.asyncStarted = now; qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK | -- 2.30.0

2 1

[libvirt PATCH] qemuProcessUpdateGuestCPU: Check cpu if check=full is set
by Tim Wiederhake 25 Feb '21

25 Feb '21

libvirt performs cpu checking if "check" is set to "partial", but skips checking the cpu if "check" is set to "full". See https://bugzilla.redhat.com/show_bug.cgi?id=1840770 Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/qemu/qemu_process.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bfa742577f..5b8c1397ef 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6149,6 +6149,14 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, if (virCPUConvertLegacy(hostarch, def->cpu) < 0) return -1; + if (def->cpu->check == VIR_CPU_CHECK_FULL) { + virCPUDefPtr host = virQEMUCapsGetHostModel(qemuCaps, def->virtType, + VIR_QEMU_CAPS_HOST_CPU_FULL); + + if (virCPUCompare(hostarch, host, def->cpu, true) < 0) + return -1; + } + /* nothing to update for host-passthrough / maximum */ if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH && def->cpu->mode != VIR_CPU_MODE_MAXIMUM) { -- 2.26.2

2 1

[PATCH v2] qemu: Add missing lock in qemuProcessHandleMonitorEOF
by Peng Liang 25 Feb '21

25 Feb '21

qemuMonitorUnregister will be called in multiple threads (e.g. threads in rpc worker pool and the vm event thread). In some cases, it isn't protected by the monitor lock, which may lead to call g_source_unref more than one time and a use-after-free problem eventually. Add the missing lock in qemuProcessHandleMonitorEOF (which is the only position missing lock of monitor I found). Suggested-by: Michal Privoznik <mprivozn(a)redhat.com> Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- This patch is v2 of https://listman.redhat.com/archives/libvir-list/2021-February/msg00945.html. v1 -> v2: Locking monitor in qemuProcessHandleMonitorEOF instead of using aotmic function in qemuMonitorUnregister. src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_process.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d25c26343a7f..14e6b1fe9626 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -427,6 +427,7 @@ bool qemuMonitorWasDisposed(void); void qemuMonitorRegister(qemuMonitorPtr mon) ATTRIBUTE_NONNULL(1); +/* Must be called with monitor locked. */ void qemuMonitorUnregister(qemuMonitorPtr mon) ATTRIBUTE_NONNULL(1); void qemuMonitorClose(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d930ff9a74f6..bfa742577f32 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -318,7 +318,9 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon, /* We don't want this EOF handler to be called over and over while the * thread is waiting for a job. */ + virObjectLock(mon); qemuMonitorUnregister(mon); + virObjectUnlock(mon); /* We don't want any cleanup from EOF handler (or any other * thread) to enter qemu namespace. */ -- 2.29.2

2 3