- Devel - libvirt List Archives

[PATCH v2 0/3] Add multitouch input device support
by Julio Faracco 28 Jan '26

28 Jan '26

This patch series implements support for multitouch input devices in libvirt, addressing the multitouch feature request in [1]. In this second version, all the commits compile independently. They are logically separated in: 1. Domain enums, qemu, and security updates. 2. Domain schema update. 3. Test cases updates for multitouch support. [1] https://gitlab.com/libvirt/libvirt/-/issues/808 Julio Faracco (3): Add support for virtio-multitouch input devices conf: Add multitouch to domain schema tests: Add multitouch support to virtio-input tests src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 2 ++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 9 +++++++++ src/conf/schemas/domaincommon.rng | 1 + src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_validate.c | 5 +++++ src/security/security_dac.c | 2 ++ src/security/security_selinux.c | 2 ++ 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_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_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 + tests/qemuxmlconfdata/virtio-input.x86_64-latest.args | 1 + tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml | 3 +++ tests/qemuxmlconfdata/virtio-input.xml | 1 + 42 files changed, 65 insertions(+) -- 2.52.0

2 5

[PATCH v3 0/3] esx: Switch to creating URLs using virURIFormat
by Richard W.M. Jones 27 Jan '26

27 Jan '26

v2 was here: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/XMLW… As suggested by Dan in the previous review, it'd be better to use virURI, and indeed the code is a bit nicer this way. Rich.

3 8

[PATCH v2 0/5] Fix crash when reverting/deleting external snapshots
by Peter Krempa 27 Jan '26

27 Jan '26

v2: - modified explanation of why virStorageSourceIsSameLocation was called with NULL - fixed the call to virStorageSourceGetMetadata which caused the NULL deref - fixed permission issue when calling qemu-img if files are owned by root:root after restoring seclabels - improved error message when generating snapshot path fails (not related to original bug, just annoying when I've had a messed up VM) Peter Krempa (5): qemuSnapshotDiskHasBackingDisk: Avoid call of virStorageSourceIsSameLocation with NULL argument qemuSnapshotUpdateBackingStore: Remove stale comment qemuSnapshotDiskHasBackingDisk: Use proper 'max_depth' when calling 'virStorageSourceGetMetadata' virDomainSnapshotDefAssignExternalNames: Improve error message qemuSnapshotUpdateBackingStore: Retry as curent user if qemu-img fails src/conf/snapshot_conf.c | 4 +-- src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_snapshot.c | 61 ++++++++++++++++++++++++++++------------ 4 files changed, 46 insertions(+), 22 deletions(-) -- 2.52.0

2 6

[PATCH] qemu: Connect NVMe devices to PCIe bus
by Akihiko Odaki 26 Jan '26

26 Jan '26

NVMe has PCIe transport, so connect NVMe devices to PCIe bus instead of classic PCI bus if available. Signed-off-by: Akihiko Odaki <odaki(a)rsg.ci.i.u-tokyo.ac.jp> --- src/qemu/qemu_domain_address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 7233df888c..9957f927f5 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -657,7 +657,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev, break; case VIR_DOMAIN_CONTROLLER_TYPE_NVME: - return pciFlags; + return pcieFlags; case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: --- base-commit: e0dcf278af4a605d2b1178633809c495c1880381 change-id: 20260123-nvme-eecaf6b54ce0 Best regards, -- Akihiko Odaki <odaki(a)rsg.ci.i.u-tokyo.ac.jp>

2 1

[PATCH] qemu: introduce the "virtualization" feature
by Roman Bogorodskiy 26 Jan '26

26 Jan '26

The "virt" board in QEMU has a "virtualization" option that is documented like this: virtualization Set ``on``/``off`` to enable/disable emulating a guest CPU which implements the Arm Virtualization Extensions. The default is ``off``. (from system/arm/virt.rst) According to the documentation, the "virtualiaztion" option is related to the "gic-version" option. Specifically, gic version=4 requires virtualization to be enabled. And gic version=max will use version=4 when virtualization is enabled, and 3 when not. Libvirt does not currently model neither gic version "3" nor "max" though. It is also documented for the "vexpress-a(9|15)" boards, where it is also disabled by default: - QEMU defaults to providing a CPU which does not provide either TrustZone or the Virtualization Extensions: if you want these you must enable them with ``-machine secure=on`` and ``-machine virtualization=on`` (system/arm/vexpress.rst). On the command line it looks like: qemu-system-aarch64 -machine type=virt,virtualization=on .. Model it using the "virtualization" element in the "features" section: <features> <virtualization/> </features> Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- docs/formatdomain.rst | 4 ++ src/conf/domain_conf.c | 4 ++ src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++ src/qemu/qemu_command.c | 9 ++++ src/qemu/qemu_validate.c | 1 + ...64-virt-virtualization.aarch64-latest.args | 38 ++++++++++++++++ ...h64-virt-virtualization.aarch64-latest.xml | 45 +++++++++++++++++++ .../aarch64-virt-virtualization.xml | 25 +++++++++++ tests/qemuxmlconftest.c | 2 + 10 files changed, 134 insertions(+) create mode 100644 tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-virt-virtualization.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 04ef319a73..ad74d91950 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2378,6 +2378,10 @@ are: one IMSIC device present per core), or ``none`` (no support for AIA). If the attribute is not defined, the hypervisor default will be used. :since:`Since 11.1.0` (QEMU/KVM and RISC-V guests only) +``virtualization`` + Enable emulating a guest CPU which implements the Arm Virtualization Extensions. + If the attribute is not defined, the hypervisor default will be used. + :since:`Since 12.1.0` (QEMU/KVM and ARM virt guests only) Time keeping ------------ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9ca5c2450c..1a8c5cb5b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -188,6 +188,7 @@ VIR_ENUM_IMPL(virDomainFeature, "ras", "ps2", "aia", + "virtualization", ); VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, @@ -17480,6 +17481,7 @@ virDomainFeaturesDefParse(virDomainDef *def, case VIR_DOMAIN_FEATURE_PAE: case VIR_DOMAIN_FEATURE_VIRIDIAN: case VIR_DOMAIN_FEATURE_PRIVNET: + case VIR_DOMAIN_FEATURE_VIRTUALIZATION: def->features[val] = VIR_TRISTATE_SWITCH_ON; break; @@ -21636,6 +21638,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_FEATURE_CCF_ASSIST: case VIR_DOMAIN_FEATURE_RAS: case VIR_DOMAIN_FEATURE_PS2: + case VIR_DOMAIN_FEATURE_VIRTUALIZATION: if (src->features[i] != dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of feature '%1$s' differs: source: '%2$s', destination: '%3$s'"), @@ -28867,6 +28870,7 @@ virDomainDefFormatFeatures(virBuffer *buf, case VIR_DOMAIN_FEATURE_PAE: case VIR_DOMAIN_FEATURE_VIRIDIAN: case VIR_DOMAIN_FEATURE_PRIVNET: + case VIR_DOMAIN_FEATURE_VIRTUALIZATION: /* NOTE: This is for old style <opt/> booleans. New XML * should use the explicit state=on|off output below */ switch ((virTristateSwitch) def->features[i]) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cb35ff06bd..d0f4c082fd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2243,6 +2243,7 @@ typedef enum { VIR_DOMAIN_FEATURE_RAS, VIR_DOMAIN_FEATURE_PS2, VIR_DOMAIN_FEATURE_AIA, + VIR_DOMAIN_FEATURE_VIRTUALIZATION, VIR_DOMAIN_FEATURE_LAST } virDomainFeature; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index 114dd3f96f..8669d8f791 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -7180,6 +7180,11 @@ <optional> <ref name="aia"/> </optional> + <optional> + <element name="virtualization"> + <empty/> + </element> + </optional> </interleave> </element> </optional> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0de0a79b46..b410daf156 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7011,6 +7011,15 @@ qemuAppendDomainFeaturesMachineParam(virBuffer *buf, } } + if (def->features[VIR_DOMAIN_FEATURE_VIRTUALIZATION] == VIR_TRISTATE_SWITCH_ON) { + if (virQEMUCapsGetArch(qemuCaps) != VIR_ARCH_AARCH64) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtualization option is not available with this QEMU binary")); + return -1; + } + virBufferAddLit(buf, ",virtualization=on"); + } + if (def->features[VIR_DOMAIN_FEATURE_HTM] != VIR_TRISTATE_SWITCH_ABSENT) { const char *str; str = virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEATURE_HTM]); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 184c23d307..5474d00ecd 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -182,6 +182,7 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, break; case VIR_DOMAIN_FEATURE_GIC: + case VIR_DOMAIN_FEATURE_VIRTUALIZATION: if (def->features[i] == VIR_TRISTATE_SWITCH_ON && !qemuDomainIsARMVirt(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args new file mode 100644 index 0000000000..be04ecc641 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=aarch64-virt-default-nic,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/master-key.aes"}' \ +-machine virt,usb=off,gic-version=2,virtualization=on,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-accel tcg \ +-cpu cortex-a53 \ +-m size=1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append console=ttyAMA0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.xml new file mode 100644 index 0000000000..7636046257 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>aarch64-virt-default-nic</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <cmdline>console=ttyAMA0</cmdline> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + <virtualization/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='allow'>cortex-a53</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </interface> + <audio id='1' type='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtualization.xml b/tests/qemuxmlconfdata/aarch64-virt-virtualization.xml new file mode 100644 index 0000000000..ee7984a736 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-virt-virtualization.xml @@ -0,0 +1,25 @@ +<domain type="qemu"> + <name>aarch64-virt-default-nic</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <cpu match='exact'> + <model>cortex-a53</model> + </cpu> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <cmdline>console=ttyAMA0</cmdline> + </os> + <features> + <virtualization/> + </features> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 89b8ad1a35..c7c1d1da54 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -3322,6 +3322,8 @@ mymain(void) /* MSHV guests should not work on Linux with KVM */ DO_TEST_CAPS_LATEST_PARSE_ERROR("mshv-x86_64-q35-headless"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtualization", "aarch64"); + /* check that all input files were actually used here */ if (testConfXMLCheck(existingTestCases) < 0) ret = -1; -- 2.52.0

2 3

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

26 Jan '26

v1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/YRCX… In v2, replace multiple VIR_DEBUG with just one, and add the Reported-by and Reviewed-by tags on the last commit. I'm sure this can't be the only place in libvirt that has to solve this problem (nor the "is this hostname IPv6" problem for that matter), but my searching skills are not good enough to find any other places. Rich.

3 6

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

26 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 26 Jan '26

26 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 23 Jan '26

23 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