January 2026 - Devel - libvirt List Archives

[PATCH] bhyve: improve loader handling on arm64
by Roman Bogorodskiy 27 Jan '26

27 Jan '26

Bhyve on arm64 does not have the bhyveload(8) tool. That means that it cannot be used as a default if the loader is not configured for the domain. To prevent users from getting unusable configurations, handle loader configuration on arm64 like that: - if loader is specified in the domain XML, just use it - if not specified, try to check whether the default uboot loader is available on the system. In case it is, set is as the loader, otherwise fail with the error. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_domain.c | 22 +++++++++++++++++++ .../aarch64/bhyvexml2argv-base.args | 1 + .../aarch64/bhyvexml2argv-base.ldargs | 8 +------ .../aarch64/bhyvexml2argv-console.args | 1 + .../aarch64/bhyvexml2argv-console.ldargs | 8 +------ tests/bhyvexml2argvmock.c | 20 ++++++++++++++++- .../aarch64/bhyvexml2xmlout-base.xml | 1 + .../aarch64/bhyvexml2xmlout-console.xml | 1 + 8 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index df0a008ecd..733bacc8c1 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -27,11 +27,14 @@ #include "bhyve_domain.h" #include "bhyve_capabilities.h" #include "viralloc.h" +#include "virfile.h" #include "virlog.h" #include "virutil.h" #define VIR_FROM_THIS VIR_FROM_BHYVE +#define UBOOT_BHYVE DATADIR "/u-boot/u-boot-bhyve-arm64/u-boot.bin" + VIR_LOG_INIT("bhyve.bhyve_domain"); static void * @@ -112,6 +115,25 @@ bhyveDomainDefPostParse(virDomainDef *def, !(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RTC_UTC)) def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME; + /* bhyve/arm64 does not provide the bhyveload(8) tool, + * so if the loader is not specified and we cannot fall back to the + * default one, then this results in an usable configuration. */ + if (ARCH_IS_ARM(def->os.arch)) { + if (def->os.loader == NULL) { + if (virFileExists(UBOOT_BHYVE)) { + def->os.loader = virDomainLoaderDefNew(); + def->os.loader->path = g_strdup(UBOOT_BHYVE); + def->os.loader->readonly = true; + def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH; + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("loader is not specified and the default loader (%1$s) not found"), + UBOOT_BHYVE); + return -1; + } + } + } + return 0; } diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args index aef3ebd017..1079beee52 100644 --- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args @@ -2,6 +2,7 @@ bhyve \ -c 1 \ -m 214 \ -s 0:0,hostbridge \ +-o bootrom=/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ -s 2:0,virtio-blk,/tmp/freebsd.img \ bhyve diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.ldargs b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.ldargs index 264ae48441..421376db9e 100644 --- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.ldargs +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.ldargs @@ -1,7 +1 @@ -timeout \ ---foreground \ ---verbose \ --k 20s 300s bhyveload \ --m 214 \ --d /tmp/freebsd.img \ -bhyve +dummy diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args index 4a031afb71..ea2cc15713 100644 --- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args @@ -2,6 +2,7 @@ bhyve \ -c 1 \ -m 214 \ -s 0:0,hostbridge \ +-o bootrom=/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ -s 2:0,virtio-blk,/tmp/freebsd.img \ -o console=/dev/nmdm0A \ diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs index 264ae48441..421376db9e 100644 --- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs +++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.ldargs @@ -1,7 +1 @@ -timeout \ ---foreground \ ---verbose \ --k 20s 300s bhyveload \ --m 214 \ --d /tmp/freebsd.img \ -bhyve +dummy diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index fe76564d51..f4271563d7 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -2,7 +2,9 @@ #include <dirent.h> +#include "configmake.h" #include "viralloc.h" +#include "virfile.h" #include "virstring.h" #include "virnetdev.h" #include "virnetdevtap.h" @@ -12,11 +14,16 @@ #define VIR_FROM_THIS VIR_FROM_BHYVE static DIR * (*real_opendir)(const char *name); +static bool (*real_virFileExists)(const char *path); static void init_syms(void) { - VIR_MOCK_REAL_INIT(opendir); + if (!real_opendir) + VIR_MOCK_REAL_INIT(opendir); + + if (!real_virFileExists) + VIR_MOCK_REAL_INIT(virFileExists); } #define FAKEFIRMWAREDIR abs_srcdir "/bhyvefirmwaredata/three_firmwares" @@ -89,3 +96,14 @@ int bind(int sockfd G_GNUC_UNUSED, { return 0; } + +bool +virFileExists(const char *path) +{ + init_syms(); + + if (STREQ(path, DATADIR "/u-boot/u-boot-bhyve-arm64/u-boot.bin")) + return true; + + return real_virFileExists(path); +} diff --git a/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml index ee72370047..d6c9caa225 100644 --- a/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml +++ b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-base.xml @@ -6,6 +6,7 @@ <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin</loader> <boot dev='hd'/> </os> <clock offset='localtime'/> diff --git a/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml index d43ce8fd6f..d694ecfb8d 100644 --- a/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml +++ b/tests/bhyvexml2xmloutdata/aarch64/bhyvexml2xmlout-console.xml @@ -6,6 +6,7 @@ <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin</loader> <boot dev='hd'/> </os> <clock offset='localtime'/> -- 2.52.0

2 3

[PATCH 0/3] esx: Form URLs containing IPv6 addresses correctly
by Richard W.M. Jones 27 Jan '26

27 Jan '26

https://issues.redhat.com/browse/RHEL-138300 This bug requires a further fix to allow libvirt to access ESXi servers over IPv6. The way that we constructed the URL (for fetching things from the SDK with curl) was wrong. We formed URLs like: https://1234:56:0:789a:bcde:72ff:fe0a:7baa:443/sdk but with IPv6 we need to put [...] around the IPv6 address. The first patch just adds some debugging so we can see what URLs we are passing to curl. THe second patch is a bit of abstraction so that we're only creating URLs in one place (but two functions). The third detects if the server name is an IPv6 address and adds the square brackets as appropriate. Tested by me, by connecting to an IPv6 VMware server and listing all the domains, and getting the libvirt XML of a single domain. I didn't test all possible operations in depth. The bug was reported by Ming Xie. Rich.

2 6

[PATCH] qemu: migration: Call hook script on source host at migration start
by Guy Godfroy 26 Jan '26

26 Jan '26

Currently, the qemu hook script with the "migrate" operation is only called on the destination host at the beginning of incoming migration. This makes it impossible for the source host to prepare for migration, for example to change storage locks from exclusive to shared mode when using shared LVM storage with lvmlockd. Add a hook call on the source host at the beginning of outgoing migration. The hook is called with "source" as the extra argument to distinguish it from the destination hook which uses "-". The same change is also applied to the libxl driver for consistency. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/37 Signed-off-by: Guy Godfroy <guy.godfroy(a)gugod.fr> --- docs/hooks.rst | 36 ++++++++++++++++++++++++++++++++---- src/libxl/libxl_migration.c | 17 +++++++++++++++++ src/qemu/qemu_migration.c | 17 +++++++++++++++++ 3 files changed, 66 insertions(+), 4 deletions(-) diff --git a/docs/hooks.rst b/docs/hooks.rst index e1745b8cc7..4c7cac56ba 100644 --- a/docs/hooks.rst +++ b/docs/hooks.rst @@ -244,7 +244,7 @@ operation. There is no specific operation to indicate a "restart" is occurring. - :since:`Since 0.9.11`, the qemu hook script is also called at the beginning - of incoming migration. It is called as: + of incoming migration on the **destination** host. It is called as: :: @@ -257,6 +257,18 @@ operation. There is no specific operation to indicate a "restart" is occurring. is not valid, incoming migration will be canceled. This hook may be used, e.g., to change location of disk images for incoming domains. +- :since:`Since 12.1.0`, the qemu hook script is also called at the beginning + of outgoing migration on the **source** host. It is called as: + + :: + + /etc/libvirt/hooks/qemu guest_name migrate begin source + + with domain XML sent to standard input of the script. Unlike the destination + hook, this script does not act as a filter and any output is ignored. If the + script returns failure, the migration will be canceled. This hook may be used, + e.g., to change storage lock mode from exclusive to shared before migration. + - :since:`Since 1.2.9`, the qemu hook script is also called when restoring a saved image either via the API or automatically when restoring a managed save machine. It is called as: @@ -417,7 +429,7 @@ operation. There is no specific operation to indicate a "restart" is occurring. /etc/libvirt/hooks/libxl guest_name release end - - :since:`Since 2.1.0`, the libxl hook script is also called at the beginning - of incoming migration. It is called as: + of incoming migration on the **destination** host. It is called as: :: @@ -430,6 +442,18 @@ operation. There is no specific operation to indicate a "restart" is occurring. is not valid, incoming migration will be canceled. This hook may be used, e.g., to change location of disk images for incoming domains. +- :since:`Since 12.1.0`, the libxl hook script is also called at the beginning + of outgoing migration on the **source** host. It is called as: + + :: + + /etc/libvirt/hooks/libxl guest_name migrate begin source + + with domain XML sent to standard input of the script. Unlike the destination + hook, this script does not act as a filter and any output is ignored. If the + script returns failure, the migration will be canceled. This hook may be used, + e.g., to change storage lock mode from exclusive to shared before migration. + - :since:`Since 6.5.0`, you can also place several hook scripts in the directory ``/etc/libvirt/hooks/libxl.d/``. They are executed in alphabetical order after main script. In this case each script also acts as filter and can @@ -566,10 +590,14 @@ Migration of a QEMU guest involves running hook scripts on both the source and destination hosts: #. At the beginning of the migration, the *qemu* hook script on the - **destination** host is executed with the "migrate" operation. + **source** host is executed with the "migrate" operation and "source" + as the extra argument (:since:`since 12.1.0`). This allows the source + host to prepare for migration, e.g., changing storage locks. +#. Then, the *qemu* hook script on the **destination** host is executed + with the "migrate" operation. #. Before QEMU process is spawned, the two operations ("prepare" and "start") called for domain start are executed on **destination** host. -#. If both of these hook script executions exit successfully (exit status 0), +#. If all of these hook script executions exit successfully (exit status 0), the migration continues. Any other exit code indicates failure, and the migration is aborted. #. The QEMU guest is then migrated to the destination host. diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index f5dee7627b..76f3c7ceb7 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -411,6 +411,23 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, if (!libxlDomainMigrationIsAllowed(def)) goto endjob; + /* Call hook to allow source host to prepare for migration */ + if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { + g_autofree char *hookxml = NULL; + int hookret; + + if (!(hookxml = virDomainDefFormat(def, driver->xmlopt, + VIR_DOMAIN_DEF_FORMAT_SECURE))) + goto endjob; + + hookret = virHookCall(VIR_HOOK_DRIVER_LIBXL, def->name, + VIR_HOOK_LIBXL_OP_MIGRATE, VIR_HOOK_SUBOP_BEGIN, + "source", hookxml, NULL); + + if (hookret < 0) + goto endjob; + } + xml = virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE); /* Valid xml means success! EndJob in the confirm phase */ if (xml) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6dd022163b..60e370319c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2791,6 +2791,23 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, if (!qemuMigrationSrcIsAllowed(vm, true, vm->job->asyncJob, flags)) return NULL; + /* Call hook to allow source host to prepare for migration */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + g_autofree char *xml = NULL; + int hookret; + + if (!(xml = qemuDomainDefFormatLive(driver, priv->qemuCaps, vm->def, + priv->origCPU, false, true))) + return NULL; + + hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_MIGRATE, VIR_HOOK_SUBOP_BEGIN, + "source", xml, NULL); + + if (hookret < 0) + return NULL; + } + if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && !qemuMigrationSrcIsSafe(vm, migrate_disks, flags)) return NULL; -- 2.34.1

1 0

[PATCH v2] Standardize socket family checks
by Julio Faracco 24 Jan '26

24 Jan '26

This commit standardizes socket family checks in rpc/virnetsocket.c and util/virsocketaddr.c with macro VIR_SOCKET_ADDR_IS_FAMILY. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/rpc/virnetsocket.c | 20 ++++++++++---------- src/util/virsocketaddr.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e8fc2d5f7d..22b0aa6ead 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -276,8 +276,8 @@ virNetSocketNew(virSocketAddr *localAddr, sock->unlinkUNIX = unlinkUNIX; /* Disable nagle for TCP sockets */ - if (sock->localAddr.data.sa.sa_family == AF_INET || - sock->localAddr.data.sa.sa_family == AF_INET6) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_INET6)) { if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &no_slow_start, sizeof(no_slow_start)) < 0) { @@ -405,9 +405,9 @@ int virNetSocketNewListenTCP(const char *nodename, * other IP protocol */ if (port != 0 && service == NULL) { - if (addr.data.sa.sa_family == AF_INET) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET)) { addr.data.inet4.sin_port = port; - } else if (addr.data.sa.sa_family == AF_INET6) { + } else if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET6)) { addr.data.inet6.sin6_port = port; } VIR_DEBUG("Used saved port %d", port); @@ -432,9 +432,9 @@ int virNetSocketNewListenTCP(const char *nodename, } if (port == 0 && service == NULL) { - if (addr.data.sa.sa_family == AF_INET) + if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET)) port = addr.data.inet4.sin_port; - else if (addr.data.sa.sa_family == AF_INET6) + else if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET6)) port = addr.data.inet6.sin6_port; VIR_DEBUG("Saved port %d", port); } @@ -1293,7 +1293,7 @@ void virNetSocketDispose(void *obj) #ifndef WIN32 /* If a server socket, then unlink UNIX path */ if (sock->unlinkUNIX && - sock->localAddr.data.sa.sa_family == AF_UNIX && + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX) && sock->localAddr.data.un.sun_path[0] != '\0') unlink(sock->localAddr.data.un.sun_path); #endif @@ -1370,7 +1370,7 @@ bool virNetSocketIsLocal(virNetSocket *sock) { bool isLocal = false; virObjectLock(sock); - if (sock->localAddr.data.sa.sa_family == AF_UNIX) + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX)) isLocal = true; virObjectUnlock(sock); return isLocal; @@ -1381,7 +1381,7 @@ bool virNetSocketHasPassFD(virNetSocket *sock) { bool hasPassFD = false; virObjectLock(sock); - if (sock->localAddr.data.sa.sa_family == AF_UNIX) + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX)) hasPassFD = true; virObjectUnlock(sock); return hasPassFD; @@ -2223,7 +2223,7 @@ void virNetSocketClose(virNetSocket *sock) #ifndef WIN32 /* If a server socket, then unlink UNIX path */ if (sock->unlinkUNIX && - sock->localAddr.data.sa.sa_family == AF_UNIX && + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX) && sock->localAddr.data.un.sun_path[0] != '\0') { if (unlink(sock->localAddr.data.un.sun_path) == 0) sock->localAddr.data.un.sun_path[0] = '\0'; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 1f203fb50d..929dd260af 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -481,7 +481,7 @@ virSocketAddrFormatFull(const virSocketAddr *addr, /* Short-circuit since getnameinfo doesn't work * nicely for UNIX sockets */ - if (addr->data.sa.sa_family == AF_UNIX) { + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_UNIX)) { if (withService) { addrstr = g_strdup_printf(VIR_LOOPBACK_IPV4_ADDR "%s0", separator ? separator : ":"); @@ -634,7 +634,7 @@ virSocketAddrGetPath(virSocketAddr *addr G_GNUC_UNUSED) return NULL; } - if (addr->data.sa.sa_family != AF_UNIX) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_UNIX)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("UNIX socket address is required")); return NULL; -- 2.52.0

1 1

[PATCH 0/2] Fix crash when reverting/deleting external inactive snapshots around the root of the snapshot tree
by Peter Krempa 24 Jan '26

24 Jan '26

Peter Krempa (2): qemuSnapshotDiskHasBackingDisk: Avoid call of virStorageSourceIsSameLocation with NULL argument qemuSnapshotUpdateBackingStore: Remove stale comment src/qemu/qemu_snapshot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.52.0

2 3

[PATCH v3 0/2] Include test cases for virSocketAddrFormatWithPrefix
by Julio Faracco 24 Jan '26

24 Jan '26

Recently, we removed the masked argument in commit 6f07a8e6 from the respective function. But, in sockettest.c, we don't have any test case to cover this function. This series adds some test cases for virSocketAddrFormatWithPrefix and an extra patch to increase the testFormat debugging info. Julio Faracco (2): tests: Add tests for virSocketAddrFormatWithPrefix tests: Add debug information in testFormat() tests/sockettest.c | 77 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) -- 2.52.0

1 2

[PATCH] Standardize socket family checks with proper macro
by Julio Faracco 23 Jan '26

23 Jan '26

There is a macro called VIR_SOCKET_ADDR_IS_FAMILY that checks the socket family. There are several occurrences of raw checks in libvirt code. This commit just standardizes the socket family checks by using its macro. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/rpc/virnetsocket.c | 20 ++++++++++---------- src/util/virsocketaddr.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e8fc2d5f7d..22b0aa6ead 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -276,8 +276,8 @@ virNetSocketNew(virSocketAddr *localAddr, sock->unlinkUNIX = unlinkUNIX; /* Disable nagle for TCP sockets */ - if (sock->localAddr.data.sa.sa_family == AF_INET || - sock->localAddr.data.sa.sa_family == AF_INET6) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_INET6)) { if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &no_slow_start, sizeof(no_slow_start)) < 0) { @@ -405,9 +405,9 @@ int virNetSocketNewListenTCP(const char *nodename, * other IP protocol */ if (port != 0 && service == NULL) { - if (addr.data.sa.sa_family == AF_INET) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET)) { addr.data.inet4.sin_port = port; - } else if (addr.data.sa.sa_family == AF_INET6) { + } else if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET6)) { addr.data.inet6.sin6_port = port; } VIR_DEBUG("Used saved port %d", port); @@ -432,9 +432,9 @@ int virNetSocketNewListenTCP(const char *nodename, } if (port == 0 && service == NULL) { - if (addr.data.sa.sa_family == AF_INET) + if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET)) port = addr.data.inet4.sin_port; - else if (addr.data.sa.sa_family == AF_INET6) + else if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET6)) port = addr.data.inet6.sin6_port; VIR_DEBUG("Saved port %d", port); } @@ -1293,7 +1293,7 @@ void virNetSocketDispose(void *obj) #ifndef WIN32 /* If a server socket, then unlink UNIX path */ if (sock->unlinkUNIX && - sock->localAddr.data.sa.sa_family == AF_UNIX && + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX) && sock->localAddr.data.un.sun_path[0] != '\0') unlink(sock->localAddr.data.un.sun_path); #endif @@ -1370,7 +1370,7 @@ bool virNetSocketIsLocal(virNetSocket *sock) { bool isLocal = false; virObjectLock(sock); - if (sock->localAddr.data.sa.sa_family == AF_UNIX) + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX)) isLocal = true; virObjectUnlock(sock); return isLocal; @@ -1381,7 +1381,7 @@ bool virNetSocketHasPassFD(virNetSocket *sock) { bool hasPassFD = false; virObjectLock(sock); - if (sock->localAddr.data.sa.sa_family == AF_UNIX) + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX)) hasPassFD = true; virObjectUnlock(sock); return hasPassFD; @@ -2223,7 +2223,7 @@ void virNetSocketClose(virNetSocket *sock) #ifndef WIN32 /* If a server socket, then unlink UNIX path */ if (sock->unlinkUNIX && - sock->localAddr.data.sa.sa_family == AF_UNIX && + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX) && sock->localAddr.data.un.sun_path[0] != '\0') { if (unlink(sock->localAddr.data.un.sun_path) == 0) sock->localAddr.data.un.sun_path[0] = '\0'; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4d4a6b2a0f..e8e691ce8f 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -481,7 +481,7 @@ virSocketAddrFormatFull(const virSocketAddr *addr, /* Short-circuit since getnameinfo doesn't work * nicely for UNIX sockets */ - if (addr->data.sa.sa_family == AF_UNIX) { + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_UNIX)) { if (withService) { addrstr = g_strdup_printf(VIR_LOOPBACK_IPV4_ADDR "%s0", separator ? separator : ":"); @@ -636,7 +636,7 @@ virSocketAddrGetPath(virSocketAddr *addr G_GNUC_UNUSED) return NULL; } - if (addr->data.sa.sa_family != AF_UNIX) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_UNIX)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("UNIX socket address is required")); return NULL; -- 2.52.0

2 2

[PATCH v2 0/2] Remove @masked argument from virSocketAddrFormatWithPrefix
by Julio Faracco 23 Jan '26

23 Jan '26

Since its introduction in commit 426afc00, the function virSocketAddrFormatWithPrefix has never been called with argument masked=false. So, this commit proposes to remove this unnecessary argument from the function scope. This series also proposes the respective test cases for virSocketAddrFormatWithPrefix (now, without @masked argument). Julio Faracco (2): util: Remove @masked argument from virSocketAddrFormatWithPrefix tests: Add tests for virSocketAddrFormatWithPrefix src/network/network_iptables.c | 10 +++--- src/network/network_nftables.c | 10 +++--- src/util/virsocketaddr.c | 14 ++++---- src/util/virsocketaddr.h | 3 +- tests/sockettest.c | 63 ++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 20 deletions(-) -- 2.52.0

2 5

[PATCH 0/6] virtio-iommu: Support setting aw-bits and granule
by Michal Privoznik 23 Jan '26

23 Jan '26

*** BLURB HERE *** Michal Prívozník (6): qemu_capabilities: Introduce QEMU_CAPS_VIRTIO_IOMMU_AW_BITS conf: Allow aw_bits for virtio-iommu qemu_command: Generate aw_bits prop for virtio-iommu conf: Introduce granule attribute for virtio-iommu qemu_validate: Check whether granule of virtio-iommu is supported qemu_command: Generate granule prop for virtio-iommu docs/formatdomain.rst | 9 +++++- src/conf/domain_conf.c | 30 ++++++++++++++++++- src/conf/domain_conf.h | 13 ++++++++ src/conf/domain_validate.c | 18 +++++++---- src/conf/schemas/domaincommon.rng | 11 +++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 7 +++++ src/qemu/qemu_validate.c | 13 ++++++-- .../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_x86_64.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 + .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 1 + .../qemuxmlconfdata/virtio-iommu-aarch64.xml | 4 ++- ...io-iommu-dma-translation.x86_64-latest.err | 2 +- 35 files changed, 124 insertions(+), 12 deletions(-) -- 2.52.0

3 18

[PATCH] Fix printf style used with virDomainIOMMUDef::aw_bits
by Michal Privoznik 23 Jan '26

23 Jan '26

From: Michal Privoznik <mprivozn(a)redhat.com> The aw_bits member of the virDomainIOMMUDef is of type unsigned int. However, in a few places (virDomainIOMMUDefCheckABIStability(), virDomainIOMMUDefFormat(), qemuBuildIOMMUCommandLine()) incorrect printf modifier is used. Fix those places. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_command.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8b26de674e..9672168df9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22301,7 +22301,7 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUDef *src, } if (src->aw_bits != dst->aw_bits) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain IOMMU device aw_bits value '%1$d' does not match source '%2$d'"), + _("Target domain IOMMU device aw_bits value '%1$u' does not match source '%2$u'"), dst->aw_bits, src->aw_bits); return false; } @@ -28638,7 +28638,7 @@ virDomainIOMMUDefFormat(virBuffer *buf, virTristateSwitchTypeToString(iommu->iotlb)); } if (iommu->aw_bits > 0) { - virBufferAsprintf(&driverAttrBuf, " aw_bits='%d'", + virBufferAsprintf(&driverAttrBuf, " aw_bits='%u'", iommu->aw_bits); } if (iommu->dma_translation != VIR_TRISTATE_SWITCH_ABSENT) { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0de0a79b46..e81efdfde7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6295,7 +6295,7 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, "T:caching-mode", iommu->caching_mode, "S:eim", qemuOnOffAuto(iommu->eim), "T:device-iotlb", iommu->iotlb, - "z:aw-bits", iommu->aw_bits, + "p:aw-bits", iommu->aw_bits, "T:dma-translation", iommu->dma_translation, NULL) < 0) return -1; -- 2.52.0

2 1