- Devel - libvirt List Archives

[PATCH] bhyve: add blkiotune support
by Roman Bogorodskiy 15 Apr '26

15 Apr '26

FreeBSD supports resource limiting with the rctl(4) framework. It supports various resource types, including I/O resources. It allows to limit resources for users, processes, login classes, and jails. To apply blkiotune limits set limits for the bhyve process. I/O related resources supported by rctl(4) are: readbps filesystem reads, in bytes per second writebps filesystem writes, in bytes per second readiops filesystem reads, in operations per second writeiops filesystem writes, in operations per second Thus, the actual commands look like: rctl -a process:$bhyvepid:writebps:throttle=10000000 rctl -a process:$bhyvepid:readbps:throttle=10000000 rctl -a process:$bhyvepid:writeiops:throttle=20000 rctl -a process:$bhyvepid:readiops:throttle=20000 This is different from the current blkiotune modeling in libvirt as it requires specific device to apply limits to. To adapt this model to per-domain I/O limits, update domain schema to specify "*" as a device name. The rctl(8) may be not available or not enabled, so add a capability check for that. Per process rules get removed when the process disappears, so no special clean up is necessary. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 25 +++++++- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_domain.c | 6 ++ src/bhyve/bhyve_process.c | 59 +++++++++++++++++++ src/conf/schemas/domaincommon.rng | 5 +- ...yvexml2argv-blkiotune-multiple-devices.xml | 39 ++++++++++++ .../x86_64/bhyvexml2argv-blkiotune.args | 10 ++++ .../x86_64/bhyvexml2argv-blkiotune.ldargs | 4 ++ .../x86_64/bhyvexml2argv-blkiotune.xml | 32 ++++++++++ tests/bhyvexml2argvtest.c | 2 + .../x86_64/bhyvexml2xmlout-blkiotune.xml | 42 +++++++++++++ tests/bhyvexml2xmltest.c | 2 + 12 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune-multiple-devices.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-blkiotune.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index c3fb88fe9f..1088d75407 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -24,6 +24,7 @@ #include <config.h> #include <sys/utsname.h> #include <dirent.h> +#include <sys/sysctl.h> #include <sys/types.h> #include "viralloc.h" @@ -40,7 +41,6 @@ VIR_LOG_INIT("bhyve.bhyve_capabilities"); - virCaps * virBhyveCapsBuild(void) { @@ -334,6 +334,27 @@ bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) } +static int +bhyveProbeCapsRctl(unsigned int *caps) +{ + bool racct_enable; + size_t racct_enable_len; + g_autofree char *rctl = NULL; + + if (!(rctl = virFindFileInPath("rctl"))) + return 0; + + racct_enable_len = sizeof(racct_enable); + if (sysctlbyname("kern.racct.enable", &racct_enable, + &racct_enable_len, NULL, 0) < 0) + return 0; + + if (racct_enable) + *caps |= BHYVE_CAP_RCTL; + + return 0; +} + int virBhyveProbeCaps(unsigned int *caps) { @@ -356,6 +377,8 @@ virBhyveProbeCaps(unsigned int *caps) if ((ret = bhyveProbeCapsVNCPassword(caps, binary))) goto out; + if ((ret = bhyveProbeCapsRctl(caps))) + goto out; out: VIR_FREE(binary); diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 31fd9ab86a..0302b68e22 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -57,6 +57,7 @@ typedef enum { BHYVE_CAP_NVME = 1 << 11, BHYVE_CAP_ACPI = 1 << 12, BHYVE_CAP_NUMA = 1 << 13, + BHYVE_CAP_RCTL = 1 << 14, } virBhyveCapsFlags; int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 4594d7673f..48e1451d8b 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -464,6 +464,12 @@ bhyveDomainDefValidate(const virDomainDef *def, } } + if (def->blkio.ndevices > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Per device I/O tuning is not supported")); + return -1; + } + if (!def->os.loader) return 0; diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 1d436da609..b5ebe0aa61 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -34,6 +34,7 @@ #include "bhyve_device.h" #include "bhyve_driver.h" +#include "bhyve_capabilities.h" #include "bhyve_command.h" #include "bhyve_firmware.h" #include "bhyve_monitor.h" @@ -132,6 +133,61 @@ bhyveProcessStopHook(struct _bhyveConn *driver, VIR_HOOK_SUBOP_END, NULL, xml, NULL); } +static int +bhyveSetResourceLimits(struct _bhyveConn *driver, virDomainObj *vm) +{ + virBlkioDevice *device; + char **rules = NULL; + size_t i, nrules = 0; + int ret = -1; + + if (!vm->def->blkio.ndevices) + return 0; + + if ((bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_RCTL) == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Cannot set resource limits: RACCT/RCTL is either not supported or not enabled")); + return ret; + } + + device = &vm->def->blkio.devices[0]; + +#define BHYVE_APPEND_RCTL_RULE(field, type, format) \ + do { \ + if ((field)) { \ + virBuffer buf = VIR_BUFFER_INITIALIZER; \ + char *rule; \ + virBufferAsprintf(&buf, "process:%d:" type ":throttle=" format, \ + vm->pid, (field)); \ + rule = virBufferContentAndReset(&buf); \ + VIR_APPEND_ELEMENT(rules, nrules, rule); \ + } \ + } while (0) + + BHYVE_APPEND_RCTL_RULE(device->riops, "readiops", "%u"); + BHYVE_APPEND_RCTL_RULE(device->wiops, "writeiops", "%u"); + BHYVE_APPEND_RCTL_RULE(device->rbps, "readbps", "%llu"); + BHYVE_APPEND_RCTL_RULE(device->wbps, "writebps", "%llu"); + +#undef BHYVE_APPEND_RCTL_RULE + + for (i = 0; i < nrules; i++) { + g_autoptr(virCommand) cmd = virCommandNew("rctl"); + virCommandAddArgList(cmd, "-a", rules[i], NULL); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + for (i = 0; i < nrules; i++) + VIR_FREE(rules[i]); + VIR_FREE(rules); + return ret; +} + static int virBhyveProcessStartImpl(struct _bhyveConn *driver, virDomainObj *vm, @@ -258,6 +314,9 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, BHYVE_STATE_DIR) < 0) goto cleanup; + if (bhyveSetResourceLimits(driver, vm) < 0) + goto cleanup; + if (bhyveProcessStartHook(driver, vm, VIR_HOOK_BHYVE_OP_STARTED) < 0) goto cleanup; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index db1dcd3bb7..c7f442a4c1 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -1049,7 +1049,10 @@ <element name="device"> <interleave> <element name="path"> - <ref name="absFilePath"/> + <choice> + <ref name="absFilePath"/> + <value>*</value> + </choice> </element> <optional> <element name="weight"> diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune-multiple-devices.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune-multiple-devices.xml new file mode 100644 index 0000000000..a6b689ad9a --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune-multiple-devices.xml @@ -0,0 +1,39 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <blkiotune> + <device> + <path>*</path> + <read_bytes_sec>10000</read_bytes_sec> + <write_bytes_sec>10000</write_bytes_sec> + <read_iops_sec>20000</read_iops_sec> + <write_iops_sec>20000</write_iops_sec> + </device> + <device> + <path>/dev/hda</path> + <read_bytes_sec>10000</read_bytes_sec> + <write_bytes_sec>10000</write_bytes_sec> + <read_iops_sec>20000</read_iops_sec> + <write_iops_sec>20000</write_iops_sec> + </device> + </blkiotune> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.args new file mode 100644 index 0000000000..507e0be668 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.args @@ -0,0 +1,10 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.ldargs new file mode 100644 index 0000000000..5905f4b3e6 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.xml new file mode 100644 index 0000000000..956d96cf18 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-blkiotune.xml @@ -0,0 +1,32 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <blkiotune> + <device> + <path>*</path> + <read_bytes_sec>10000</read_bytes_sec> + <write_bytes_sec>10000</write_bytes_sec> + <read_iops_sec>20000</read_iops_sec> + <write_iops_sec>20000</write_iops_sec> + </device> + </blkiotune> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index b7749fec6f..c098149ad5 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -289,6 +289,8 @@ mymain(void) DO_TEST_FAILURE("slirp-ip"); DO_TEST("virtio-scsi"); DO_TEST("vcpupin"); + DO_TEST("blkiotune"); + DO_TEST_FAILURE("blkiotune-multiple-devices"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-blkiotune.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-blkiotune.xml new file mode 100644 index 0000000000..4170303a6e --- /dev/null +++ b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-blkiotune.xml @@ -0,0 +1,42 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <blkiotune> + <device> + <path>*</path> + <read_iops_sec>20000</read_iops_sec> + <write_iops_sec>20000</write_iops_sec> + <read_bytes_sec>10000</read_bytes_sec> + <write_bytes_sec>10000</write_bytes_sec> + </device> + </blkiotune> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 950aaea672..ae12b37064 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -133,6 +133,8 @@ mymain(void) DO_TEST_DIFFERENT("slirp"); DO_TEST_DIFFERENT("virtio-scsi"); DO_TEST_DIFFERENT("numa"); + DO_TEST_DIFFERENT("blkiotune"); + DO_TEST_FAILURE("blkiotune-multiple-devices"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.52.0

2 1

[PATCH] docs: Change TD example policy to 0x10000000
by Zhenzhong Duan 15 Apr '26

15 Apr '26

The definition of BIT0 in policy element comes from TDX spec, but it makes confusion for some customers whether 0 or 1 activates debug: 1. We know that "off-TD debug mode" basically means debug from outside the TD --> 1 activates debug. 2. But when a customer is not aware of the term "off-TD debug" it is very easy to misinterpret this as "TD debug mode off" --> 1 deactivates debug. Given that the policy example uses "0x10000001", the second interpretation even becomes more likely, because a customer may assume that security by default is applied in the example. Thus, change the policy in example configuration to "0x10000000" and update BIT0 definition to be more explicit. Suggested-by: Fuhry Benny <benny.fuhry(a)intel.com> Signed-off-by: Zhenzhong Duan <zhenzhong.duan(a)intel.com> --- docs/formatdomain.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 1a4bd4c6e9..b589fc9429 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9834,7 +9834,7 @@ Example configuration: <domain> ... <launchSecurity type='tdx'> - <policy>0x10000001</policy> + <policy>0x10000000</policy> <mrConfigId>xxx</mrConfigId> <mrOwner>xxx</mrOwner> <mrOwnerConfig>xxx</mrOwnerConfig> @@ -9855,7 +9855,9 @@ Example configuration: ====== ==================================================================================== Bit(s) Description ====== ==================================================================================== - 0 Guest TD runs in off-TD debug mode when set + 0 Activate off-TD debug when set, i.e., activate debug from outside the TD. Its VCPU + state and private memory are accessible by the host VMM. + Deactivate off-TD debug when clear, i.e., deactivate debug from outside the TD. 1:27 reserved 28 Disable EPT violation conversion to #VE on guest TD access of PENDING pages when set 29:63 reserved -- 2.47.3

2 1

[PATCH v3 0/4] hyperv: Add snapshot create/delete support
by Jonathon Jongsma 14 Apr '26

14 Apr '26

Add ability to create and delete basic snapshots in thed hyperv driver. Changes in v3: - Rebase to latest master - update comments about release version 12.2.0 -> 12.3.0 - mention snapshot-create limitations in commit message Changes in v2: - re-word error message about configuring disks / memory for snapshots - split out the utility function for extracting async method output params Jonathon Jongsma (4): hyperv: Add snapshot related WMI class definitions hyperv: Implement domainSnapshotDelete() hyperv: Add a utility function for getting method output params hyperv: Implement domainSnapshotCreateXML() src/hyperv/hyperv_driver.c | 129 ++++++++++++++++++++++++ src/hyperv/hyperv_wmi.c | 139 ++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 17 ++++ src/hyperv/hyperv_wmi_generator.input | 42 ++++++++ 4 files changed, 327 insertions(+) -- 2.53.0

2 9

Save the date: KVM Forum 2026, Vancouver, Canada, November 12-13
by Peter Maydell 14 Apr '26

14 Apr '26

#################### KVM Forum 2026 November 12-13, 2026 Vancouver, Canada #################### On behalf of the program committee for the KVM Forum, I am pleased to announce KVM Forum 2026, November 12-13 2026 in Vancouver, Canada. The call for papers will follow, but we want to give you the opportunity to pre-plan. https://kvm-forum.qemu.org/ and https://kvm-forum.qemu.org/location/ already provide some initial information, more will come soon. -- Peter Maydell

1 0

[PATCH v4 0/3] apparmor: Preserve macvtap path in domain profile
by Wesley Hershberger 14 Apr '26

14 Apr '26

I will open a separate issue for tracking the blockcommit r/w permissions side of this (as I should have done all along). I've opened a MR to libvirt-tck with a test case that demonstrates the bug [1]. apparmor/110-macvtap.t passes with these patches applied. Thanks for the reviews and continued consideration. [1] https://gitlab.com/libvirt/libvirt-tck/-/merge_requests/73 Resolves: https://gitlab.com/libvirt/libvirt/-/issues/692 Signed-off-by: Wesley Hershberger <wesley.hershberger(a)canonical.com> --- Changes in v4: - Split apparmor changes to separate patches - virBufferEscapeString for formatting in XML - Fix dangling pointer in virNetDevMacVLanTapOpen - Added tapfd path to qemustatusxml2xmldata Changes in v3: - Fix buglink in commit message - Link to v2: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/IPEB… Changes in v2: - Drop `virt-aa-helper: Ask for no deny rule...` as it was applied - Drop `qemu: Store blockcommit permissions...` due to unresolved concerns - Pass tapfd path through netdef instead of resolving from fd - Link to v1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/UNNB… --- Wesley Hershberger (3): qemu: Store tapfd path in domstatus XML apparmor: Pass status XML to virt-aa-helper virt-aa-helper: Include macvtap tapfd path src/conf/domain_conf.c | 8 ++++++++ src/conf/domain_conf.h | 1 + src/hypervisor/domain_interface.c | 2 +- src/lxc/lxc_process.c | 1 + src/qemu/qemu_interface.c | 1 + src/security/security_apparmor.c | 1 + src/security/virt-aa-helper.c | 5 +++++ src/util/virnetdevmacvlan.c | 18 +++++++++++------- src/util/virnetdevmacvlan.h | 4 +++- tests/qemustatusxml2xmldata/modern-in.xml | 7 +++++++ 10 files changed, 39 insertions(+), 9 deletions(-) --- base-commit: 792cb6bf60e774ee8ecf9e7d3cd2b6f21011ab43 change-id: 20260105-apparmor-races-d03238ee4d93 Best regards, -- Wesley Hershberger <wesley.hershberger(a)canonical.com>

2 5

[PATCH] conf: Reject blockio settings for "<disk device='lun'>"
by Peter Krempa 14 Apr '26

14 Apr '26

From: Peter Krempa <pkrempa(a)redhat.com> Overriding the blockio settings for disk passthrough via "<disk device='lun'>" doesn't make sense and in fact the 'scsi-block' device in qemu doesn't even expose the appropriate properties: qemu-system-x86_64: -device {"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":0,"drive":"libvirt-1-format","id":"scsi0-0-0-0","logical_block_size":512,"physical_block_size":512}: Property 'scsi-block.physical_block_size' not found Reject those at validation. Resolves: https://redhat.atlassian.net/browse/RHEL-145937 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/domain_validate.c | 8 ++++++ .../disk-blockio-device-lun.x86_64-latest.err | 1 + .../disk-blockio-device-lun.xml | 26 +++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 36 insertions(+) create mode 100644 tests/qemuxmlconfdata/disk-blockio-device-lun.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/disk-blockio-device-lun.xml diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index a49156061f..3946f92182 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -786,6 +786,14 @@ virDomainDiskDefValidate(const virDomainDef *def, if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { if (virDomainDiskDefSourceLUNValidate(disk->src) < 0) return -1; + + if (disk->blockio.logical_block_size > 0 || + disk->blockio.physical_block_size > 0 || + disk->blockio.discard_granularity_specified) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("blockio is not supported with device='lun'")); + return -1; + } } else { if (disk->src->pr) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuxmlconfdata/disk-blockio-device-lun.x86_64-latest.err b/tests/qemuxmlconfdata/disk-blockio-device-lun.x86_64-latest.err new file mode 100644 index 0000000000..508abf7a97 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-blockio-device-lun.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: blockio is not supported with device='lun' diff --git a/tests/qemuxmlconfdata/disk-blockio-device-lun.xml b/tests/qemuxmlconfdata/disk-blockio-device-lun.xml new file mode 100644 index 0000000000..862e064d4f --- /dev/null +++ b/tests/qemuxmlconfdata/disk-blockio-device-lun.xml @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='lun'> + <source dev='/dev/something'/> + <target dev='sda' bus='scsi'/> + <blockio logical_block_size='512' physical_block_size='512' discard_granularity='4096'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 14aa723ec5..4c9b55693a 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1613,6 +1613,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); DO_TEST_CAPS_LATEST("disk-blockio-no-discard"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-blockio-device-lun"); driver.config->storageUseNbdkit = 1; DO_TEST_CAPS_LATEST_NBDKIT("disk-cdrom-network-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); -- 2.53.0

2 1

[PATCH 1/2] bhyve: implement domainInterfaceAddresses and domainGetHostname
by Roman Bogorodskiy 14 Apr '26

14 Apr '26

Implement the domainInterfaceAddresses and domainGetHostname APIs. These APIs could use multiple sources of information, though for bhyve only the 'lease' source is supported. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_driver.c | 149 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index a7bd16704e..33a772ccdb 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1846,6 +1846,153 @@ bhyveDomainGetVcpuPinInfo(virDomainPtr domain, return ret; } + +static int +bhyveDomainInterfaceAddresses(virDomainPtr domain, + virDomainInterfacePtr **ifaces, + unsigned int source, + unsigned int flags) +{ + virDomainObj *vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = bhyveDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainInterfaceAddressesEnsureACL(domain->conn, vm->def, source) < 0) + goto cleanup; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + switch (source) { + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: + ret = virDomainNetDHCPInterfaces(vm->def, ifaces); + break; + + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT: + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP: + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unsupported IP address data source %1$d"), + source); + break; + + default: + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unknown IP address data source %1$d"), + source); + break; + } + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + +static int +bhyveDomainGetHostnameLease(virDomainObj *vm, + char **hostname) +{ + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virConnect) conn = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + int n_leases; + size_t i, j; + int ret = -1; + + if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto endjob; + + if (!(conn = virGetConnectNetwork())) + goto endjob; + + for (i = 0; i < vm->def->nnets; i++) { + g_autoptr(virNetwork) network = NULL; + virDomainNetDef *net = vm->def->nets[i]; + + if (net->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&net->mac, macaddr); + network = virNetworkLookupByName(conn, net->data.network.name); + + if (!network) + goto endjob; + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + goto endjob; + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + if (lease->hostname && !*hostname) + *hostname = g_strdup(lease->hostname); + + virNetworkDHCPLeaseFree(lease); + } + + VIR_FREE(leases); + + if (*hostname) + break; + } + + ret = 0; + endjob: + virDomainObjEndJob(vm); + return ret; +} + +static char * +bhyveDomainGetHostname(virDomainPtr domain, + unsigned int flags) +{ + virDomainObj *vm = NULL; + char *hostname = NULL; + + virCheckFlags(VIR_DOMAIN_GET_HOSTNAME_LEASE | + VIR_DOMAIN_GET_HOSTNAME_AGENT, NULL); + + VIR_EXCLUSIVE_FLAGS_RET(VIR_DOMAIN_GET_HOSTNAME_LEASE, + VIR_DOMAIN_GET_HOSTNAME_AGENT, + NULL); + + if (!(flags & VIR_DOMAIN_GET_HOSTNAME_AGENT)) + flags |= VIR_DOMAIN_GET_HOSTNAME_LEASE; + + if (!(vm = bhyveDomObjFromDomain(domain))) + return NULL; + + if (virDomainGetHostnameEnsureACL(domain->conn, vm->def) < 0) + goto cleanup; + + if (flags & VIR_DOMAIN_GET_HOSTNAME_AGENT) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("getting hostname from agent is not supported")); + goto cleanup; + } else if (flags & VIR_DOMAIN_GET_HOSTNAME_LEASE) { + if (bhyveDomainGetHostnameLease(vm, &hostname) < 0) + goto cleanup; + } + + if (!hostname) { + virReportError(VIR_ERR_NO_HOSTNAME, + _("no hostname found for domain %1$s"), + vm->def->name); + goto cleanup; + } + + cleanup: + virDomainObjEndAPI(&vm); + return hostname; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectURIProbe = bhyveConnectURIProbe, @@ -1912,6 +2059,8 @@ static virHypervisorDriver bhyveHypervisorDriver = { .domainGetVcpusFlags = bhyveDomainGetVcpusFlags, /* 12.1.0 */ .domainGetMaxVcpus = bhyveDomainGetMaxVcpus, /* 12.1.0 */ .domainGetVcpuPinInfo = bhyveDomainGetVcpuPinInfo, /* 12.1.0 */ + .domainInterfaceAddresses = bhyveDomainInterfaceAddresses, /* 12.3.0 */ + .domainGetHostname = bhyveDomainGetHostname, /* 12.3.0 */ }; -- 2.52.0

2 5

[PATCH 0/2] Fix memory leaks
by Pavel Hrdina 14 Apr '26

14 Apr '26

Pavel Hrdina (2): virNetworkIPDefFormat: Fix memory leaks chSocketRecv: Fix memory leak src/ch/ch_process.c | 2 +- src/conf/network_conf.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) -- 2.53.0

3 5

[PATCH-for-11.0?] target/i386: Mandate monitor 'info lapic' take a vCPU ID argument
by Philippe Mathieu-Daudé 14 Apr '26

14 Apr '26

With SMP configurations, using the 'current vCPU' under the monitor isn't recommended, as it changes during runtime. Better to specify which vCPU we want to monitor by its index. Deprecate the default of 'info lapic', mentioning an argument is expected, so we can remove this unpredictable behavior one day. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- The other command with this unpredictable behavior is 'info tlb' which we'll deal with differently, after the v11.0 release. --- docs/about/deprecated.rst | 6 ++++++ target/i386/cpu-apic.c | 2 ++ hmp-commands-info.hx | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index a6d6a713265..a62da93259a 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -169,6 +169,12 @@ The ``stopcapture`` command is deprecated and will be removed in a future releas The ``info capture`` command is deprecated and will be removed in a future release. +``info lapic`` without ``apic-id`` argument (since 11.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +When no APIC ID is provided, ``info lapic`` defaults to the current vCPU. +This behavior is now deprecated, the ID will be mandatory in a future release. + Host Architectures ------------------ diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index eaa10ad2a3d..9ca569f62b8 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -97,6 +97,8 @@ void hmp_info_local_apic(Monitor *mon, const QDict *qdict) cpu_synchronize_state(cs); } } else { + monitor_printf(mon, "Not specifying the local apic id is deprecated" + " (using the current CPU one)\n"); cs = mon_get_cpu(mon); } diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 74c741f80e2..e4206d329fc 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -118,8 +118,7 @@ ERST .name = "lapic", .args_type = "apic-id:i?", .params = "[apic-id]", - .help = "show local apic state (apic-id: local apic to read, default is which of current CPU)", - + .help = "show local apic state (apic-id: local apic to read)", .cmd = hmp_info_local_apic, }, #endif -- 2.53.0

3 3

[PATCH v2 0/2] virnetdevmacvlan: Wait for udev to settle after creating macvtap
by Michal Privoznik 13 Apr '26

13 Apr '26

This is a v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/YRT3… diff to v1: - Dropped all virWaitForDevices() but the one in virNetDevMacVLanCreate() which is also made conditional Michal Prívozník (2): virnetdevmacvlan: Wait for udev to settle after creating macvtap virnetdevmacvlan: Drop udev busy loop from virNetDevMacVLanTapOpen() src/util/virnetdevmacvlan.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) -- 2.52.0

2 3