October 2026 - Devel - libvirt List Archives

[PATCH] esx: Avoid integer overflow in esxDomainGetInfo()
by Michal Privoznik 26 Oct '26

26 Oct '26

From: Michal Privoznik <mprivozn(a)redhat.com> The virDomainGetInfo() fills virDomainInfo structure for given domain. The struct contains memory and maxMem members (among others) to store current and maximum memory for the domain. Both members are of 'unsigned long' type. Now, inside the ESX driver's implementation (esxDomainGetInfo()) these values are stored in a variables of int64_t and int32_t, respectively. But since both values, as reported by hypervisor are in MiB, they are multiplied by 1024 because we report memory sizes in KiB. Well, for very large guests, and 32bit hosts, unsigned long might not be large enough to hold the value. Check for overflow and also in case of 'maxMem' (which is multiplied directly) specify the type of '1024' constant to ensure proper typecast before multiplication. Resolves: https://gitlab.com/libvirt/libvirt/-/work_items/937 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/esx/esx_driver.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 75bbd07750..daca30aeca 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2088,7 +2088,16 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) goto cleanup; } - info->maxMem = dynamicProperty->val->int32 * 1024; /* Scale from megabyte to kilobyte */ + if (VIR_MULTIPLY_ADD_IS_OVERFLOW(ULONG_MAX, + dynamicProperty->val->int32, 1024, 0)) { + virReportError(VIR_ERR_OVERFLOW, + _("the maximum memory value too large: %1$llu"), + (unsigned long long) dynamicProperty->val->int32); + goto cleanup; + } + + /* Scale from megabyte to kilobyte */ + info->maxMem = dynamicProperty->val->int32 * 1024UL; } else if (STREQ(dynamicProperty->name, "config.hardware.numCPU")) { if (esxVI_AnyType_ExpectType(dynamicProperty->val, esxVI_Type_Int) < 0) { @@ -2105,8 +2114,16 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) memory_limit = dynamicProperty->val->int64; - if (memory_limit > 0) + if (memory_limit > 0) { + if (VIR_MULTIPLY_ADD_IS_OVERFLOW(ULONG_MAX, memory_limit, 1024, 0)) { + virReportError(VIR_ERR_OVERFLOW, + _("the current memory value too large: %1$llu"), + (unsigned long long) memory_limit); + goto cleanup; + } + memory_limit *= 1024; /* Scale from megabyte to kilobyte */ + } } else { VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } -- 2.56.0

2 1

[PATCH v2] util: virusb: skip USB devices with an inaccessible device node
by Yaroslav Borbat 26 Oct '26

26 Oct '26

From: Yaroslav Borbat <yaroslav.752(a)gmail.com> Inside a container sysfs is usually mounted from the host and exposes all USB devices, while nodes under /dev/bus/usb/ only exist for devices passed into the container's mount namespace. virUSBDeviceSearch() enumerated devices from sysfs alone, so such a device was reported as present: a hostdev with startupPolicy='optional' was not dropped and the domain failed to start. Skip devices whose /dev node is inaccessible during enumeration. virUSBDeviceFind() now ignores them for optional hostdevs and reports an explicit "not accessible in the current mount namespace" error for mandatory ones. Extend the virusb test to cover both cases. Signed-off-by: Yaroslav Borbat <yaroslav.752(a)gmail.com> Resolves: https://gitlab.com/libvirt/libvirt/-/work_items/894 --- v2: - rebased onto current master (no functional changes) v1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/202… (https://patchew.org/Libvirt/20260716213249.3163905-1-yaroslav.752@gmail.com/) Context: this was hit with libvirt running inside a container (deckhouse/virtualization). Container runtimes mount sysfs from the host, so /sys/bus/usb/devices/ lists every host USB device, while /dev/bus/usb/ only contains the nodes explicitly passed into the container. A self-contained Docker reproducer (no special hardware needed, uses the root hub at bus 1 / device 1) is in the issue above. src/util/virusb.c | 41 ++++++++++++++++++++++++++++++++++++----- tests/virusbmock.c | 33 ++++++++++++++++++++++++++++++++- tests/virusbtest.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 6 deletions(-) diff --git a/src/util/virusb.c b/src/util/virusb.c index 85ad3d58ce..1d31912971 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -120,7 +120,8 @@ virUSBDeviceSearch(unsigned int vendor, unsigned int devno, const char *port, const char *vroot, - unsigned int flags) + unsigned int flags, + char **inaccessiblePath) { g_autoptr(DIR) dir = NULL; bool found = false; @@ -198,6 +199,28 @@ virUSBDeviceSearch(unsigned int vendor, if (!usb) goto cleanup; + /* In containerized environments sysfs may expose USB devices + * from the host kernel while the corresponding device node + * under /dev/bus/usb/ is not present in the current mount + * namespace. Such a device cannot be used, so skip it here. + * Remember its path so that the caller can distinguish "no + * matching device at all" from "device present on the host but + * inaccessible in our mount namespace" when reporting errors. */ + if (virUSBDeviceGetPath(usb) && + !virFileExists(virUSBDeviceGetPath(usb))) { + VIR_DEBUG("USB device %03u:%03u found in sysfs but device " + "node '%s' is not accessible in the current mount " + "namespace, skipping", + found_bus, found_devno, + virUSBDeviceGetPath(usb)); + if (inaccessiblePath && !*inaccessiblePath) + *inaccessiblePath = g_strdup(virUSBDeviceGetPath(usb)); + g_clear_pointer(&usb, virUSBDeviceFree); + if (found) + break; + continue; + } + if (virUSBDeviceListAdd(list, &usb) < 0) goto cleanup; @@ -226,10 +249,11 @@ virUSBDeviceFind(unsigned int vendor, virUSBDeviceList **devices) { g_autoptr(virUSBDeviceList) list = NULL; + g_autofree char *inaccessiblePath = NULL; int count; if (!(list = virUSBDeviceSearch(vendor, product, bus, devno, port, - vroot, flags))) + vroot, flags, &inaccessiblePath))) return -1; count = list->count; @@ -240,9 +264,16 @@ virUSBDeviceFind(unsigned int vendor, return 0; } - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find matching USB device: vid:%1$04x, pid:%2$04x, bus:%3$u, device:%4$u, port:%5$s"), - vendor, product, bus, devno, port ? port : ""); + if (inaccessiblePath) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("USB device vid:%1$04x, pid:%2$04x, bus:%3$u, device:%4$u, port:%5$s is present on the host but its device node '%6$s' is not accessible in the current mount namespace"), + vendor, product, bus, devno, port ? port : "", + inaccessiblePath); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Did not find matching USB device: vid:%1$04x, pid:%2$04x, bus:%3$u, device:%4$u, port:%5$s"), + vendor, product, bus, devno, port ? port : ""); + } return -1; } diff --git a/tests/virusbmock.c b/tests/virusbmock.c index c23bed4528..c67a0ba307 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -22,18 +22,27 @@ #include <sys/stat.h> #include <dirent.h> #include <dlfcn.h> +#include <errno.h> #include <fcntl.h> +#include <unistd.h> #include "virmock.h" #define USB_SYSFS "/sys/bus/usb" #define FAKE_USB_SYSFS "virusbtestdata/sys_bus_usb" +#define USB_DEVFS "/dev/bus/usb/" + +/* Device node of the test device that is present in the fake sysfs but is + * meant to be inaccessible in the current mount namespace (usb4, i.e. the + * root hub 1d6b:0003 on bus 4). See virusbtest.c. */ +#define INACCESSIBLE_USB_NODE USB_DEVFS "004/001" static int (*real_open)(const char *pathname, int flags, ...); #if WITH___OPEN_2 static int (*real___open_2)(const char *path, int flags); #endif static DIR *(*real_opendir)(const char *name); +static int (*real_access)(const char *path, int mode); static void init_syms(void) { @@ -49,6 +58,7 @@ static void init_syms(void) VIR_MOCK_REAL_INIT(__open_2); #endif VIR_MOCK_REAL_INIT(opendir); + VIR_MOCK_REAL_INIT(access); } static char *get_fake_path(const char *real_path) @@ -58,7 +68,7 @@ static char *get_fake_path(const char *real_path) if ((p = STRSKIP(real_path, USB_SYSFS))) path = g_strdup_printf("%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); - else if (!p) + else path = g_strdup(real_path); return path; @@ -75,6 +85,27 @@ DIR *opendir(const char *name) return real_opendir(path); } +int access(const char *path, int mode) +{ + init_syms(); + + /* virUSBDeviceSearch() checks whether the /dev/bus/usb node of a device + * found in sysfs is accessible. There are no such nodes in the test + * environment, so pretend every USB device node exists, except the one + * device that is meant to be inaccessible in the current mount namespace + * (as happens inside a container). This lets us exercise the code path + * without shipping empty device-node files. */ + if (STRPREFIX(path, USB_DEVFS)) { + if (STREQ(path, INACCESSIBLE_USB_NODE)) { + errno = ENOENT; + return -1; + } + return 0; + } + + return real_access(path, mode); +} + int open(const char *pathname, int flags, ...) { g_autofree char *path = NULL; diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 12ac338df9..58ca769059 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -259,6 +259,40 @@ testUSBList(const void *opaque G_GNUC_UNUSED) } +/* usb4 (bus 4, device 1) is present in the fake sysfs, but the mock makes + * its /dev/bus/usb node inaccessible, i.e. the device is exposed by the host + * kernel but not accessible in our mount namespace (as happens inside a + * container). Such a device must be treated as absent: skipped for + * startupPolicy 'optional' (mandatory == false) and reported as an error + * otherwise. */ +static int +testDeviceFindInaccessible(const void *opaque G_GNUC_UNUSED) +{ + g_autoptr(virUSBDeviceList) devs = NULL; + int rv; + + rv = virUSBDeviceFind(0x1d6b, 0x0003, 4, 1, NULL, NULL, false, + USB_DEVICE_FIND_BY_DEVICE, &devs); + if (rv != 0 || devs) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "optional inaccessible device: expected no match " + "(rv=0 and no device list), got rv=%d", rv); + return -1; + } + + rv = virUSBDeviceFind(0x1d6b, 0x0003, 4, 1, NULL, NULL, true, + USB_DEVICE_FIND_BY_DEVICE, &devs); + if (rv >= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "mandatory inaccessible device: expected failure, " + "but the device was reported as available"); + return -1; + } + + return 0; +} + + static int mymain(void) { @@ -336,6 +370,10 @@ mymain(void) if (virTestRun("USB List test", testUSBList, NULL) < 0) rv = -1; + if (virTestRun("USBDeviceFind inaccessible node", + testDeviceFindInaccessible, NULL) < 0) + rv = -1; + if (rv < 0) return EXIT_FAILURE; return EXIT_SUCCESS; base-commit: ad0aefa6c66599bae1ebd3eeace615e247735e71 -- 2.55.0

1 0

[PATCH] NEWS: document bhyve changes for 12.9.0
by Roman Bogorodskiy 26 Oct '26

26 Oct '26

Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- NEWS.rst | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index a30bc9bc7b..bba5c66dac 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,37 @@ v12.9.0 (unreleased) * **New features** + * bhyve: support session mode + + The bhyve driver now supports the session mode: ``bhyve:///session``. + It requires bhyve monitor mode support, so at the time of writing it + is available to -CURRENT users only. + + * bhyve: support boot order configuration for disks + + The bhyve driver now supports boot order configuration for the + SATA and VirtIO disks with ``<boot order='..'/>``. Now it also + uses the QEMU-compatible ``fwcfg`` interface. + + * bhyve: TPM support + + The bhyve driver now supports TPM with an external emulator. + + * bhyve: implement ``virDomainReset()`` + + The bhyve driver now implements the ``virDomainReset()`` API + (accessible via ``virsh reset``). + + * FreeBSD: support isolated bridge ports + + libvirt on FreeBSD now supports isolated bridge ports such as:: + + <interface type='bridge'> + <source bridge='bridge0'/> + <model type='virtio'/> + <port isolated='yes'/> + </interface> + * **Improvements** * qemu: Emit UNDEFINED event when undefining source after migration @@ -28,6 +59,10 @@ v12.9.0 (unreleased) * **Bug fixes** + * bhyve: fix shutdown handling on arm64 + + Signal-based shutdown now correctly handles bhyve terminating directly + on arm64, preventing stopped domains from remaining reported as running. v12.8.0 (2026-10-01) ==================== -- 2.55.0

2 1

[PATCH] bhyve: fix shutdown handling on arm64
by Roman Bogorodskiy 23 Oct '26

23 Oct '26

The bhyve driver requests signal-based shutdown by sending a SIGTERM signal to the bhyve process. On amd64 bhyve handles this signal to start ACPI shutdown. On arm64 bhyve does not implement ACPI shutdown, so it does not implement a signal handler for SIGTERM and just terminates. These cases are seen differently in the monitor, and the latter case is not handled, which could result in stopped domain reported as running. Fix by handling both cases. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_monitor.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index dab07ff95f..8e481b17aa 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -20,6 +20,7 @@ #include <config.h> +#include <signal.h> #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> @@ -117,6 +118,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque) const char *name; struct kevent kev; int rc, status; + bool shutdownBySignal; if (watch != mon->watch || kq != mon->kq) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -153,13 +155,19 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque) name = vm->def->name; status = kev.data; + /* On amd64 SIGTERM triggers ACPI shutdown, and we see it as WIFEXITED(status). + * However, arm64 has no SIGTERM handler, so we see it as WIFSIGNALED(status). + */ + shutdownBySignal = WIFSIGNALED(status) && + WTERMSIG(status) == SIGTERM; + if (WIFSIGNALED(status) && WCOREDUMP(status)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Guest %1$s got signal %2$d and crashed"), name, WTERMSIG(status)); virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, false); - } else if (WIFEXITED(status)) { - if (WEXITSTATUS(status) == 0 || mon->reboot) { + } else if (WIFEXITED(status) || shutdownBySignal) { + if ((!shutdownBySignal && WEXITSTATUS(status) == 0) || mon->reboot) { /* 0 - reboot */ if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY || vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) { @@ -169,7 +177,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque) VIR_INFO("Guest %s rebooted; restarting domain.", name); virBhyveProcessRestart(driver, vm); } - } else if (WEXITSTATUS(status) < 3) { + } else if (shutdownBySignal || WEXITSTATUS(status) < 3) { /* 1 - shutdown, 2 - halt, 3 - triple fault. others - error */ if (vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART || vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME) { -- 2.55.0

2 1

Re: Property types changed in this series
by Markus Armbruster 22 Oct '26

22 Oct '26

Libvirt developers: does libvirt use member @type of the reply of qom-list, qom-list-properties, qom-list-get? I'm asking because Marc-André's work changes many values to add a more useful replacement. I think we should deprecate @type. I'd like to find out whether we need to preserve the values for the deprecation grace period. Markus Armbruster <armbru(a)redhat.com> writes: > I used qom-list-types and qom-list-properties to list all properties and > their types, then looked for changes. This can miss changes in > dynamically created properties; see the note on qom-list-properties in > qapi/qom.json. Moreover, I ran into a few QOM types where > qom-list-properties is broken. These are ast2700-a1, ast2700-a2, and several riscv CPUs. A fix for the latter has been queued. > 1. Close misses of QAPI type names change to actual QAPI type names > > old property type new property type > --------------------------------------------- > string str > uint64_t uint64 > uint64_t size > int32_t int32 > int size > uint32_t uint32 > [uint16] uint16List > NotifyVMexitOption NotifyVmexitOption > CXLFixedMemoryWindow CXLFixedMemoryWindowOptionsList > > 2. Incorrect QAPI type names change to correct ones > > old property type new property type > --------------------------------------------- > SgxEPC SgxEPCList > QAuthZListRule QAuthZListRuleList > X86CPUFeatureWordInfo X86CPUFeatureWordInfoList > bool Pca9552LedState > > 3. Less than useful QAPI type names change to more useful ones > > old property type new property type > --------------------------------------------- > str Pca9552PinState > str Pca9554PinState > > 4. Lazy crap > > old property type new property type > --------------------------------------------- > list link<arm-cpu>List > list strList > list uint16List > list uint32List > list uint64List > list uint8List > struct any > > I'm not sure the first one is what it should be. > > I need to have a closer look at the last one. > > 5. Inventive crap > > old property type new property type > --------------------------------------------- > busnr uint8 > guest statistics VirtioBalloonGuestStats > loadparm str > on|off|split OnOffSplit > struct tm StructTm > > 6. An odd duck > > old property type new property type > --------------------------------------------- > str int32 > > This is pci-device property addr. See PATCH 54. > > On the way, I noted properties with anti-social names: > > QOM type name property name > --------------------------------- > acpi-ged memhp container[0] > e500-spin e500 spin pv device[0]

2 1

[PATCH 1/1] daemon: install logrotate configurations for all daemons
by Partha Satapathy 22 Oct '26

22 Oct '26

From: Partha Sarathi Satapathy <partha.satapathy(a)oracle.com> The existing daemon logrotate configuration only covers libvirtd. File-based logs from modular daemons, such as virtqemud.log, are therefore not rotated. Parameterize libvirtd.logrotate.in with the daemon name and generate a configuration for each daemon in virt_daemons. Install each configuration in logrotate.d and package it in the same RPM subpackage as the corresponding daemon. Signed-off-by: Partha Satapathy <partha.satapathy(a)oracle.com> --- libvirt.spec.in | 14 ++++++++++++++ src/meson.build | 20 ++++++++++++++++++++ src/remote/libvirtd.logrotate.in | 2 +- src/remote/meson.build | 14 ++++---------- 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2411fd94c411..055f6a4b8d9c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2152,6 +2152,7 @@ exit 0 %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug %endif %attr(0755, root, root) %{_sbindir}/virtlockd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtlockd %{_mandir}/man8/virtlockd.8* %files daemon-plugin-lockd @@ -2165,6 +2166,7 @@ exit 0 %{_datadir}/augeas/lenses/virtlogd.aug %{_datadir}/augeas/lenses/tests/test_virtlogd.aug %attr(0755, root, root) %{_sbindir}/virtlogd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtlogd %{_mandir}/man8/virtlogd.8* %files daemon-proxy @@ -2178,6 +2180,7 @@ exit 0 %{_datadir}/augeas/lenses/virtproxyd.aug %{_datadir}/augeas/lenses/tests/test_virtproxyd.aug %attr(0755, root, root) %{_sbindir}/virtproxyd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtproxyd %{_mandir}/man8/virtproxyd.8* %files daemon-config-network @@ -2200,6 +2203,7 @@ exit 0 %{_unitdir}/virtinterfaced-ro.socket %{_unitdir}/virtinterfaced-admin.socket %attr(0755, root, root) %{_sbindir}/virtinterfaced +%config(noreplace) %{_sysconfdir}/logrotate.d/virtinterfaced %ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/interface/ %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so %{_mandir}/man8/virtinterfaced.8* @@ -2216,6 +2220,7 @@ exit 0 %{_unitdir}/virtnetworkd-ro.socket %{_unitdir}/virtnetworkd-admin.socket %attr(0755, root, root) %{_sbindir}/virtnetworkd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtnetworkd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart @@ -2242,6 +2247,7 @@ exit 0 %{_unitdir}/virtnodedevd-ro.socket %{_unitdir}/virtnodedevd-admin.socket %attr(0755, root, root) %{_sbindir}/virtnodedevd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtnodedevd %ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/nodedev/ %{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so %{_mandir}/man8/virtnodedevd.8* @@ -2255,6 +2261,7 @@ exit 0 %{_unitdir}/virtnwfilterd-ro.socket %{_unitdir}/virtnwfilterd-admin.socket %attr(0755, root, root) %{_sbindir}/virtnwfilterd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtnwfilterd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %ghost %dir %{_rundir}/libvirt/network/ %ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/nwfilter-binding/ @@ -2277,6 +2284,7 @@ exit 0 %dir %attr(0755, root, root) %{_unitdir}/libvirtd.service.d/ %{_unitdir}/libvirtd.service.d/10-secret.conf %attr(0755, root, root) %{_sbindir}/virtsecretd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtsecretd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/secrets/ %ghost %dir %attr(0700, root, root) %{_rundir}/libvirt/secrets/ @@ -2294,6 +2302,7 @@ exit 0 %{_unitdir}/virtstoraged-ro.socket %{_unitdir}/virtstoraged-admin.socket %attr(0755, root, root) %{_sbindir}/virtstoraged +%config(noreplace) %{_sysconfdir}/logrotate.d/virtstoraged %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/ @@ -2348,6 +2357,7 @@ exit 0 %{_unitdir}/virtqemud-ro.socket %{_unitdir}/virtqemud-admin.socket %attr(0755, root, root) %{_sbindir}/virtqemud +%config(noreplace) %{_sysconfdir}/logrotate.d/virtqemud %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/autostart/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ @@ -2389,6 +2399,7 @@ exit 0 %{_unitdir}/virtlxcd-ro.socket %{_unitdir}/virtlxcd-admin.socket %attr(0755, root, root) %{_sbindir}/virtlxcd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtlxcd %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/autostart/ @@ -2413,6 +2424,7 @@ exit 0 %{_unitdir}/virtxend-ro.socket %{_unitdir}/virtxend-admin.socket %attr(0755, root, root) %{_sbindir}/virtxend +%config(noreplace) %{_sysconfdir}/logrotate.d/virtxend %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf @@ -2441,6 +2453,7 @@ exit 0 %{_unitdir}/virtvboxd-ro.socket %{_unitdir}/virtvboxd-admin.socket %attr(0755, root, root) %{_sbindir}/virtvboxd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtvboxd %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so %{_mandir}/man8/virtvboxd.8* %endif @@ -2485,6 +2498,7 @@ exit 0 %if %{with_ch} %files daemon-driver-ch %attr(0755, root, root) %{_sbindir}/virtchd +%config(noreplace) %{_sysconfdir}/logrotate.d/virtchd %config(noreplace) %{_sysconfdir}/libvirt/virtchd.conf %{_datadir}/augeas/lenses/virtchd.aug %{_datadir}/augeas/lenses/tests/test_virtchd.aug diff --git a/src/meson.build b/src/meson.build index cab52ce7a30c..4fdc130bfa96 100644 --- a/src/meson.build +++ b/src/meson.build @@ -285,6 +285,26 @@ subdir('vbox') subdir('vmware') subdir('vz') +# Generate a logrotate configuration for every daemon built by this +# configuration. The driver-specific logrotate files for guest logs are +# installed by src/remote/meson.build. +foreach daemon : virt_daemons + daemon_logrotate_conf = configuration_data({ + 'daemon': daemon['name'], + 'localstatedir': localstatedir, + }) + daemon_logrotate = configure_file( + input: 'remote/libvirtd.logrotate.in', + output: '@0@.logrotate'.format(daemon['name']), + configuration: daemon_logrotate_conf, + ) + install_data( + daemon_logrotate, + install_dir: sysconfdir / 'logrotate.d', + rename: [ daemon['name'] ], + ) +endforeach + driver_sources = files( 'driver.c', diff --git a/src/remote/libvirtd.logrotate.in b/src/remote/libvirtd.logrotate.in index 4e02510c8bb8..f563b253d9a3 100644 --- a/src/remote/libvirtd.logrotate.in +++ b/src/remote/libvirtd.logrotate.in @@ -1,4 +1,4 @@ -@localstatedir@/log/libvirt/libvirtd.log { +@localstatedir@/log/libvirt/@daemon@.log { weekly missingok rotate 4 diff --git a/src/remote/meson.build b/src/remote/meson.build index 3525bc34b2de..01dcbe51639d 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -130,18 +130,12 @@ foreach name : libvirt_conf_files set_variable(name['virtd'].underscorify(), tmp) endforeach -logrotate_files = [ +driver_logrotate_files = [ 'libvirtd.qemu', 'libvirtd.lxc', 'libvirtd.libxl', ] -if conf.has('WITH_MONOLITHIC_LIBVIRTD') - logrotate_files += [ - 'libvirtd', - ] -endif - if conf.has('WITH_REMOTE') remote_driver_lib = static_library( 'virt_remote_driver', @@ -265,15 +259,15 @@ if conf.has('WITH_REMOTE') runstatedir / 'libvirt' / 'common', ] - logrotate_conf = configuration_data({ + driver_logrotate_conf = configuration_data({ 'localstatedir': localstatedir, }) - foreach name : logrotate_files + foreach name : driver_logrotate_files log_file = configure_file( input: '@0@.logrotate.in'.format(name), output: '@0@.logrotate'.format(name), - configuration: logrotate_conf, + configuration: driver_logrotate_conf, ) install_data( log_file, -- 2.52.0

3 4

[PATCH] NEWS: Mention emitting UNDEFINE event after successful migration
by Jim Fehlig 22 Oct '26

22 Oct '26

From: Jim Fehlig <jfehlig(a)suse.com> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- NEWS.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 6ffc803118..a30bc9bc7b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -19,6 +19,13 @@ v12.9.0 (unreleased) * **Improvements** + * qemu: Emit UNDEFINED event when undefining source after migration + + After successfully migrating a domain with the ``VIR_MIGRATE_UNDEFINE_SOURCE`` + flag, the QEMU driver now emits a ``VIR_DOMAIN_EVENT_UNDEFINED`` lifecycle + event on the source host. The event includes the newly added + VIR_DOMAIN_EVENT_UNDEFINED_MIGRATED detail. + * **Bug fixes** -- 2.51.0

2 1

[PATCH v2] docs: Move RISC-V 'Z' CPU properties section to removed features
by Philippe Mathieu-Daudé 22 Oct '26

22 Oct '26

RISC-V 'Z' CPU properties were removed in commit 455c0fa9eef, for the release v10.1.0. Move the corresponding section from deprecated.rst to removed-features.rst, adjusting the wording accordingly. Fixes: 455c0fa9eef ("target/riscv: remove capital 'Z' CPU properties") Reviewed-by: Daniel Henrique Barboza <daniel.barboza(a)oss.qualcomm.com> Reviewed-by: Alistair Francis <alistair.francis(a)wdc.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)oss.qualcomm.com> --- docs/about/deprecated.rst | 24 ------------------------ docs/about/removed-features.rst | 7 +++++++ 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ccbc4219497..368fa1b4ed3 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -349,30 +349,6 @@ the addition of volatile memory support, it is now necessary to distinguish between persistent and volatile memory backends. As such, memdev is deprecated in favor of persistent-memdev. - -RISC-V CPU properties which start with capital 'Z' (since 8.2) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -All RISC-V CPU properties which start with capital 'Z' are being deprecated -starting in 8.2. The reason is that they were wrongly added with capital 'Z' -in the past. CPU properties were later added with lower-case names, which -is the format we want to use from now on. - -Users which try to use these deprecated properties will receive a warning -recommending to switch to their stable counterparts: - -- "Zifencei" should be replaced with "zifencei" -- "Zicsr" should be replaced with "zicsr" -- "Zihintntl" should be replaced with "zihintntl" -- "Zihintpause" should be replaced with "zihintpause" -- "Zawrs" should be replaced with "zawrs" -- "Zfa" should be replaced with "zfa" -- "Zfh" should be replaced with "zfh" -- "Zfhmin" should be replaced with "zfhmin" -- "Zve32f" should be replaced with "zve32f" -- "Zve64f" should be replaced with "zve64f" -- "Zve64d" should be replaced with "zve64d" - Block device options '''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 6a9944a0c79..225841bd9bb 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1038,6 +1038,13 @@ initial RISC-V QEMU port. Its usage was always been unclear: users don't know what to expect from a CPU called 'any', and in fact the CPU does not do anything special that isn't already done by the default CPUs rv32/rv64. +RISC-V CPU properties which start with capital 'Z' (removed in 10.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +All RISC-V CPU properties which start with capital 'Z' have been removed. +They were wrongly added with capital 'Z' in the past. CPU properties +with lower-case names are used instead. + Power8E and Power8NVL CPUs (removed in 11.1) '''''''''''''''''''''''''''''''''''''''''''' -- 2.55.0

3 2

[PATCH v2 0/9] Add stopped reason for reboot
by Ben Grande 21 Oct '26

21 Oct '26

Report the new VIR_DOMAIN_EVENT_STOPPED_REBOOT reason when reboot has been requested. I have only tested this on Xen, so I made a patch per VMM. I preferred to rely on the stopped reason, as there is no discussion that it should be sent, while for the reboot event, there is debate that it shouldn't always be sent. CI: https://gitlab.com/libvirt/libvirt/-/merge_requests/567 Previous discussion and patches: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/ZB5A… https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/KYAL… Ben Grande (9): libvirt-domain: Add stopped reason of reboot docs: libvirt-domain: briefly document reboot event virsh: Add reboot to event enum libxl: Propagate stopped reason of reboot lxc_process: Propagate stopped reason of reboot test_driver: Propagate stopped reason of reboot examples: Add event detail reboot for stopped event NEWS: Introduce VIR_DOMAIN_EVENT_STOPPED_REASON NEWS: Inform drivers that support reboot reason NEWS.rst | 8 ++++++++ examples/c/misc/event-test.c | 3 +++ include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 4 +++- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_process.c | 2 +- src/test/test_driver.c | 2 +- tools/virsh-domain-event.c | 3 ++- 8 files changed, 20 insertions(+), 5 deletions(-) -- Benjamin Grande

1 9

[PATCH v1 1/1] qemu: add support for zero-page-detection migration parameter
by Tejus GK 21 Oct '26

21 Oct '26

QEMU supports a migration parameter to determine whether zero-page checking should be performed and if yes, where it should be performed (i.e., in the main migration thread or multifd threads). Add support for this parameter in libvirt. Signed-off-by: Tejus GK <tejus.gk(a)nutanix.com> --- include/libvirt/libvirt-domain.h | 11 +++++++++++ src/qemu/qemu_migration.c | 1 + src/qemu/qemu_migration_params.c | 8 ++++++++ src/qemu/qemu_migration_params.h | 1 + tools/virsh-domain.c | 13 +++++++++++++ 5 files changed, 34 insertions(+) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 99208137c3..5a4875770b 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1468,6 +1468,17 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" +/** + * VIR_MIGRATE_PARAM_ZERO_PAGE_DETECTION: + * + * virDomainMigrate* params field: zero page detection method as + * VIR_TYPED_PARAM_STRING. Supported values are 'none', 'legacy', and + * 'multifd'. + * + * Since: 12.8.0 + */ +# define VIR_MIGRATE_PARAM_ZERO_PAGE_DETECTION "zero_page_detection" + /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4a43ab83b0..f25506e590 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -110,6 +110,7 @@ const virTypedParamValidationTemplate qemuMigrationParametersValidation[] = { { VIR_MIGRATE_PARAM_TLS_DESTINATION, VIR_TYPED_PARAM_STRING }, { VIR_MIGRATE_PARAM_DISKS_URI, VIR_TYPED_PARAM_STRING }, { VIR_MIGRATE_PARAM_BANDWIDTH_AVAIL_SWITCHOVER, VIR_TYPED_PARAM_ULLONG }, + { VIR_MIGRATE_PARAM_ZERO_PAGE_DETECTION, VIR_TYPED_PARAM_STRING}, { "", 0 } }; diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index dd47516742..7064140379 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -131,6 +131,7 @@ VIR_ENUM_IMPL(qemuMigrationParam, "multifd-zstd-level", "avail-switchover-bandwidth", "direct-io", + "zero-page-detection", ); typedef struct _qemuMigrationParamsAlwaysOnItem qemuMigrationParamsAlwaysOnItem; @@ -274,6 +275,10 @@ static const qemuMigrationParamsTPMapItem qemuMigrationParamsTPMap[] = { .unit = 1024 * 1024, /* MiB/s */ .param = QEMU_MIGRATION_PARAM_AVAIL_SWITCHOVER_BANDWIDTH, .party = QEMU_MIGRATION_SOURCE}, + + {.typedParam = VIR_MIGRATE_PARAM_ZERO_PAGE_DETECTION, + .param = QEMU_MIGRATION_PARAM_ZERO_PAGE_DETECTION, + .party = QEMU_MIGRATION_SOURCE}, }; static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] = { @@ -332,6 +337,9 @@ static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] = { [QEMU_MIGRATION_PARAM_DIRECT_IO] = { .type = QEMU_MIGRATION_PARAM_TYPE_BOOL, }, + [QEMU_MIGRATION_PARAM_ZERO_PAGE_DETECTION] = { + .type = QEMU_MIGRATION_PARAM_TYPE_STRING, + }, }; G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamInfo) == QEMU_MIGRATION_PARAM_LAST); diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index b7a829b85a..131fe82fc0 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -67,6 +67,7 @@ typedef enum { QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL, QEMU_MIGRATION_PARAM_AVAIL_SWITCHOVER_BANDWIDTH, QEMU_MIGRATION_PARAM_DIRECT_IO, + QEMU_MIGRATION_PARAM_ZERO_PAGE_DETECTION, QEMU_MIGRATION_PARAM_LAST } qemuMigrationParam; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2c64f19a19..519d8427bd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11432,6 +11432,10 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_INT, .help = N_("bandwidth (in MiB/s) available for the final phase of migration") }, + {.name = "zero-page-detection", + .type = VSH_OT_STRING, + .help = N_("zero page detection method for migration") + }, {.name = NULL} }; @@ -11733,6 +11737,15 @@ doMigrate(void *opaque) goto save_error; } + if ((rv = vshCommandOptString(ctl, cmd, "zero-page-detection", &opt)) < 0) { + goto out; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_ZERO_PAGE_DETECTION, + opt) < 0) + goto save_error; + } + if ((rv = vshCommandOptInt(ctl, cmd, "comp-zlib-level", &intOpt)) < 0) { goto out; } else if (rv > 0) { -- 2.43.7

2 3

[PATCH] system: Remove deprecated '-name foo,debug-threads=...' option
by Philippe Mathieu-Daudé 20 Oct '26

20 Oct '26

'debug-threads' option for -name was deprecated in v11.0 (commit 1b65aeed2a0 "system: unconditionally enable thread naming") thus can now be removed. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)oss.qualcomm.com> --- docs/about/deprecated.rst | 7 ------- docs/about/removed-features.rst | 9 +++++++-- system/vl.c | 11 ----------- tests/qtest/migration/framework.c | 4 ++-- tests/qtest/migration/precopy-tests.c | 2 +- qemu-options.hx | 7 +++---- 6 files changed, 13 insertions(+), 27 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ccbc4219497..08d86bec314 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -54,13 +54,6 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``. However, short-form booleans are deprecated and full explicit ``arg_name=on`` form is preferred. -``debug-threads`` option for ``-name`` (since 11.0) -''''''''''''''''''''''''''''''''''''''''''''''''''' - -The ``debug-threads`` option of the ``-name`` argument is now -ignored. Thread naming is unconditionally enabled for all platforms -where it is supported. - ``-mon`` option (since 11.1) '''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 6a9944a0c79..cd4f3338bcc 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -578,6 +578,11 @@ kernel since 2001. None of the board types QEMU supports need Keeping 32-bit host support alive was a substantial burden for the QEMU project. Thus QEMU dropped all support for all 32-bit host systems. +``debug-threads`` option for ``-name`` (removed in 11.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Thread naming is unconditionally enabled for all platforms where it +is supported. User-mode emulator command line arguments ----------------------------------------- @@ -779,8 +784,8 @@ values could be assigned to integer device properties or vice versa. Removed with no replacement, as it reported only a limited set of threads (for example, it only reported source side of multifd threads, without reporting any destination threads, or non-multifd source -threads). For debugging purpose, please use ``-name -$VM,debug-threads=on`` instead. +threads). For debugging purpose, thread names are unconditionally +enabled where supported. ``migrate`` argument ``detach`` (removed in 11.0) '''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/system/vl.c b/system/vl.c index 468a9fc247a..e766402f7e1 100644 --- a/system/vl.c +++ b/system/vl.c @@ -403,11 +403,6 @@ static QemuOptsList qemu_name_opts = { .name = "process", .type = QEMU_OPT_STRING, .help = "Sets the name of the QEMU process, as shown in top etc", - }, { - .name = "debug-threads", - .type = QEMU_OPT_BOOL, - .help = "Enable thread names" - "(deprecated, always enabled where supported)", }, { /* End of list */ } }, @@ -556,12 +551,6 @@ static int parse_name(void *opaque, QemuOpts *opts, Error **errp) { const char *proc_name; - if (qemu_opt_get(opts, "debug-threads") && - !qemu_opt_get_bool(opts, "debug-threads", false)) { - fprintf(stderr, "Ignoring deprecated 'debug-threads=no' option, " \ - "thread naming is unconditionally enabled\n"); - } - qemu_name = qemu_opt_get(opts, "guest"); proc_name = qemu_opt_get(opts, "process"); diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c index b7aef6b21cb..fbe1e1f247d 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -413,7 +413,7 @@ int migrate_args(char **from, char **to, MigrateStart *args) cmd_source = g_strdup_printf("-accel kvm%s -accel tcg " "-machine %s,%s " - "-name source,debug-threads=on " + "-name source " "%s " "-serial file:%s/src_serial " "%s %s %s", @@ -433,7 +433,7 @@ int migrate_args(char **from, char **to, MigrateStart *args) cmd_target = g_strdup_printf("-accel kvm%s -accel tcg " "-machine %s,%s " - "-name target,debug-threads=on " + "-name target " "%s " "-serial file:%s/dest_serial " "-incoming defer " diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c index d57ffcac234..3298bf026a1 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -807,7 +807,7 @@ static QTestState *dirtylimit_start_vm(void) bootpath = bootfile_create(qtest_get_arch(), tmpfs, false); cmd = g_strdup_printf("-accel kvm,dirty-ring-size=4096 " - "-name dirtylimit-test,debug-threads=on " + "-name dirtylimit-test " "-m 150M -smp 1 " "-serial file:%s/vm_serial " "-drive file=%s,format=raw ", diff --git a/qemu-options.hx b/qemu-options.hx index 2f6863180b0..7f75fe54a12 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1376,18 +1376,17 @@ SRST ERST DEF("name", HAS_ARG, QEMU_OPTION_name, - "-name string1[,process=string2][,debug-threads=on|off]\n" + "-name string1[,process=string2]\n" " set the name of the guest\n" " string1 sets the window title and string2 the process name\n" - " When debug-threads is enabled, individual threads are given a separate name\n" " NOTE: The thread names are for debugging and not a stable API.\n", QEMU_ARCH_ALL) SRST ``-name name`` Sets the name of the guest. This name will be displayed in the SDL window caption. The name will also be used for the VNC server. Also - optionally set the top visible process name in Linux. Naming of - individual threads can also be enabled on Linux to aid debugging. + where supported, set the top visible process name (individual threads + are always given a separate name to aid debugging). ERST DEF("uuid", HAS_ARG, QEMU_OPTION_uuid, -- 2.55.0

4 3

[libvirt PATCH] qemu: re-introduce debug-threads capability
by Ján Tomko 20 Oct '26

20 Oct '26

From: Ján Tomko <jtomko(a)redhat.com> The option is being removed from QEMU. Since QEMU 11.2 it has been a no-op and always enabled. Stop assuming it's always present so that running VMs won't break with the new QEMU versions. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_capabilities.c | 3 ++- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 8 +++++--- tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml | 1 + .../qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml | 1 + tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml | 1 + tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 + tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 + 41 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index bc2b0412dc..9bbb0f6591 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -374,7 +374,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "chardev-logfile", /* X_QEMU_CAPS_CHARDEV_LOGFILE */ /* 215 */ - "debug-threads", /* X_QEMU_CAPS_NAME_DEBUG_THREADS */ + "debug-threads", /* QEMU_CAPS_NAME_DEBUG_THREADS */ "secret", /* X_QEMU_CAPS_OBJECT_SECRET */ "pxb", /* QEMU_CAPS_DEVICE_PXB */ "pxb-pcie", /* QEMU_CAPS_DEVICE_PXB_PCIE */ @@ -3628,6 +3628,7 @@ struct virQEMUCapsCommandLineProps { * in qemu and thus isn't being properly extended. Other means to detect * features should be used if possible. */ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { + { "name", "debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS }, { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, { "machine", "hpet", QEMU_CAPS_MACHINE_HPET }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 28303fd8f0..95a3cc2f8d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -348,7 +348,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */ /* 215 */ - X_QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */ + QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */ X_QEMU_CAPS_OBJECT_SECRET, /* -object secret */ QEMU_CAPS_DEVICE_PXB, /* -device pxb */ QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bcddb9c922..9adb18be4f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6969,7 +6969,8 @@ qemuAppendLoadparmMachineParm(virBuffer *buf, static int qemuBuildNameCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCaps *qemuCaps) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; @@ -6982,7 +6983,8 @@ qemuBuildNameCommandLine(virCommand *cmd, if (cfg->setProcessName) virBufferAsprintf(&buf, ",process=qemu:%s", def->name); - virBufferAddLit(&buf, ",debug-threads=on"); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME_DEBUG_THREADS)) + virBufferAddLit(&buf, ",debug-threads=on"); virCommandAddArgBuffer(cmd, &buf); @@ -10878,7 +10880,7 @@ qemuBuildCommandLine(virDomainObj *vm, virCommandAddEnvXDG(cmd, priv->libDir); } - if (qemuBuildNameCommandLine(cmd, cfg, def) < 0) + if (qemuBuildNameCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def); diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml index 48629e494d..c3994e2129 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml @@ -54,6 +54,7 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='ivshmem-plain'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml index 70bf98c404..e332a96899 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml @@ -58,6 +58,7 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='debug-threads'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index 25d73b6e1d..f483b7ac6a 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -33,6 +33,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index 53fd51122c..e417ec6c3f 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index ad3fe67638..46f8c9ada9 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml index 0d46b3b20e..cbebc0b9b4 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml @@ -34,6 +34,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml index 242215f7a8..2e6f605fd0 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml @@ -58,6 +58,7 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml index a2faddcced..254d5dad06 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml index 3bbba5ddb1..dc638b2bdf 100644 --- a/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml @@ -61,6 +61,7 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='ivshmem-plain'/> diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml index 530c0366ea..bc7b2c6907 100644 --- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml +++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml @@ -60,6 +60,7 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml index b2cd261b99..f52aa62045 100644 --- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml index d77884f401..350427c1ab 100644 --- a/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml @@ -61,6 +61,7 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='ivshmem-plain'/> diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml index 07ee859318..0e1de31062 100644 --- a/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml @@ -34,6 +34,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml index 108f4b0b86..109219d018 100644 --- a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml +++ b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml index 29fdaf20d8..e4a45e244c 100644 --- a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml index 31d4d2fd26..3634a37a8e 100644 --- a/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml @@ -61,6 +61,7 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='ivshmem-plain'/> diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml index aae4dd0b80..d440b07b4f 100644 --- a/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml @@ -34,6 +34,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml index 05e6749a17..ff7402ba11 100644 --- a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index bf67b3d295..d0c53f804c 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -59,6 +59,7 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> + <flag name='debug-threads'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index f40d77baa5..629fb1b86b 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 8d44ed71e0..bfa7125d99 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -70,6 +70,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index fcbb68e415..0eb099635a 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -70,6 +70,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index 65f73d1af8..3a43691165 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -30,6 +30,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index c730dd7174..73b8f253f3 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -70,6 +70,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index 1f0f68092d..a46ecaf067 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -57,6 +57,7 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='ivshmem-plain'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index 254ec27545..f65ca505d0 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -60,6 +60,7 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='ivshmem-plain'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 95eb2dfa21..778193d6b2 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -57,6 +57,7 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='debug-threads'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index 45ab66ec29..3f1f93184c 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -30,6 +30,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index b46505d24b..908dc789d4 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -70,6 +70,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 44ddfb0f76..51819e6907 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -12,6 +12,7 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='spice-gl'/> + <flag name='debug-threads'/> <flag name='spice-rendernode'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index 2f361bd1c8..8b59aeb051 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -70,6 +70,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index f04b2fd302..6bc824cae1 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -58,6 +58,7 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> + <flag name='debug-threads'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index 990fe255f6..b1e8e37147 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -33,6 +33,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index 07d7562c84..f613955e15 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index c9e85ff9b3..1162e5a1b6 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -47,6 +47,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='query-cpu-model-expansion'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index a8f830076e..7ed1a57ae9 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -33,6 +33,7 @@ <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='debug-threads'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index f67222578d..c4a351d52c 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index efd3eeb9c7..834de87584 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -69,6 +69,7 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> + <flag name='debug-threads'/> <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='intel-iommu'/> -- 2.56.0

4 3

[PATCH 0/7] meson: improvements around "driver_XXXX" build options
by Daniel P. Berrangé 20 Oct '26

20 Oct '26

Daniel P. Berrangé (7): meson: group driver_XXX options meson: add dependency comment for driver_secret meson: add 'driver_nwfilter' option meson: add 'driver_nodedev' option meson: add 'driver_storage' option meson: rename driver_secrets to driver_secret rpm: add explicit driver_secret=enabled libvirt.spec.in | 9 ++++++++- meson.build | 34 +++++++++++++++++++++++++++------- meson_options.txt | 37 ++++++++++++++++++++++++------------- 3 files changed, 59 insertions(+), 21 deletions(-) -- 2.56.0

2 10

[PATCH V2] qemu: emit UNDEFINED event when undefining source after migration
by Jim Fehlig 20 Oct '26

20 Oct '26

From: Jim Fehlig <jfehlig(a)suse.com> When migrating with VIR_MIGRATE_UNDEFINE_SOURCE, qemuMigrationSrcConfirm() and qemuMigrationSrcPerformJob() delete the domain's persistent config on the source host but never emit a VIR_DOMAIN_EVENT_UNDEFINED lifecycle event. Applications relying solely on domain events never learn the domain was undefined on the source. Add a new UNDEFINED event detail named 'VIR_DOMAIN_EVENT_UNDEFINED_MIGRATED", and include it when emitting an UNDEFINED event after a successful migration with VIR_MIGRATE_UNDEFINE_SOURCE flag. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- examples/c/misc/event-test.c | 3 +++ include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_migration.c | 10 ++++++++++ tools/virsh-domain-event.c | 3 ++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/examples/c/misc/event-test.c b/examples/c/misc/event-test.c index 601f5eafcf..3a601cce33 100644 --- a/examples/c/misc/event-test.c +++ b/examples/c/misc/event-test.c @@ -121,6 +121,9 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_UNDEFINED_RENAMED: return "Renamed"; + case VIR_DOMAIN_EVENT_UNDEFINED_MIGRATED: + return "Migrated"; + case VIR_DOMAIN_EVENT_UNDEFINED_LAST: break; } diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 99208137c3..890d11cf5e 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -5691,6 +5691,7 @@ typedef enum { typedef enum { VIR_DOMAIN_EVENT_UNDEFINED_REMOVED = 0, /* Deleted the config file (Since: 0.5.0) */ VIR_DOMAIN_EVENT_UNDEFINED_RENAMED = 1, /* Domain was renamed (Since: 1.2.19) */ + VIR_DOMAIN_EVENT_UNDEFINED_MIGRATED = 2, /* Domain was migrated with VIR_MIGRATE_UNDEFINE_SOURCE flag (Since: 12.9.0) */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_UNDEFINED_LAST /* (Since: 0.9.10) */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 797f83ca0d..76661de09a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4279,6 +4279,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, { qemuMigrationJobPhase phase; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + virObjectEvent *event = NULL; int ret = -1; VIR_DEBUG("vm=%p, flags=0x%x, cancelled=%d", vm, flags, cancelled); @@ -4325,11 +4326,15 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, if (!cancelled && ret == 0 && flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent = 0; + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_MIGRATED); } qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true); } cleanup: + virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); return ret; } @@ -6328,6 +6333,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, bool v3proto) { virObjectEvent *event = NULL; + virObjectEvent *undefine_event = NULL; int ret = -1; virErrorPtr orig_err = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -6419,6 +6425,9 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent = 0; + undefine_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_MIGRATED); } qemuDomainRemoveInactive(vm, 0, true); } @@ -6427,6 +6436,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, cleanup: virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, undefine_event); return ret; } diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c index a541b155f4..40a72563a5 100644 --- a/tools/virsh-domain-event.c +++ b/tools/virsh-domain-event.c @@ -62,7 +62,8 @@ VIR_ENUM_DECL(virshDomainEventUndefined); VIR_ENUM_IMPL(virshDomainEventUndefined, VIR_DOMAIN_EVENT_UNDEFINED_LAST, N_("Removed"), - N_("Renamed")); + N_("Renamed"), + N_("Migrated")); VIR_ENUM_DECL(virshDomainEventStarted); VIR_ENUM_IMPL(virshDomainEventStarted, -- 2.51.0

2 1

[PATCH merged] qemu: fix symlink path comparison in namespace setup
by Michal Privoznik 20 Oct '26

20 Oct '26

From: sayaoailun <guojianwei007(a)126.com> When comparing symlink targets in qemuNamespaceMknodOne(), the code directly compares the raw symlink target (which may be a relative path) with data->target (which was normalized to an absolute path in qemuNamespaceMknodItemInit()). This causes false mismatches when the symlink uses a relative path. Fix this by normalizing the symlink target to an absolute path before comparison, using the same logic as qemuNamespaceMknodItemInit(). This fixes VM startup failure with LVM volumes that use relative symlinks, which reported 'Unable to remove symlink: Device or resource busy'. Signed-off-by: sayaoailun <guojianwei007(a)126.com> Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 4a063064f1..29fec2af45 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -1031,9 +1031,26 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) if (isLink) { g_autofree char *target = NULL; + bool targetMatches = false; - if ((target = g_file_read_link(data->file, NULL)) && - STREQ(target, data->target)) { + if ((target = g_file_read_link(data->file, NULL))) { + /* Normalize relative path to absolute path for comparison, + * using the same logic as qemuNamespaceMknodItemInit(). */ + if (!g_path_is_absolute(target)) { + g_autofree char *fileTmp = g_strdup(data->file); + char *c = NULL; + + if ((c = strrchr(fileTmp, '/'))) + *(c + 1) = '\0'; + + target = g_strdup_printf("%s%s", fileTmp, target); + } + + if (STREQ(target, data->target)) + targetMatches = true; + } + + if (targetMatches) { VIR_DEBUG("Skipping symlink %s -> %s which exists and points to correct target", data->file, data->target); } else { -- 2.56.0

1 0

[PATCH 0/4] qemu: backup: Add support for FD passing for output images and sparsifying of full backup output
by Peter Krempa 20 Oct '26

20 Oct '26

Peter Krempa (4): schemas: Introduce 'fdgroup' type and refactor uses qemu: don't create files for fd-passed new images backup: Allow FD-passing for backup output/scratch file backup: Add support for sparsifying output images of full backups docs/formatbackup.rst | 5 +++++ src/conf/backup_conf.c | 18 +++++++++++++++++- src/conf/backup_conf.h | 2 ++ src/conf/schemas/domainbackup.rng | 14 +++++++++++++- src/conf/schemas/domaincommon.rng | 18 ++++++++++++------ src/qemu/qemu_backup.c | 6 ++++++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_snapshot.c | 2 +- .../domainbackupxml2xmlin/backup-pull-fd.xml | 4 ++-- .../backup-push-sparsify.xml | 12 ++++++++++++ .../domainbackupxml2xmlout/backup-pull-fd.xml | 4 ++-- .../backup-push-sparsify.xml | 19 +++++++++++++++++++ tests/genericxml2xmltest.c | 1 + 13 files changed, 93 insertions(+), 14 deletions(-) create mode 100644 tests/domainbackupxml2xmlin/backup-push-sparsify.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push-sparsify.xml -- 2.56.0

2 5

[PATCH] docs: Remove stale chapter on RISC-V 'Z' CPU properties
by Philippe Mathieu-Daudé 20 Oct '26

20 Oct '26

RISC-V 'Z' CPU properties were removed in commit 455c0fa9eef, for the release v10.1.0. Remove the stale comment. Fixes: 455c0fa9eef ("target/riscv: remove capital 'Z' CPU properties") Signed-off-by: Philippe Mathieu-Daudé <philmd(a)oss.qualcomm.com> --- docs/about/deprecated.rst | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ccbc4219497..368fa1b4ed3 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -349,30 +349,6 @@ the addition of volatile memory support, it is now necessary to distinguish between persistent and volatile memory backends. As such, memdev is deprecated in favor of persistent-memdev. - -RISC-V CPU properties which start with capital 'Z' (since 8.2) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -All RISC-V CPU properties which start with capital 'Z' are being deprecated -starting in 8.2. The reason is that they were wrongly added with capital 'Z' -in the past. CPU properties were later added with lower-case names, which -is the format we want to use from now on. - -Users which try to use these deprecated properties will receive a warning -recommending to switch to their stable counterparts: - -- "Zifencei" should be replaced with "zifencei" -- "Zicsr" should be replaced with "zicsr" -- "Zihintntl" should be replaced with "zihintntl" -- "Zihintpause" should be replaced with "zihintpause" -- "Zawrs" should be replaced with "zawrs" -- "Zfa" should be replaced with "zfa" -- "Zfh" should be replaced with "zfh" -- "Zfhmin" should be replaced with "zfhmin" -- "Zve32f" should be replaced with "zve32f" -- "Zve64f" should be replaced with "zve64f" -- "Zve64d" should be replaced with "zve64d" - Block device options '''''''''''''''''''' -- 2.55.0

4 6

[PATCH] docs: Clarify 'query-kvm' deprecation release
by Philippe Mathieu-Daudé 19 Oct '26

19 Oct '26

'query-kvm' was deprecated in commit 824141dcf48, merged after the v11.1.0 release. Correct to prevent too early removal. Fixes: 824141dcf48 ("hw/core: Deprecate query-kvm") Signed-off-by: Philippe Mathieu-Daudé <philmd(a)oss.qualcomm.com> --- docs/about/deprecated.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ccbc4219497..2507a86d1ee 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -168,7 +168,7 @@ Use ``job-dismiss`` instead. Use ``job-finalize`` instead. -``query-kvm`` (since 11.0) +``query-kvm`` (since 11.1) '''''''''''''''''''''''''' Use ``query-accelerators`` instead. -- 2.55.0

2 1

[PATCH v4 0/7] Add TLS-PSK support for migration
by Abhisek Panda 19 Oct '26

19 Oct '26

QEMU provides the capability to encrypt the migration data stream using two transport layer security (TLS) authentication schemes: X.509 certificates and pre-shared keys (PSK). Currently, Libvirt only supports the X.509-based TLS authentication scheme. In TLS X.509 certificates, a set of live migrations utilize a fixed set of static certificates for encrypted migration. In this authentication scheme, users require to deploy a certificate authority and monitor the certificate expiration window. In case certificates are compromised all the future live migrations are vulnerable. To resolve this, this patch series introduce the support for pre-shared key-based authentication scheme. This mechanism relies on symmetric pre-shared keys (a secret key that is known to both sender and receiver prior to secure communication) for providing secure transfer of data. Libvirt solely manages the lifecycle of the ephemeral pre-shared keys, including, generation, persistent storage, and cleanup. Libvirt generates the key on the source machine, then transfers it to the destination machine using the migration cookie. To allow users to configure the size of the key, Libvirt provides the migrate_tls_psk_length configuration parameter in qemu.conf. We enable the PSK-based TLS authentication scheme if both source and destination supports the tls-creds-psk object regardless of the value of VIR_MIGRATE_TLS flag. Else, we use the X.509-based TLS authentication scheme if the VIR_MIGRATE_TLS flag is set. v4: 1. Enable TLS-PSK if source and destination supports it regardless of the VIR_MIGRATE_TLS flag. 2. If either source or destination does not support TLS-PSK and the VIR_MIGRATE_TLS flag is set then fallback to TLS X509 v3: 1. Destination host decides which TLS authentication scheme to use. 2. The directory of the key file is set to <tls_psk_state_dir>/$ID-$VMNAME. 3. Use the same alias for both tls-creds-x509 and tls-creds-psk objects. 4. Validate the length of the pre-shared key. 5. Unit test to validate the pre-shared key in the migration cookie. v2: 1. Libvirt manages the lifecycle of pre-shared keys. 2. Transfer of keys to the destination via the migration cookie 3. Remove the VIR_MIGRATE_TLS_PSK flag instead rely on VIR_MIGRATE_TLS and availability of ca-cert.pem on source. 4. Drop VIR_MIGRATE_PARAM_TLS_PSK_DIRECTORY, Libvirt solely manages the pre-shared keys. Abhisek Panda (7): conf: Add a configuration param for TLS-PSK qemu: Manage a pre-shared key's lifecycle qemu: Add support to build the tls-creds-psk object qemu: rename tls-creds-x509 obj related functions qemu: Manage tls-creds-psk object lifecycle qemu: Set up the migrate TLS-PSK objects tests: Add testing of pre-shared key lifecycle include/libvirt/libvirt-domain.h | 10 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 8 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 26 +++ src/qemu/qemu_command.h | 7 + src/qemu/qemu_conf.c | 22 +++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 40 ++--- src/qemu/qemu_hotplug.h | 24 +-- src/qemu/qemu_migration.c | 170 +++++++++++++++--- src/qemu/qemu_migration.h | 3 + src/qemu/qemu_migration_cookie.c | 79 +++++++- src/qemu/qemu_migration_cookie.h | 5 + src/qemu/qemu_migration_params.c | 98 ++++++++-- src/qemu/qemu_migration_params.h | 22 ++- src/qemu/qemu_process.c | 3 + src/qemu/test_libvirtd_qemu.aug.in | 1 + .../caps_10.0.0_aarch64.xml | 1 + .../caps_10.0.0_ppc64.xml | 1 + .../caps_10.0.0_s390x.xml | 1 + .../caps_10.0.0_x86_64+amdsev.xml | 1 + .../caps_10.0.0_x86_64.xml | 1 + .../caps_10.1.0_s390x.xml | 1 + .../caps_10.1.0_x86_64+inteltdx.xml | 1 + .../caps_10.1.0_x86_64.xml | 1 + .../caps_10.2.0_aarch64.xml | 1 + .../caps_10.2.0_x86_64+mshv.xml | 1 + .../caps_10.2.0_x86_64.xml | 1 + .../caps_11.0.0_aarch64.xml | 1 + .../caps_11.0.0_s390x.xml | 1 + .../caps_11.0.0_x86_64+sgx.xml | 1 + .../caps_11.0.0_x86_64.xml | 1 + .../caps_11.1.0_aarch64.xml | 1 + .../caps_11.1.0_s390x.xml | 1 + .../caps_11.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + .../caps_8.2.0_aarch64.xml | 1 + .../caps_8.2.0_armv7l.xml | 1 + .../caps_8.2.0_loongarch64.xml | 1 + .../qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 + .../caps_8.2.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 + .../caps_9.0.0_x86_64.xml | 1 + .../caps_9.1.0_riscv64.xml | 1 + .../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 + .../caps_9.1.0_x86_64.xml | 1 + .../caps_9.2.0_aarch64+hvf.xml | 1 + .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 + .../caps_9.2.0_x86_64+amdsev.xml | 1 + .../caps_9.2.0_x86_64.xml | 1 + tests/qemumigrationcookiexmltest.c | 135 +++++++++++++- tests/testutilsqemu.c | 12 ++ 62 files changed, 632 insertions(+), 85 deletions(-) -- 2.43.7

2 12

[PATCH] bhyve: capabilities: use virBitmap to store capabilities
by Roman Bogorodskiy 19 Oct '26

19 Oct '26

Similarly to the qemu driver, store bhyve capabilities in virBitmap. Add helpers to work with capabilities: virBhyveCapsGet(), virBhyveCapsSet(), and virBhyveCapsClear(). No functional changes. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 107 ++++++++++++++++++++------------ src/bhyve/bhyve_capabilities.h | 50 +++++++++------ src/bhyve/bhyve_command.c | 30 ++++----- src/bhyve/bhyve_domain.c | 4 +- src/bhyve/bhyve_driver.c | 17 ++--- src/bhyve/bhyve_driver.h | 2 +- src/bhyve/bhyve_parse_command.c | 16 ++--- src/bhyve/bhyve_parse_command.h | 2 +- src/bhyve/bhyve_process.c | 2 +- src/bhyve/bhyve_utils.h | 3 +- tests/bhyveargv2xmltest.c | 4 +- tests/bhyvexml2argvtest.c | 54 +++++++++------- tests/bhyvexml2xmltest.c | 9 ++- tests/domaincapstest.c | 20 +++--- 14 files changed, 187 insertions(+), 133 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 5d07d16f69..42da2a7c47 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -42,6 +42,30 @@ VIR_LOG_INIT("bhyve.bhyve_capabilities"); +void +virBhyveCapsSet(virBitmap *caps, + virBhyveCapsFlags flag) +{ + ignore_value(virBitmapSetBit(caps, flag)); +} + + +void +virBhyveCapsClear(virBitmap *caps, + virBhyveCapsFlags flag) +{ + ignore_value(virBitmapClearBit(caps, flag)); +} + + +bool +virBhyveCapsGet(virBitmap *caps, + virBhyveCapsFlags flag) +{ + return caps && virBitmapIsBitSet(caps, flag); +} + + virCaps * virBhyveCapsBuild(void) { @@ -69,7 +93,7 @@ virBhyveCapsBuild(void) int virBhyveDomainCapsFill(virDomainCaps *caps, - unsigned int bhyvecaps, + virBitmap *bhyvecaps, virDomainCapsStringValues *firmwares) { caps->disk.supported = VIR_TRISTATE_BOOL_YES; @@ -87,7 +111,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, caps->os.supported = VIR_TRISTATE_BOOL_YES; caps->os.loader.supported = VIR_TRISTATE_BOOL_NO; - if (bhyvecaps & BHYVE_CAP_LPC_BOOTROM) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_LPC_BOOTROM)) { caps->os.loader.type.report = true; caps->os.loader.readonly.report = true; caps->os.loader.supported = VIR_TRISTATE_BOOL_YES; @@ -103,7 +127,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, caps->graphics.supported = VIR_TRISTATE_BOOL_NO; caps->video.supported = VIR_TRISTATE_BOOL_NO; - if (bhyvecaps & BHYVE_CAP_FBUF) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_FBUF)) { caps->graphics.supported = VIR_TRISTATE_BOOL_YES; caps->graphics.type.report = true; caps->video.supported = VIR_TRISTATE_BOOL_YES; @@ -112,7 +136,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, VIR_DOMAIN_CAPS_ENUM_SET(caps->video.modelType, VIR_DOMAIN_VIDEO_TYPE_GOP); } - if (bhyvecaps & BHYVE_CAP_VIRTIO_RND) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_VIRTIO_RND)) { caps->rng.supported = VIR_TRISTATE_BOOL_YES; caps->rng.model.report = true; caps->rng.backendModel.report = true; @@ -121,7 +145,7 @@ virBhyveDomainCapsFill(virDomainCaps *caps, VIR_DOMAIN_CAPS_ENUM_SET(caps->rng.backendModel, VIR_DOMAIN_RNG_BACKEND_RANDOM); } - if (bhyvecaps & BHYVE_CAP_LPC_TPM) { + if (virBhyveCapsGet(bhyvecaps, BHYVE_CAP_LPC_TPM)) { caps->tpm.supported = VIR_TRISTATE_BOOL_YES; caps->tpm.model.report = true; caps->tpm.backendModel.report = true; @@ -156,7 +180,7 @@ virBhyveDomainCapsBuild(struct _bhyveConn *conn, virDomainVirtType virttype) { virDomainCaps *caps = NULL; - unsigned int bhyve_caps = 0; + g_autoptr(virBitmap) bhyve_caps = NULL; g_autoptr(DIR) dir = NULL; struct dirent *entry; size_t firmwares_alloc = 0; @@ -222,12 +246,12 @@ virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps) } static int -bhyveProbeCapsDeviceHelper(unsigned int *caps, +bhyveProbeCapsDeviceHelper(virBitmap *caps, char *binary, const char *bus, const char *device, const char *errormsg, - unsigned int flag) + virBhyveCapsFlags flag) { g_autofree char *error = NULL; g_autoptr(virCommand) cmd = NULL; @@ -240,13 +264,13 @@ bhyveProbeCapsDeviceHelper(unsigned int *caps, return -1; if (strstr(error, errormsg) == NULL) - *caps |= flag; + virBhyveCapsSet(caps, flag); return 0; } static int -bhyveProbeCapsFromHelp(unsigned int *caps, char *binary) +bhyveProbeCapsFromHelp(virBitmap *caps, char *binary) { g_autofree char *help = NULL; g_autoptr(virCommand) cmd = NULL; @@ -259,52 +283,52 @@ bhyveProbeCapsFromHelp(unsigned int *caps, char *binary) return -1; if (strstr(help, "-u:") != NULL) - *caps |= BHYVE_CAP_RTC_UTC; + virBhyveCapsSet(caps, BHYVE_CAP_RTC_UTC); /* "-c vcpus" was there before CPU topology support was introduced, * then it became * "-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n] */ if (strstr(help, "-c vcpus") == NULL) - *caps |= BHYVE_CAP_CPUTOPOLOGY; + virBhyveCapsSet(caps, BHYVE_CAP_CPUTOPOLOGY); if (strstr(help, "-A:") != NULL) - *caps |= BHYVE_CAP_ACPI; + virBhyveCapsSet(caps, BHYVE_CAP_ACPI); if (strstr(help, "-n:") != NULL) - *caps |= BHYVE_CAP_NUMA; + virBhyveCapsSet(caps, BHYVE_CAP_NUMA); if (strstr(help, "-M:") != NULL) - *caps |= BHYVE_CAP_MONITOR; + virBhyveCapsSet(caps, BHYVE_CAP_MONITOR); return 0; } static int -bhyveFillCapForDevice(unsigned int *caps, const char *device) +bhyveFillCapForDevice(virBitmap *caps, const char *device) { if (STREQ(device, "ahci")) - *caps |= BHYVE_CAP_AHCI32SLOT; + virBhyveCapsSet(caps, BHYVE_CAP_AHCI32SLOT); else if (STREQ(device, "e1000")) - *caps |= BHYVE_CAP_NET_E1000; + virBhyveCapsSet(caps, BHYVE_CAP_NET_E1000); else if (STREQ(device, "fbuf")) - *caps |= BHYVE_CAP_FBUF; + virBhyveCapsSet(caps, BHYVE_CAP_FBUF); else if (STREQ(device, "hda")) - *caps |= BHYVE_CAP_SOUND_HDA; + virBhyveCapsSet(caps, BHYVE_CAP_SOUND_HDA); else if (STREQ(device, "nvme")) - *caps |= BHYVE_CAP_NVME; + virBhyveCapsSet(caps, BHYVE_CAP_NVME); else if (STREQ(device, "virtio-9p")) - *caps |= BHYVE_CAP_VIRTIO_9P; + virBhyveCapsSet(caps, BHYVE_CAP_VIRTIO_9P); else if (STREQ(device, "virtio-rnd")) - *caps |= BHYVE_CAP_VIRTIO_RND; + virBhyveCapsSet(caps, BHYVE_CAP_VIRTIO_RND); else if (STREQ(device, "xhci")) - *caps |= BHYVE_CAP_XHCI; + virBhyveCapsSet(caps, BHYVE_CAP_XHCI); return 0; } static int -bhyveProbeCapsFromSHelp(unsigned int *caps, char *binary) +bhyveProbeCapsFromSHelp(virBitmap *caps, char *binary) { g_autofree char *help = NULL; g_autoptr(virCommand) cmd = NULL; @@ -328,7 +352,7 @@ bhyveProbeCapsFromSHelp(unsigned int *caps, char *binary) } static int -bhyveProbeCapsLpcBootrom(unsigned int *caps, char *binary) +bhyveProbeCapsLpcBootrom(virBitmap *caps, char *binary) { return bhyveProbeCapsDeviceHelper(caps, binary, "-l", @@ -339,7 +363,7 @@ bhyveProbeCapsLpcBootrom(unsigned int *caps, char *binary) static int -bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) +bhyveProbeCapsVNCPassword(virBitmap *caps, char *binary) { return bhyveProbeCapsDeviceHelper(caps, binary, "-s", @@ -350,7 +374,7 @@ bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) static int -bhyveProbeCapsLpcTpm(unsigned int *caps, char *binary) +bhyveProbeCapsLpcTpm(virBitmap *caps, char *binary) { return bhyveProbeCapsDeviceHelper(caps, binary, "-l", @@ -361,7 +385,7 @@ bhyveProbeCapsLpcTpm(unsigned int *caps, char *binary) static void -bhyveProbeCapsRctl(unsigned int *caps) +bhyveProbeCapsRctl(virBitmap *caps) { bool racct_enable; size_t racct_enable_len; @@ -376,13 +400,13 @@ bhyveProbeCapsRctl(unsigned int *caps) return; if (racct_enable) - *caps |= BHYVE_CAP_RCTL; + virBhyveCapsSet(caps, BHYVE_CAP_RCTL); return; } static int -bhyveProbeCapsBhyvectl(unsigned int *caps) +bhyveProbeCapsBhyvectl(virBitmap *caps) { g_autofree char *binary = virFindFileInPath("bhyvectl"); g_autofree char *help = NULL; @@ -399,14 +423,15 @@ bhyveProbeCapsBhyvectl(unsigned int *caps) return -1; if (strstr(help, "--get-vm-pid") != NULL) - *caps |= BHYVE_CAP_GET_VMPID; + virBhyveCapsSet(caps, BHYVE_CAP_GET_VMPID); return 0; } int -virBhyveProbeCaps(unsigned int *caps) +virBhyveProbeCaps(virBitmap **caps) { + g_autoptr(virBitmap) bitmap = virBitmapNew(BHYVE_CAP_LAST); char *binary; int ret = 0; @@ -414,27 +439,29 @@ virBhyveProbeCaps(unsigned int *caps) if (binary == NULL) goto out; - if ((ret = bhyveProbeCapsFromHelp(caps, binary))) + if ((ret = bhyveProbeCapsFromHelp(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsFromSHelp(caps, binary))) + if ((ret = bhyveProbeCapsFromSHelp(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsLpcBootrom(caps, binary))) + if ((ret = bhyveProbeCapsLpcBootrom(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsVNCPassword(caps, binary))) + if ((ret = bhyveProbeCapsVNCPassword(bitmap, binary))) goto out; - if ((ret = bhyveProbeCapsBhyvectl(caps))) + if ((ret = bhyveProbeCapsBhyvectl(bitmap))) goto out; - bhyveProbeCapsRctl(caps); + bhyveProbeCapsRctl(bitmap); - if ((ret = bhyveProbeCapsLpcTpm(caps, binary))) + if ((ret = bhyveProbeCapsLpcTpm(bitmap, binary))) goto out; out: + if (ret == 0) + *caps = g_steal_pointer(&bitmap); VIR_FREE(binary); return ret; } diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 35ca214538..90e604c41b 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -24,12 +24,13 @@ #include "capabilities.h" #include "conf/domain_capabilities.h" +#include "virbitmap.h" #include "bhyve_utils.h" virCaps *virBhyveCapsBuild(void); int virBhyveDomainCapsFill(virDomainCaps *caps, - unsigned int bhyvecaps, + virBitmap *bhyvecaps, virDomainCapsStringValues *firmwares); virDomainCaps *virBhyveDomainCapsBuild(bhyveConn *conn, const char *emulatorbin, @@ -43,25 +44,34 @@ typedef enum { } virBhyveGrubCapsFlags; typedef enum { - BHYVE_CAP_RTC_UTC = 1 << 0, - BHYVE_CAP_AHCI32SLOT = 1 << 1, - BHYVE_CAP_NET_E1000 = 1 << 2, - BHYVE_CAP_LPC_BOOTROM = 1 << 3, - BHYVE_CAP_FBUF = 1 << 4, - BHYVE_CAP_XHCI = 1 << 5, - BHYVE_CAP_CPUTOPOLOGY = 1 << 6, - BHYVE_CAP_SOUND_HDA = 1 << 7, - BHYVE_CAP_VNC_PASSWORD = 1 << 8, - BHYVE_CAP_VIRTIO_9P = 1 << 9, - BHYVE_CAP_VIRTIO_RND = 1 << 10, - BHYVE_CAP_NVME = 1 << 11, - BHYVE_CAP_ACPI = 1 << 12, - BHYVE_CAP_NUMA = 1 << 13, - BHYVE_CAP_RCTL = 1 << 14, - BHYVE_CAP_MONITOR = 1 << 15, - BHYVE_CAP_GET_VMPID = 1 << 16, - BHYVE_CAP_LPC_TPM = 1 << 17, + BHYVE_CAP_RTC_UTC, + BHYVE_CAP_AHCI32SLOT, + BHYVE_CAP_NET_E1000, + BHYVE_CAP_LPC_BOOTROM, + BHYVE_CAP_FBUF, + BHYVE_CAP_XHCI, + BHYVE_CAP_CPUTOPOLOGY, + BHYVE_CAP_SOUND_HDA, + BHYVE_CAP_VNC_PASSWORD, + BHYVE_CAP_VIRTIO_9P, + BHYVE_CAP_VIRTIO_RND, + BHYVE_CAP_NVME, + BHYVE_CAP_ACPI, + BHYVE_CAP_NUMA, + BHYVE_CAP_RCTL, + BHYVE_CAP_MONITOR, + BHYVE_CAP_GET_VMPID, + BHYVE_CAP_LPC_TPM, + + BHYVE_CAP_LAST, } virBhyveCapsFlags; +void virBhyveCapsSet(virBitmap *caps, + virBhyveCapsFlags flag) ATTRIBUTE_NONNULL(1); +void virBhyveCapsClear(virBitmap *caps, + virBhyveCapsFlags flag) ATTRIBUTE_NONNULL(1); +bool virBhyveCapsGet(virBitmap *caps, + virBhyveCapsFlags flag); + int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); -int virBhyveProbeCaps(unsigned int *caps); +int virBhyveProbeCaps(virBitmap **caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index dac3146785..09ef61e798 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -60,7 +60,7 @@ bhyveBuildNetArgStr(const virDomainDef *def, if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO) { nic_model = "virtio-net"; } else if (net->model == VIR_DOMAIN_NET_MODEL_E1000) { - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_NET_E1000) != 0) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_NET_E1000)) { nic_model = "e1000"; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -272,7 +272,7 @@ bhyveBuildTPMArgStr(const virDomainDef *def G_GNUC_UNUSED, struct _bhyveConn *driver, virCommand *cmd) { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_TPM)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_LPC_TPM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support TPM devices")); return -1; @@ -333,13 +333,13 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, switch (disk->device) { case VIR_DOMAIN_DISK_DEVICE_DISK: - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_AHCI32SLOT)) + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_AHCI32SLOT)) virBufferAsprintf(&device, ",hd:%s", disk_source); else virBufferAsprintf(&device, "-hd,%s", disk_source); break; case VIR_DOMAIN_DISK_DEVICE_CDROM: - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_AHCI32SLOT)) + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_AHCI32SLOT)) virBufferAsprintf(&device, ",cd:%s", disk_source); else virBufferAsprintf(&device, "-cd,%s", disk_source); @@ -488,7 +488,7 @@ bhyveBuildNVMeControllerArgStr(const virDomainDef *def, if (disk->bus != VIR_DOMAIN_DISK_BUS_NVME) continue; - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_NVME)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_NVME)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Bhyve version does not support NVMe")); return -1; @@ -716,7 +716,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, bool escapeAddr; unsigned short port; - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_BOOTROM) || + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_LPC_BOOTROM) || def->os.bootloader || !def->os.loader) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -724,7 +724,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, return -1; } - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_FBUF)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_FBUF)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Bhyve version does not support framebuffer")); return -1; @@ -791,7 +791,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, } if (graphics->data.vnc.auth.passwd) { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_VNC_PASSWORD)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_VNC_PASSWORD)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("VNC Password authentication not supported by bhyve")); return -1; @@ -805,7 +805,7 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def, virBufferAsprintf(&opt, ",password=%s", graphics->data.vnc.auth.passwd); } else { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_VNC_PASSWORD)) + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_VNC_PASSWORD)) VIR_WARN("%s", _("Security warning: VNC auth is not supported.")); else VIR_WARN("%s", _("Security warning: VNC is used without authentication.")); @@ -836,7 +836,7 @@ bhyveBuildSoundArgStr(const virDomainDef *def G_GNUC_UNUSED, { g_auto(virBuffer) params = VIR_BUFFER_INITIALIZER; - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_SOUND_HDA)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_SOUND_HDA)) { /* Currently, bhyve only supports "hda" sound devices, so if it's not supported, sound devices are not supported at all */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -1157,7 +1157,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, return NULL; } - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_CPUTOPOLOGY) != 0) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_CPUTOPOLOGY)) { virCommandAddArgFormat(cmd, "cpus=%d,sockets=%d,cores=%d,threads=%d", nvcpus, def->cpu->sockets, @@ -1189,7 +1189,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, /* NUMA */ if (ncells) { - if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_NUMA)) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_NUMA)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support NUMA configuration")); return NULL; @@ -1222,7 +1222,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, /* Options */ if ((def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON) && - (bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_ACPI)) + virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_ACPI)) /* As of FreeBSD commit * https://cgit.freebsd.org/src/commit/?id=6a0e7f908802b86ca5d1c0b3c404b8391d0… * bhyve(8) generates ACPI tables unconditionally, so nothing needs to be done @@ -1238,7 +1238,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, /* used by default in bhyve */ break; case VIR_DOMAIN_CLOCK_OFFSET_UTC: - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RTC_UTC) != 0) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_RTC_UTC)) { virCommandAddArg(cmd, "-u"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -1279,7 +1279,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (ARCH_IS_X86(arch)) { - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_LPC_BOOTROM)) { + if (virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_LPC_BOOTROM)) { virBufferAsprintf(&buf, "bootrom,%s", def->os.loader->path); if (def->os.loader->nvram && def->os.loader->nvram->path) virBufferAsprintf(&buf, ",%s", def->os.loader->nvram->path); diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 142d01e016..0ee2e06664 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -157,7 +157,7 @@ bhyveDomainDefPostParse(virDomainDef *def, /* When not specified in the domain XML, clock.offset defaults to UTC which is * not supported by bhyve on ARM64. So force it to LOCALTIME. */ if ((def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_UTC) && - !(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RTC_UTC)) + !virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_RTC_UTC)) def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME; /* bhyve/arm64 does not provide the bhyveload(8) tool, @@ -237,7 +237,7 @@ bhyveDomainDiskDefAssignAddress(struct _bhyveConn *driver, case VIR_DOMAIN_DISK_BUS_SATA: def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; - if ((driver->bhyvecaps & BHYVE_CAP_AHCI32SLOT) != 0) { + if (virBhyveCapsGet(driver->bhyvecaps, BHYVE_CAP_AHCI32SLOT)) { def->info.addr.drive.controller = idx / 32; def->info.addr.drive.unit = idx % 32; } else { diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4c4ba9b0ba..47ed7d6963 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -783,7 +783,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, return NULL; } - if ((bhyveDriverGetBhyveCaps(privconn) & BHYVE_CAP_LPC_BOOTROM) == 0) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(privconn), BHYVE_CAP_LPC_BOOTROM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Installed bhyve binary does not support bootrom")); return NULL; @@ -1377,6 +1377,7 @@ bhyveStateCleanup(void) virSysinfoDefFree(bhyve_driver->hostsysinfo); virObjectUnref(bhyve_driver->domainEventState); virPortAllocatorRangeFree(bhyve_driver->remotePorts); + virBitmapFree(bhyve_driver->bhyvecaps); if (bhyve_driver->lockFD != -1) virPidFileRelease(bhyve_driver->config->stateDir, "driver", bhyve_driver->lockFD); @@ -1421,13 +1422,15 @@ bhyveStateInitialize(bool privileged, if (virBhyveProbeCaps(&bhyve_driver->bhyvecaps) < 0) goto cleanup; - if (!privileged && !(bhyveDriverGetBhyveCaps(bhyve_driver) & BHYVE_CAP_MONITOR)) { + if (!privileged && + !virBhyveCapsGet(bhyveDriverGetBhyveCaps(bhyve_driver), BHYVE_CAP_MONITOR)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("bhyve does not support monitor mode, cannot run unprivileged")); goto cleanup; } - if (!privileged && !(bhyveDriverGetBhyveCaps(bhyve_driver) & BHYVE_CAP_GET_VMPID)) { + if (!privileged && + !virBhyveCapsGet(bhyveDriverGetBhyveCaps(bhyve_driver), BHYVE_CAP_GET_VMPID)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("bhyvectl does not support querying the VM PID, cannot run unprivileged")); goto cleanup; @@ -1513,12 +1516,12 @@ bhyveStateInitialize(bool privileged, return VIR_DRV_STATE_INIT_ERROR; } -unsigned +virBitmap * bhyveDriverGetBhyveCaps(struct _bhyveConn *driver) { if (driver != NULL) return driver->bhyvecaps; - return 0; + return NULL; } unsigned @@ -1774,7 +1777,7 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn, { g_autoptr(virDomainDef) def = NULL; struct _bhyveConn *privconn = conn->privateData; - unsigned bhyveCaps = bhyveDriverGetBhyveCaps(privconn); + virBitmap *bhyveCaps = bhyveDriverGetBhyveCaps(privconn); virCheckFlags(0, NULL); @@ -2409,7 +2412,7 @@ bhyveDomainSetMemoryParameters(virDomainPtr domain, return -1; if (def) { - if ((bhyveDriverGetBhyveCaps(privconn) & BHYVE_CAP_RCTL) == 0) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(privconn), BHYVE_CAP_RCTL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Cannot set resource limits: RACCT/RCTL is either not supported or not enabled")); goto endjob; diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h index 3f86081910..49ba7bbddb 100644 --- a/src/bhyve/bhyve_driver.h +++ b/src/bhyve/bhyve_driver.h @@ -25,7 +25,7 @@ int bhyveRegister(void); -unsigned bhyveDriverGetBhyveCaps(struct _bhyveConn *driver); +virBitmap *bhyveDriverGetBhyveCaps(struct _bhyveConn *driver); unsigned bhyveDriverGetGrubCaps(struct _bhyveConn *driver); diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 3d9a6f3964..fd8d062c31 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -253,7 +253,7 @@ bhyveCommandLineToArgv(const char *nativeConfig, static int bhyveParseBhyveLPCArg(virDomainDef *def, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, const char *arg) { /* -l emulation[,config] */ @@ -391,7 +391,7 @@ bhyveParsePCISlot(const char *slotdef, static int bhyveParsePCIDisk(virDomainDef *def, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned pcibus, unsigned pcislot, unsigned function, @@ -461,7 +461,7 @@ bhyveParsePCIDisk(virDomainDef *def, static int bhyveParsePCINet(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned bus, unsigned slot, unsigned function, @@ -536,7 +536,7 @@ bhyveParsePCINet(virDomainDef *def, static int bhyveParsePCIFbuf(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned bus, unsigned slot, unsigned function, @@ -644,7 +644,7 @@ bhyveParsePCIFbuf(virDomainDef *def, static int bhyveParsePCIRND(virDomainDef *def, virDomainXMLOption *xmlopt G_GNUC_UNUSED, - unsigned caps G_GNUC_UNUSED, + virBitmap *caps G_GNUC_UNUSED, unsigned bus, unsigned slot, unsigned function, @@ -733,7 +733,7 @@ bhyveParsePassthru(virDomainDef *def G_GNUC_UNUSED, static int bhyveParseBhyvePCIArg(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps, + virBitmap *caps, unsigned *nvirtiodisk, unsigned *nahcidisk, const char *arg) @@ -822,7 +822,7 @@ bhyveParseBhyvePCIArg(virDomainDef *def, static int bhyveParseBhyveCommandLine(virDomainDef *def, virDomainXMLOption *xmlopt, - unsigned caps, + virBitmap *caps, int argc, char **argv) { int vcpus = 1; @@ -1025,7 +1025,7 @@ bhyveParseCustomLoaderCommandLine(virDomainDef *def, virDomainDef * bhyveParseCommandLineString(const char* nativeConfig, - unsigned caps, + virBitmap *caps, virDomainXMLOption *xmlopt) { g_autoptr(virDomainDef) def = NULL; diff --git a/src/bhyve/bhyve_parse_command.h b/src/bhyve/bhyve_parse_command.h index 7cf3e70b5e..bf9ad3beb2 100644 --- a/src/bhyve/bhyve_parse_command.h +++ b/src/bhyve/bhyve_parse_command.h @@ -21,5 +21,5 @@ #pragma once virDomainDef *bhyveParseCommandLineString(const char* nativeConfig, - unsigned caps, + virBitmap *caps, virDomainXMLOption *xmlopt); diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 41b5c118f2..c27a5cf6ed 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -225,7 +225,7 @@ bhyveSetResourceLimits(struct _bhyveConn *driver, virDomainObj *vm) return -1; } - if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RCTL) == 0) { + if (!virBhyveCapsGet(bhyveDriverGetBhyveCaps(driver), BHYVE_CAP_RCTL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Cannot set resource limits: RACCT/RCTL is either not supported or not enabled")); return -1; diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index db2789fe02..6d15035693 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -27,6 +27,7 @@ #include "virdomainobjlist.h" #include "virthread.h" #include "hypervisor/virclosecallbacks.h" +#include "virbitmap.h" #include "virportallocator.h" typedef struct _virBhyveDriverConfig virBhyveDriverConfig; @@ -69,7 +70,7 @@ struct _bhyveConn { virPortAllocatorRange *remotePorts; - unsigned bhyvecaps; + virBitmap *bhyvecaps; unsigned grubcaps; bool privileged; diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index acfaade24c..4cb5045704 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -143,7 +143,8 @@ mymain(void) DO_TEST_FULL(name, FLAG_EXPECT_PARSE_ERROR) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps = BHYVE_CAP_RTC_UTC; + driver.bhyvecaps = virBitmapNew(BHYVE_CAP_LAST); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); DO_TEST("base"); DO_TEST("wired"); @@ -193,6 +194,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virBitmapFree(driver.bhyvecaps); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 8a6e044ad0..650563821b 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -214,13 +214,20 @@ mymain(void) DO_TEST_FULL(name, FLAG_EXPECT_PREPARE_ERROR) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | \ - BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM | \ - BHYVE_CAP_FBUF | BHYVE_CAP_XHCI | \ - BHYVE_CAP_CPUTOPOLOGY | BHYVE_CAP_SOUND_HDA | \ - BHYVE_CAP_VNC_PASSWORD | BHYVE_CAP_VIRTIO_9P | \ - BHYVE_CAP_NVME | BHYVE_CAP_NUMA | \ - BHYVE_CAP_LPC_TPM; + driver.bhyvecaps = virBitmapNew(BHYVE_CAP_LAST); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_NET_E1000); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_LPC_BOOTROM); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_FBUF); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_XHCI); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_CPUTOPOLOGY); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_SOUND_HDA); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_VNC_PASSWORD); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_VIRTIO_9P); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_NVME); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_NUMA); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_LPC_TPM); DO_TEST("base"); DO_TEST_UNPRIVILEGED_FAILURE("base"); @@ -228,7 +235,7 @@ mymain(void) DO_TEST_FAILURE("bootorder-invalid-index"); DO_TEST("wired"); DO_TEST("acpiapic"); - driver.bhyvecaps &= ~BHYVE_CAP_ACPI; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_ACPI); DO_TEST_FAILURE("acpiapic"); DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); @@ -281,7 +288,7 @@ mymain(void) DO_TEST("numa"); DO_TEST_FAILURE("numa-empty-cpuset"); DO_TEST_FAILURE("numa-too-many-domains"); - driver.bhyvecaps &= ~BHYVE_CAP_NUMA; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NUMA); DO_TEST_FAILURE("numa"); fakefirmwaredir = g_steal_pointer(&driver.config->firmwareDir); driver.config->firmwareDir = g_steal_pointer(&fakefirmwareemptydir); @@ -291,13 +298,13 @@ mymain(void) DO_TEST_FAILURE("fs-9p-unsupported-type"); DO_TEST_FAILURE("fs-9p-unsupported-driver"); DO_TEST_FAILURE("fs-9p-unsupported-accessmode"); - driver.bhyvecaps &= ~BHYVE_CAP_VIRTIO_9P; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_VIRTIO_9P); DO_TEST_FAILURE("fs-9p"); DO_TEST("virtio-rnd"); DO_TEST_FAILURE("virtio-rnd-backend-random-non-default-file"); DO_TEST_FAILURE("virtio-rnd-backend-builtin"); DO_TEST_FAILURE("virtio-rnd-transitional"); - driver.bhyvecaps &= ~BHYVE_CAP_VIRTIO_RND; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_VIRTIO_RND); DO_TEST_FAILURE("virtio-rnd"); DO_TEST("serial-tcp"); DO_TEST("4-consoles"); @@ -338,7 +345,7 @@ mymain(void) DO_TEST_FAILURE("tpm-comma-path"); DO_TEST_FAILURE("tpm-invalid-model"); DO_TEST_FAILURE("tpm-multiple-devices"); - driver.bhyvecaps &= ~BHYVE_CAP_LPC_TPM; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_LPC_TPM); DO_TEST_FAILURE("tpm"); /* Address allocation tests */ @@ -352,7 +359,7 @@ mymain(void) DO_TEST("addr-non-isa-controller-on-slot-1"); /* The same without 32 devs per controller support */ - driver.bhyvecaps ^= BHYVE_CAP_AHCI32SLOT; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); DO_TEST("addr-no32devs-single-sata-disk"); DO_TEST("addr-no32devs-multiple-sata-disks"); DO_TEST_FAILURE("addr-no32devs-more-than-32-sata-disks"); @@ -362,33 +369,33 @@ mymain(void) DO_TEST_FAILURE("xhci-multiple-controllers"); DO_TEST_FAILURE("xhci-no-devs"); DO_TEST_FAILURE("xhci-multiple-devs"); - driver.bhyvecaps ^= BHYVE_CAP_XHCI; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_XHCI); DO_TEST_FAILURE("input-xhci-tablet"); driver.grubcaps = 0; DO_TEST("serial-grub-nocons"); - driver.bhyvecaps &= ~BHYVE_CAP_NET_E1000; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NET_E1000); DO_TEST_FAILURE("net-e1000"); - driver.bhyvecaps &= ~BHYVE_CAP_LPC_BOOTROM; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_LPC_BOOTROM); DO_TEST_FAILURE("uefi"); - driver.bhyvecaps &= ~BHYVE_CAP_FBUF; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_FBUF); DO_TEST_FAILURE("vnc"); - driver.bhyvecaps &= ~BHYVE_CAP_CPUTOPOLOGY; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_CPUTOPOLOGY); DO_TEST_FAILURE("cputopology"); - driver.bhyvecaps &= ~BHYVE_CAP_SOUND_HDA; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_SOUND_HDA); DO_TEST_FAILURE("sound"); - driver.bhyvecaps &= ~BHYVE_CAP_VNC_PASSWORD; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_VNC_PASSWORD); DO_TEST_FAILURE("vnc-password"); - driver.bhyvecaps &= ~BHYVE_CAP_NVME; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NVME); DO_TEST_FAILURE("nvme"); driver.config->bhyveloadTimeout = 300; @@ -400,9 +407,9 @@ mymain(void) virTestSetHostArch(VIR_ARCH_AARCH64); driver.caps = virBhyveCapsBuild(); /* bhyve does not support UTC clock on ARM */ - driver.bhyvecaps ^= BHYVE_CAP_RTC_UTC; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); /* bhyve does not support NUMA on ARM */ - driver.bhyvecaps &= ~BHYVE_CAP_NUMA; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_NUMA); DO_TEST("base"); DO_TEST("console"); @@ -411,6 +418,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virBitmapFree(driver.bhyvecaps); virPortAllocatorRangeFree(driver.remotePorts); virObjectUnref(driver.config); diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index a9964f9825..724ba4d85f 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -95,7 +95,9 @@ mymain(void) # define DO_TEST_FAILURE(name) \ DO_TEST_FULL(name, FLAG_EXPECT_FAILURE) - driver.bhyvecaps = BHYVE_CAP_AHCI32SLOT | BHYVE_CAP_RTC_UTC; + driver.bhyvecaps = virBitmapNew(BHYVE_CAP_LAST); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); + virBhyveCapsSet(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); DO_TEST_DIFFERENT("acpiapic"); DO_TEST_DIFFERENT("base"); @@ -174,7 +176,7 @@ mymain(void) DO_TEST_DIFFERENT("addr-isa-controller-on-slot-31"); /* The same without 32 devs per controller support */ - driver.bhyvecaps ^= BHYVE_CAP_AHCI32SLOT; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_AHCI32SLOT); DO_TEST_DIFFERENT("addr-no32devs-single-sata-disk"); DO_TEST_DIFFERENT("addr-no32devs-multiple-sata-disks"); DO_TEST_FAILURE("addr-no32devs-more-than-32-sata-disks"); @@ -186,7 +188,7 @@ mymain(void) virTestSetHostArch(VIR_ARCH_AARCH64); driver.caps = virBhyveCapsBuild(); /* bhyve does not support UTC clock on ARM */ - driver.bhyvecaps ^= BHYVE_CAP_RTC_UTC; + virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_RTC_UTC); DO_TEST_DIFFERENT("base"); DO_TEST_DIFFERENT("console"); @@ -194,6 +196,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virBitmapFree(driver.bhyvecaps); virObjectUnref(driver.config); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index b3e9ff7051..b4ade48f91 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -147,7 +147,7 @@ fillXenCaps(virDomainCaps *domCaps) # include "bhyve/bhyve_capabilities.h" static int -fillBhyveCaps(virDomainCaps *domCaps, unsigned int *bhyve_caps) +fillBhyveCaps(virDomainCaps *domCaps, virBitmap *bhyve_caps) { g_autofree virDomainCapsStringValues *firmwares = NULL; @@ -156,7 +156,7 @@ fillBhyveCaps(virDomainCaps *domCaps, unsigned int *bhyve_caps) if (fillStringValues(firmwares, "/foo/bar", "/foo/baz", NULL) < 0) return -1; - if (virBhyveDomainCapsFill(domCaps, *bhyve_caps, firmwares) < 0) + if (virBhyveDomainCapsFill(domCaps, bhyve_caps, firmwares) < 0) return -1; return 0; @@ -420,7 +420,7 @@ mymain(void) int ret = 0; #if WITH_BHYVE - unsigned int bhyve_caps = 0; + g_autoptr(virBitmap) bhyve_caps = virBitmapNew(BHYVE_CAP_LAST); #endif #if WITH_QEMU @@ -523,16 +523,16 @@ mymain(void) #endif /* WITH_LIBXL */ #if WITH_BHYVE - DO_TEST_BHYVE("basic", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + DO_TEST_BHYVE("basic", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); - bhyve_caps |= BHYVE_CAP_LPC_BOOTROM; - DO_TEST_BHYVE("uefi", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + virBhyveCapsSet(bhyve_caps, BHYVE_CAP_LPC_BOOTROM); + DO_TEST_BHYVE("uefi", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); - bhyve_caps |= BHYVE_CAP_FBUF; - DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + virBhyveCapsSet(bhyve_caps, BHYVE_CAP_FBUF); + DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); - bhyve_caps |= BHYVE_CAP_LPC_TPM; - DO_TEST_BHYVE("tpm", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); + virBhyveCapsSet(bhyve_caps, BHYVE_CAP_LPC_TPM); + DO_TEST_BHYVE("tpm", "/usr/sbin/bhyve", bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); #endif /* WITH_BHYVE */ return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 2.55.0

2 1

[PATCH 0/4] bhyve: implement TPM support
by Roman Bogorodskiy 19 Oct '26

19 Oct '26

Roman Bogorodskiy (4): bhyve: capabilities: use consistent function names bhyve: capabilities: probe TPM support bhyve: implement TPM support bhyve: domain: validate TPM devices src/bhyve/bhyve_capabilities.c | 29 +++++++- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 27 ++++++++ src/bhyve/bhyve_domain.c | 38 +++++++++- .../x86_64/bhyvexml2argv-tpm-comma-path.xml | 16 +++++ .../x86_64/bhyvexml2argv-tpm-crb.args | 12 ++++ .../x86_64/bhyvexml2argv-tpm-crb.ldargs | 4 ++ .../x86_64/bhyvexml2argv-tpm-crb.xml | 28 ++++++++ .../bhyvexml2argv-tpm-invalid-model.xml | 16 +++++ .../bhyvexml2argv-tpm-multiple-devices.xml | 21 ++++++ .../x86_64/bhyvexml2argv-tpm.args | 12 ++++ .../x86_64/bhyvexml2argv-tpm.ldargs | 4 ++ .../x86_64/bhyvexml2argv-tpm.xml | 28 ++++++++ tests/bhyvexml2argvtest.c | 10 ++- .../x86_64/bhyvexml2xmlout-tpm.xml | 41 +++++++++++ tests/bhyvexml2xmltest.c | 4 ++ tests/domaincapsdata/bhyve_tpm.x86_64.xml | 69 +++++++++++++++++++ tests/domaincapstest.c | 3 + 18 files changed, 359 insertions(+), 4 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-comma-path.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-crb.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-crb.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-crb.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-invalid-model.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm-multiple-devices.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-tpm.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-tpm.xml create mode 100644 tests/domaincapsdata/bhyve_tpm.x86_64.xml -- 2.55.0

2 8

[PATCH] qemu: emit UNDEFINED event when undefining source after migration
by Jim Fehlig 16 Oct '26

16 Oct '26

From: Jim Fehlig <jfehlig(a)suse.com> When migrating with VIR_MIGRATE_UNDEFINE_SOURCE, qemuMigrationSrcConfirm() and qemuMigrationSrcPerformJob() delete the domain's persistent config on the source host but never emit a VIR_DOMAIN_EVENT_UNDEFINED lifecycle event. Applications relying solely on domain events never learn the domain was undefined on the source. Emit the event, reusing the existing VIR_DOMAIN_EVENT_UNDEFINED_REMOVED detail since the semantics match virDomainUndefine(). Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/qemu/qemu_migration.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 797f83ca0d..f336437734 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4279,6 +4279,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, { qemuMigrationJobPhase phase; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + virObjectEvent *event = NULL; int ret = -1; VIR_DEBUG("vm=%p, flags=0x%x, cancelled=%d", vm, flags, cancelled); @@ -4325,11 +4326,15 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, if (!cancelled && ret == 0 && flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent = 0; + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); } qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true); } cleanup: + virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); return ret; } @@ -6328,6 +6333,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, bool v3proto) { virObjectEvent *event = NULL; + virObjectEvent *undefine_event = NULL; int ret = -1; virErrorPtr orig_err = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -6419,6 +6425,9 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent = 0; + undefine_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); } qemuDomainRemoveInactive(vm, 0, true); } @@ -6427,6 +6436,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, cleanup: virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, undefine_event); return ret; } -- 2.51.0

3 4

[PATCH v3] build: set firewall_backend_priority regardless of driver_network
by Marek Marczykowski-Górecki 16 Oct '26

16 Oct '26

Set firewall_backend_priority whenever WITH_NWFILTER or WITH_NETWORK is set. And similarly, print firewall backends on the same condition. Otherwise a build with -Ddriver_network=disabled fails with: src/nwfilter/meson.build:51:43: ERROR: Unknown variable "firewall_backend_priority". Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- meson.build | 54 +++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 927665b5fb..c15e4b43bf 100644 --- a/meson.build +++ b/meson.build @@ -1650,31 +1650,6 @@ endif if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') conf.set('WITH_NETWORK', 1) - - firewall_backend_priority = get_option('firewall_backend_priority') - if firewall_backend_priority.length() == 0 - if host_machine.system() == 'linux' - firewall_backend_priority = ['nftables', 'iptables'] - elif host_machine.system() == 'freebsd' - firewall_backend_priority = ['pf'] - else - # No firewall impl on non-Linux so far, so force 'none' - # as placeholder - firewall_backend_priority = ['none'] - endif - else - if host_machine.system() != 'linux' - error('firewall backend priority only supported on linux hosts') - endif - endif - - backends = [] - foreach backend: firewall_backend_priority - backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() - backends += backend - endforeach - - conf.set('FIREWALL_BACKENDS', ', '.join(backends)) elif get_option('driver_network').enabled() error('libvirtd must be enabled to build the network driver') endif @@ -2035,6 +2010,33 @@ if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux' conf.set('WITH_NWFILTER', 1) endif +if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK') + firewall_backend_priority = get_option('firewall_backend_priority') + if firewall_backend_priority.length() == 0 + if host_machine.system() == 'linux' + firewall_backend_priority = ['nftables', 'iptables'] + elif host_machine.system() == 'freebsd' + firewall_backend_priority = ['pf'] + else + # No firewall impl on non-Linux so far, so force 'none' + # as placeholder + firewall_backend_priority = ['none'] + endif + else + if host_machine.system() != 'linux' + error('firewall backend priority only supported on linux hosts') + endif + endif + + backends = [] + foreach backend: firewall_backend_priority + backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() + backends += backend + endforeach + + conf.set('FIREWALL_BACKENDS', ', '.join(backends)) +endif + if not get_option('pm_utils').disabled() use_pm_utils = true if init_script == 'systemd' @@ -2373,7 +2375,7 @@ misc_summary = { 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'Warning Flags': supported_cc_flags, } -if conf.has('WITH_NETWORK') +if conf.has('WITH_NWFILTER') or conf.has('WITH_NETWORK') misc_summary += { 'firewall backends': firewall_backend_priority, } -- 2.54.0

2 1

[PATCH v2] build: set firewall_backend_priority regardless of driver_network
by Marek Marczykowski-Górecki 16 Oct '26

16 Oct '26

Set firewall_backend_priority whenever WITH_NWFILTER is set. And similarly, print firewall backends on the same condition. Otherwise a build with -Ddriver_network=disabled fails with: src/nwfilter/meson.build:51:43: ERROR: Unknown variable "firewall_backend_priority". Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- meson.build | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 927665b5fb..049d259555 100644 --- a/meson.build +++ b/meson.build @@ -1650,31 +1650,6 @@ endif if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') conf.set('WITH_NETWORK', 1) - - firewall_backend_priority = get_option('firewall_backend_priority') - if firewall_backend_priority.length() == 0 - if host_machine.system() == 'linux' - firewall_backend_priority = ['nftables', 'iptables'] - elif host_machine.system() == 'freebsd' - firewall_backend_priority = ['pf'] - else - # No firewall impl on non-Linux so far, so force 'none' - # as placeholder - firewall_backend_priority = ['none'] - endif - else - if host_machine.system() != 'linux' - error('firewall backend priority only supported on linux hosts') - endif - endif - - backends = [] - foreach backend: firewall_backend_priority - backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() - backends += backend - endforeach - - conf.set('FIREWALL_BACKENDS', ', '.join(backends)) elif get_option('driver_network').enabled() error('libvirtd must be enabled to build the network driver') endif @@ -2033,6 +2008,31 @@ endif # libvirt daemon is also being compiled if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux' conf.set('WITH_NWFILTER', 1) + + firewall_backend_priority = get_option('firewall_backend_priority') + if firewall_backend_priority.length() == 0 + if host_machine.system() == 'linux' + firewall_backend_priority = ['nftables', 'iptables'] + elif host_machine.system() == 'freebsd' + firewall_backend_priority = ['pf'] + else + # No firewall impl on non-Linux so far, so force 'none' + # as placeholder + firewall_backend_priority = ['none'] + endif + else + if host_machine.system() != 'linux' + error('firewall backend priority only supported on linux hosts') + endif + endif + + backends = [] + foreach backend: firewall_backend_priority + backend = 'VIR_FIREWALL_BACKEND_' + backend.to_upper() + backends += backend + endforeach + + conf.set('FIREWALL_BACKENDS', ', '.join(backends)) endif if not get_option('pm_utils').disabled() @@ -2373,7 +2373,7 @@ misc_summary = { 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'Warning Flags': supported_cc_flags, } -if conf.has('WITH_NETWORK') +if conf.has('WITH_NWFILTER') misc_summary += { 'firewall backends': firewall_backend_priority, } -- 2.54.0

2 1

[PATCH v2 0/2] qemu: add support for vhost-net when using the mshv accelerator
by Magnus Kulke 16 Oct '26

16 Oct '26

Currently vhost-net is dropped for everything but KVM, this change enables it also for the MSHV accelerator (HYPERV). Changes since v1: - The dedicated unit test has been dropped - Test fixtures and mock have been extended to test a vhost net device Magnus Kulke (2): tests: Add vhost network interface to mshv config qemu: Consider vhost-net for mshv accelerator src/qemu/qemu_interface.c | 6 +++--- tests/qemuxml2argvmock.c | 3 ++- ...86_64-q35-headless.x86_64-latest+mshv.args | 11 +++++++---- ...x86_64-q35-headless.x86_64-latest+mshv.xml | 19 +++++++++++++++---- .../mshv-x86_64-q35-headless.xml | 5 +++++ 5 files changed, 32 insertions(+), 12 deletions(-) -- 2.34.1

2 4