- Devel - libvirt List Archives

[PATCH] ch: Avoid memleak in virCHDriverConfigDispose()
by Michal Privoznik 10 Sep '25

10 Sep '25

From: Michal Privoznik <mprivozn(a)redhat.com> When virCHDriverConfig struct is initialized in virCHDriverConfigNew() the 'configDir' member is allocated but corresponding free is missing in virCHDriverConfigDispose(). While at it, reorder the free calls to match the order in which they are declared in the struct so it's easier to spot missing free call. 20 bytes in 1 blocks are definitely lost in loss record 667 of 2,033 at 0x4912888: malloc (vg_replace_malloc.c:446) by 0x5436747: __vasprintf_internal (in /usr/lib64/libc.so.6) by 0x503EC81: g_vasprintf (in /usr/lib64/libglib-2.0.so.0.8400.3) by 0x500805B: g_strdup_vprintf (in /usr/lib64/libglib-2.0.so.0.8400.3) by 0x5008124: g_strdup_printf (in /usr/lib64/libglib-2.0.so.0.8400.3) by 0xB8C2B70: virCHDriverConfigNew (ch_conf.c:181) by 0xB8C9DDA: chStateInitialize (ch_driver.c:1456) by 0x4D9E316: virStateInitialize (libvirt.c:667) by 0x40539DB: daemonRunStateInit (remote_daemon.c:581) by 0x4AC1EB4: virThreadHelper (virthread.c:256) by 0x5441DE3: start_thread (in /usr/lib64/libc.so.6) by 0x54C25F3: clone (in /usr/lib64/libc.so.6) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/ch/ch_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index b9432e2a42..8a542eef19 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -211,9 +211,10 @@ virCHDriverConfigDispose(void *obj) { virCHDriverConfig *cfg = obj; - g_free(cfg->saveDir); g_free(cfg->stateDir); + g_free(cfg->configDir); g_free(cfg->logDir); + g_free(cfg->saveDir); } #define MIN_VERSION ((15 * 1000000) + (0 * 1000) + (0)) -- 2.49.1

2 1

[PATCH 0/4] ch: Improve domain destroy
by Michal Privoznik 10 Sep '25

10 Sep '25

*** BLURB HERE *** Michal Prívozník (4): virprocess: Report errno if virProcessAbort() fails ch: Make sure the cloud-hypervisor process is killed in virCHProcessStop() ch: Introduce flags to virCHProcessStop() ch: Implement VIR_DOMAIN_DESTROY_GRACEFUL flag support src/ch/ch_driver.c | 13 ++++++++++--- src/ch/ch_events.c | 2 +- src/ch/ch_process.c | 22 ++++++++++++++++------ src/ch/ch_process.h | 8 +++++++- src/util/virprocess.c | 3 ++- 5 files changed, 36 insertions(+), 12 deletions(-) -- 2.49.1

2 5

[PATCH v3 00/13] CH: Add disk hotplug support to Cloud Hypervisor domains
by Stefan Kober 09 Sep '25

09 Sep '25

This patchset adds the necessary functionality to support disk hotplugging in the CH driver. Some alias handling that can be extended to other device types is added, in order to allow detaching the devices via the Cloud Hypervisor API. Stefan Kober (13): ch: add ch_hotplug.{h,c} files to CH build ch: pass disk alias to CHV ch: add ch_alias.{c,h} for device alias handling ch: refactor virCHMonitorBuildDiskJson ch: add/use virCHMonitorPut function ch: add monitor disk attach logic ch: add disk attach helper functions ch: implement disk attach in public API ch: assign aliases in ProcessPrepareDomain ch: add virCHMonitorBuildKeyValueJson ch: add virCHMonitorRemoveDevice function ch: implement disk device detach in public API NEWS: announce disk hotplug support for ch NEWS.rst | 5 + po/POTFILES | 2 + src/ch/ch_alias.c | 62 +++++++++ src/ch/ch_alias.h | 27 ++++ src/ch/ch_driver.c | 86 ++++++++++++ src/ch/ch_hotplug.c | 333 ++++++++++++++++++++++++++++++++++++++++++++ src/ch/ch_hotplug.h | 33 +++++ src/ch/ch_monitor.c | 131 ++++++++++++++--- src/ch/ch_monitor.h | 7 + src/ch/ch_process.c | 4 + src/ch/meson.build | 4 + 11 files changed, 671 insertions(+), 23 deletions(-) create mode 100644 src/ch/ch_alias.c create mode 100644 src/ch/ch_alias.h create mode 100644 src/ch/ch_hotplug.c create mode 100644 src/ch/ch_hotplug.h -- 2.50.1

3 24

[PATCH] conf: clear the acpiNodeset field after freeing
by Daniel P. Berrangé 09 Sep '25

09 Sep '25

From: Daniel P. Berrangé <berrange(a)redhat.com> The virDomainDeviceInfoClear method does not free the struct, only its contents, so all pointer fields must be explicitly set to NULL after releasing to avoid disk of double-free. Reported by coverity: *** CID 895678: Memory - corruptions (USE_AFTER_FREE) /src/conf/domain_conf.c: 5926 in virDomainDeviceInfoParseXML() 5920 goto cleanup; 5921 5922 5923 ret = 0; 5924 cleanup: 5925 if (ret < 0) >>> CID 895678: Memory - corruptions (USE_AFTER_FREE) >>> Calling "virDomainDeviceInfoClear" frees pointer "info->acpiNodeset" which has already been freed. 5926 virDomainDeviceInfoClear(info); 5927 return ret; 5928 } 5929 5930 static int 5931 virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/device_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index d08de68717..3fa7bba649 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -138,6 +138,7 @@ virDomainDeviceInfoClear(virDomainDeviceInfo *info) VIR_FREE(info->romfile); VIR_FREE(info->loadparm); virBitmapFree(info->acpiNodeset); + info->acpiNodeset = NUll; info->isolationGroup = 0; info->isolationGroupLocked = false; } -- 2.50.1

2 2

[PATCH v6 0/8] qemu: acpi-generic-initiator support
by Andrea Righi 08 Sep '25

08 Sep '25

= Overview = This patch set introduces support for acpi-generic-initiator devices, supported by QEMU [1]. The acpi-generic-initiator object is required to support Multi-Instance GPU (MIG) configurations on NVIDIA GPUs [2]. MIG enables partitioning of GPU resources into multiple isolated instances, each requiring a dedicated virtual NUMA node definition. = Implementation = This patch set implements the libvirt counterpart to the new QEMU feature, enabling users to configure acpi-generic-initiator objects within libvirt domain XML in an abstracted way, used to configure the GPU partitioning. This includes: - adding a "nodeset" attribute to the <acpi> object to assign the list of virtual NUMA nodes to a PCI device, - resolving the nodeset definitions into the proper QEMU command-line arguments, - ensuring compatibility with existing PCI and NUMA configuration. = Example = - Domain XML: ``` ... <cpu mode='host-passthrough' check='none'> <numa> <cell id='0' cpus='0-15' memory='8388608' unit='KiB'/> <cell id='1' memory='0' unit='KiB'/> <cell id='2' memory='0' unit='KiB'/> <cell id='3' memory='0' unit='KiB'/> <cell id='4' memory='0' unit='KiB'/> <cell id='5' memory='0' unit='KiB'/> <cell id='6' memory='0' unit='KiB'/> <cell id='7' memory='0' unit='KiB'/> <cell id='8' memory='0' unit='KiB'/> </numa> </cpu> ... <devices> ... <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> <acpi nodeset='1-8'/> </hostdev> </devices> ``` - Generated QEMU command line options: ``` ... /usr/bin/qemu-system-aarch64 \ ... -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":8589934592}' \ -numa node,nodeid=0,cpus=0-15,memdev=ram-node0 \ -numa node,nodeid=1 \ -numa node,nodeid=2 \ -numa node,nodeid=3 \ -numa node,nodeid=4 \ -numa node,nodeid=5 \ -numa node,nodeid=6 \ -numa node,nodeid=7 \ -numa node,nodeid=8 \ ... -device '{"driver":"vfio-pci","host":"0009:01:00.0","id":"hostdev0","bus":"pci.3","addr":"0x0"}' -object acpi-generic-initiator,id=gi0,pci-dev=hostdev0,node=1 \ -object acpi-generic-initiator,id=gi1,pci-dev=hostdev0,node=2 \ -object acpi-generic-initiator,id=gi2,pci-dev=hostdev0,node=3 \ -object acpi-generic-initiator,id=gi3,pci-dev=hostdev0,node=4 \ -object acpi-generic-initiator,id=gi4,pci-dev=hostdev0,node=5 \ -object acpi-generic-initiator,id=gi5,pci-dev=hostdev0,node=6 \ -object acpi-generic-initiator,id=gi6,pci-dev=hostdev0,node=7 \ -object acpi-generic-initiator,id=gi7,pci-dev=hostdev0,node=8 ``` = References = [1] https://lore.kernel.org/all/20231225045603.7654-2-ankita@nvidia.com/ [2] https://www.nvidia.com/en-in/technologies/multi-instance-gpu/ ChangeLog v5 -> v6: - Add a "nodeset" attribute to <acpi>, instead of introducing a new <acpi-generic-initiator> object (suggested by Daniel) - Rebase to v11.7.0 ChangeLog v4 -> v5: - Integrate suggestions and changes from Michal's review - Update qemu capabilities - Rebase to v11.6.0 ChangeLog v3 -> v4: - add acpi-generic-initiator documentation - refactor virDomainAcpiInitiatorDef to use info->alias and drop the name attribute - auto-generate alias for the acpi-generic-initiator devices via qemuAssignDeviceAliases() - use g_autoptr() when possible - add a new entry to NEWS.rst ChangeLog v2 -> v3: - replaced <text/> with proper types in the XML schema - avoid mixing g_free() and VIR_FREE() - use virXMLPropString() instead of looping all XML nodes - report proper errors with virReportError() - use virBufferEscapeString() to process strings passed by the user - fix broken formatting of function headers - misc coding style fixes ChangeLog v1 -> v2: - split parser and driver changes in separate patches - introduce a new qemu capability flag - introduce test in qemuxmlconftest Andrea Righi (8): qemu: capabilies: Introduce QEMU_CAPS_ACPI_GENERIC_INITIATOR qemu: Allow to define NUMA nodes without memory or CPUs assigned conf: Add nodeset attribute to the <acpi> element qemu: Validate acpi nodeset qemu: Generate acpi-generic-initiator command from acpi nodeset qemu: Add acpi-generic-initiator unit test docs: Document acpi nodeset in hostdev NEWS: Mention new acpi-generic-initiator support NEWS.rst | 10 ++++ docs/formatdomain.rst | 49 +++++++++++++++++ src/conf/device_conf.h | 3 + src/conf/domain_conf.c | 30 +++++++++- src/conf/numa_conf.c | 3 + src/conf/schemas/domaincommon.rng | 5 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 64 +++++++++++++++++++--- src/qemu/qemu_validate.c | 8 +++ tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml | 1 + .../caps_10.0.0_x86_64+amdsev.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 + .../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_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_x86_64.xml | 1 + .../caps_9.2.0_aarch64+hvf.xml | 1 + .../caps_9.2.0_x86_64+amdsev.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 + .../acpi-generic-initiator.x86_64-latest.args | 55 +++++++++++++++++++ .../acpi-generic-initiator.x86_64-latest.xml | 63 +++++++++++++++++++++ tests/qemuxmlconfdata/acpi-generic-initiator.xml | 63 +++++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 26 files changed, 360 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/acpi-generic-initiator.xml

2 22

[PATCH 0/1] x86: install modules-load.d file to load msr module
by Hector Cao 08 Sep '25

08 Sep '25

This submission is a follow-up of the discussion (RFC) that was happening at: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/ADJ4… On x86, libvirt makes use of the API exposed by the msr kernel module to read the MSR (Model Specific Registers) values. On some Linux distros, this module is not loaded by default so libvirt might fail to read the MSR values and falls back to /dev/kvm to obtain these values. KVM might be behind in term of exposing all the values of the MSRs so using /dev/kvm is not ideal. This submission tries to make libvirt deploy the modules-load.d configuration so that linux loads the msr module at next boot. One caveat, libvirt installs only the file and does not trigger the load that is only done at next reboot, it is up to each distro to trigger immediately the load of the module without a reboot. Hector Cao (1): x86: install modules-load.d file to load msr module meson_options.txt | 1 + src/util/meson.build | 17 +++++++++++++++++ src/util/modules-load.d/msr.conf | 1 + tools/virt-host-validate-qemu.c | 7 +++++++ 4 files changed, 26 insertions(+) create mode 100644 src/util/modules-load.d/msr.conf -- 2.45.2

2 6

[PATCH v3 3/3] docs: formatdomain: add doc for riscv-aia feature
by BillXiang 08 Sep '25

08 Sep '25

From: xiangwencheng <xiangwencheng(a)lanxincomputing.com> Signed-off-by: BillXiang <xiangwencheng(a)lanxincomputing.com> --- docs/formatdomain.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 9f7311b6d5..a694eeb140 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2085,6 +2085,7 @@ Hypervisors may allow certain CPU / machine features to be toggled on/off. <poll-control state='on'/> <pv-ipi state='off'/> <dirty-ring state='on' size='4096'/> + <riscv-aia state='on' mode='auto'/> </kvm> <xen> <e820_host state='on'/> @@ -2206,6 +2207,7 @@ are: poll-control Decrease IO completion latency by introducing a grace period of busy waiting on, off :since:`6.10.0 (QEMU 4.2)` pv-ipi Paravirtualized send IPIs on, off :since:`7.10.0 (QEMU 3.1)` dirty-ring Enable dirty ring feature on, off; size - must be power of 2, range [1024,65536] :since:`8.0.0 (QEMU 6.1)` + riscv-aia Set riscv KVM AIA mode. Defaults to 'auto'. on, off; mode - optional string emul, hwaccel or auto :since:`11.8.0 (QEMU 8.2)` ============== ============================================================================ ====================================================== ============================ ``xen`` -- 2.34.1

2 1

[PATCH v3 2/3] NEWS: ch: announce riscv-aia feature for RISC-V KVM
by BillXiang 08 Sep '25

08 Sep '25

From: xiangwencheng <xiangwencheng(a)lanxincomputing.com> Signed-off-by: BillXiang <xiangwencheng(a)lanxincomputing.com> --- NEWS.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 9577be0213..14505b9109 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,16 @@ v11.8.0 (unreleased) * **New features** + * Support riscv-aia feature for RISC-V KVM + + riscv-aia feature was introduced in qemu-8.2 to specify the + KVM AIA mode. The "riscv-aia" parameter is passed along with + --accel in QEMU command-line. + 1) "riscv-aia=emul": IMSIC is emulated by hypervisor + 2) "riscv-aia=hwaccel": use hardware guest IMSIC + 3) "riscv-aia=auto": use the hardware guest IMSICs whenever available + otherwise we fallback to software emulation. + * **Improvements** * **Bug fixes** -- 2.34.1

2 1

[PATCH v3 1/3] qemu: support riscv-aia feature for RISC-V KVM
by BillXiang 08 Sep '25

08 Sep '25

From: xiangwencheng <xiangwencheng(a)lanxincomputing.com> riscv-aia feature was introduced in qemu-8.2 to specify the KVM AIA mode. The "riscv-aia" parameter is passed along with -accel in QEMU command-line. 1) "riscv-aia=emul": IMSIC is emulated by hypervisor 2) "riscv-aia=hwaccel": use hardware guest IMSIC 3) "riscv-aia=auto": use the hardware guest IMSICs whenever available otherwise we fallback to software emulation. This patch add the corresponding feature named 'riscv-aia'. Signed-off-by: BillXiang <xiangwencheng(a)lanxincomputing.com> --- src/conf/domain_conf.c | 28 +++++++++++++++++++++++++++- src/conf/domain_conf.h | 11 +++++++++++ src/conf/schemas/domaincommon.rng | 12 ++++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_command.c | 13 ++++++++++--- 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7766e302ec..a9f1161133 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -224,6 +224,14 @@ VIR_ENUM_IMPL(virDomainKVM, "poll-control", "pv-ipi", "dirty-ring", + "riscv-aia", +); + +VIR_ENUM_IMPL(virDomainKVMRiscvAIAMode, + VIR_DOMAIN_KVM_TISCV_AIA_MODE_LAST, + "auto", + "emul", + "hwaccel", ); VIR_ENUM_IMPL(virDomainXen, @@ -17183,6 +17191,15 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, return -1; } } + + if (feature == VIR_DOMAIN_KVM_RISCV_AIA && + value == VIR_TRISTATE_SWITCH_ON) { + if (virXMLPropEnum(feat, "mode", + virDomainKVMRiscvAIAModeTypeFromString, + VIR_XML_PROP_REQUIRED, + &def->kvm_features->kvm_riscv_aia_mode) < 0) + return -1; + } } def->features[VIR_DOMAIN_FEATURE_KVM] = VIR_TRISTATE_SWITCH_ON; @@ -21697,6 +21714,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_KVM_POLLCONTROL: case VIR_DOMAIN_KVM_PVIPI: case VIR_DOMAIN_KVM_DIRTY_RING: + case VIR_DOMAIN_KVM_RISCV_AIA: if (src->kvm_features->features[i] != dst->kvm_features->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of KVM feature '%1$s' differs: source: '%2$s', destination: '%3$s'"), @@ -28752,7 +28770,15 @@ virDomainDefFormatFeatures(virBuffer *buf, } } break; - + case VIR_DOMAIN_KVM_RISCV_AIA: + if (def->kvm_features->features[j] != VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&childBuf, "<%s state='%s'", + virDomainKVMTypeToString(j), + virTristateSwitchTypeToString(def->kvm_features->features[j])); + virBufferAsprintf(&childBuf, " mode='%s'/>\n", + virDomainKVMRiscvAIAModeTypeToString(def->kvm_features->kvm_riscv_aia_mode)); + } + break; case VIR_DOMAIN_KVM_LAST: break; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index eca820892e..0250b3db49 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2270,10 +2270,20 @@ typedef enum { VIR_DOMAIN_KVM_POLLCONTROL, VIR_DOMAIN_KVM_PVIPI, VIR_DOMAIN_KVM_DIRTY_RING, + VIR_DOMAIN_KVM_RISCV_AIA, VIR_DOMAIN_KVM_LAST } virDomainKVM; +typedef enum { + VIR_DOMAIN_KVM_TISCV_AIA_MODE_AUTO = 0, + VIR_DOMAIN_KVM_TISCV_AIA_MODE_EMUL, + VIR_DOMAIN_KVM_TISCV_AIA_MODE_HWACCEL, + + VIR_DOMAIN_KVM_TISCV_AIA_MODE_LAST +} virDomainKVMRiscvAIAMode; +VIR_ENUM_DECL(virDomainKVMRiscvAIAMode); + typedef enum { VIR_DOMAIN_MSRS_UNKNOWN = 0, @@ -2476,6 +2486,7 @@ struct _virDomainFeatureKVM { int features[VIR_DOMAIN_KVM_LAST]; unsigned int dirty_ring_size; /* size of dirty ring for each vCPU, no units */ + virDomainKVMRiscvAIAMode kvm_riscv_aia_mode; }; typedef struct _virDomainFeatureTCG virDomainFeatureTCG; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index e369fb6e81..02771a6b7b 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -8192,6 +8192,18 @@ </optional> </element> </optional> + <optional> + <element name="riscv-aia"> + <ref name="featurestate"/> + <optional> + <attribute name="mode"> + <data type="string"> + <param name="pattern">(auto|emul|hwaccel)</param> + </data> + </attribute> + </optional> + </element> + </optional> </interleave> </element> </define> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b846011f0f..f540bdbd5b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -501,6 +501,8 @@ virDomainIOThreadIDDel; virDomainIOThreadIDFind; virDomainKeyWrapCipherNameTypeFromString; virDomainKeyWrapCipherNameTypeToString; +virDomainKVMRiscvAIAModeTypeFromString; +virDomainKVMRiscvAIAModeTypeToString; virDomainLaunchSecurityTypeFromString; virDomainLaunchSecurityTypeToString; virDomainLeaseDefFree; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e8de386f30..9f34b5a37d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6679,6 +6679,9 @@ qemuBuildCpuCommandLine(virCommand *cmd, case VIR_DOMAIN_KVM_DIRTY_RING: break; + + case VIR_DOMAIN_KVM_RISCV_AIA: + break; case VIR_DOMAIN_KVM_LAST: break; @@ -7314,9 +7317,13 @@ qemuBuildAccelCommandLine(virCommand *cmd, * not that either kvm or tcg can be specified by libvirt * so do not worry about the conflict of specifying both * */ - if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON && - def->kvm_features->features[VIR_DOMAIN_KVM_DIRTY_RING] == VIR_TRISTATE_SWITCH_ON) { - virBufferAsprintf(&buf, ",dirty-ring-size=%d", def->kvm_features->dirty_ring_size); + if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { + if (def->kvm_features->features[VIR_DOMAIN_KVM_DIRTY_RING] == VIR_TRISTATE_SWITCH_ON) { + virBufferAsprintf(&buf, ",dirty-ring-size=%d", def->kvm_features->dirty_ring_size); + } + if (def->kvm_features->features[VIR_DOMAIN_KVM_RISCV_AIA] == VIR_TRISTATE_SWITCH_ON) { + virBufferAsprintf(&buf, ",riscv-aia=%s", virDomainKVMRiscvAIAModeTypeToString(def->kvm_features->kvm_riscv_aia_mode)); + } } break; -- 2.34.1

2 1

[libvirt PATCH] esx: pass 'long' to curl_easy_setopt when needed
by Ján Tomko 08 Sep '25

08 Sep '25

From: Ján Tomko <jtomko(a)redhat.com> The include header got its type checks fixed in curl 8.14: https://github.com/curl/curl/commit/79b4e56b3f30dc1ac28a81128a07d27338e5219e https://github.com/curl/curl/pull/17143 This causes a warning on rawhide with clang: ../src/esx/esx_vi.c:318:5: error: call to '_curl_easy_setopt_err_long' declared with 'warning' attribute: curl_easy_setopt expects a long argument [-Werror,-Wattribute-warning] 318 | curl_easy_setopt(curl->handle, CURLOPT_NOSIGNAL, 1); | ^ Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/esx/esx_stream.c | 6 +++--- src/esx/esx_vi.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index 1439940330..143b2405ed 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -405,13 +405,13 @@ esxStreamOpen(virStreamPtr stream, esxPrivate *priv, const char *url, goto cleanup; if (mode == ESX_STREAM_MODE_UPLOAD) { - curl_easy_setopt(streamPriv->curl->handle, CURLOPT_UPLOAD, 1); + curl_easy_setopt(streamPriv->curl->handle, CURLOPT_UPLOAD, 1L); curl_easy_setopt(streamPriv->curl->handle, CURLOPT_READFUNCTION, esxVI_CURL_ReadStream); curl_easy_setopt(streamPriv->curl->handle, CURLOPT_READDATA, streamPriv); } else { - curl_easy_setopt(streamPriv->curl->handle, CURLOPT_UPLOAD, 0); - curl_easy_setopt(streamPriv->curl->handle, CURLOPT_HTTPGET, 1); + curl_easy_setopt(streamPriv->curl->handle, CURLOPT_UPLOAD, 0L); + curl_easy_setopt(streamPriv->curl->handle, CURLOPT_HTTPGET, 1L); curl_easy_setopt(streamPriv->curl->handle, CURLOPT_WRITEFUNCTION, esxVI_CURL_WriteStream); curl_easy_setopt(streamPriv->curl->handle, CURLOPT_WRITEDATA, streamPriv); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index d25f819bc5..3264afc13a 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -315,13 +315,13 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) } curl_easy_setopt(curl->handle, CURLOPT_USERAGENT, "libvirt-esx"); - curl_easy_setopt(curl->handle, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl->handle, CURLOPT_HEADER, 0); - curl_easy_setopt(curl->handle, CURLOPT_FOLLOWLOCATION, 0); + curl_easy_setopt(curl->handle, CURLOPT_NOSIGNAL, 1L); + curl_easy_setopt(curl->handle, CURLOPT_HEADER, 0L); + curl_easy_setopt(curl->handle, CURLOPT_FOLLOWLOCATION, 0L); curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYPEER, - parsedUri->noVerify ? 0 : 1); + parsedUri->noVerify ? 0L : 1L); curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYHOST, - parsedUri->noVerify ? 0 : 2); + parsedUri->noVerify ? 0L : 2L); curl_easy_setopt(curl->handle, CURLOPT_COOKIEFILE, ""); curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->headers); curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, @@ -331,16 +331,16 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) curl_easy_setopt(curl->handle, CURLOPT_ERRORBUFFER, curl->error); #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT curl_easy_setopt(curl->handle, CURLOPT_DEBUGFUNCTION, esxVI_CURL_Debug); - curl_easy_setopt(curl->handle, CURLOPT_VERBOSE, 1); + curl_easy_setopt(curl->handle, CURLOPT_VERBOSE, 1L); #endif if (parsedUri->proxy) { curl_easy_setopt(curl->handle, CURLOPT_PROXY, parsedUri->proxy_hostname); curl_easy_setopt(curl->handle, CURLOPT_PROXYTYPE, - parsedUri->proxy_type); + (long) parsedUri->proxy_type); curl_easy_setopt(curl->handle, CURLOPT_PROXYPORT, - parsedUri->proxy_port); + (long) parsedUri->proxy_port); } if (parsedUri->cacert) @@ -386,8 +386,8 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, curl_easy_setopt(curl->handle, CURLOPT_URL, url); curl_easy_setopt(curl->handle, CURLOPT_RANGE, range); curl_easy_setopt(curl->handle, CURLOPT_WRITEDATA, &buffer); - curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 0); - curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1); + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 0L); + curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1L); responseCode = esxVI_CURL_Perform(curl, url); } @@ -426,7 +426,7 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) curl_easy_setopt(curl->handle, CURLOPT_URL, url); curl_easy_setopt(curl->handle, CURLOPT_RANGE, NULL); curl_easy_setopt(curl->handle, CURLOPT_READDATA, &content); - curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1); + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1L); curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, strlen(content)); responseCode = esxVI_CURL_Perform(curl, url); @@ -1223,7 +1223,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, curl_easy_setopt(ctx->curl->handle, CURLOPT_URL, ctx->url); curl_easy_setopt(ctx->curl->handle, CURLOPT_RANGE, NULL); curl_easy_setopt(ctx->curl->handle, CURLOPT_WRITEDATA, &buffer); - curl_easy_setopt(ctx->curl->handle, CURLOPT_UPLOAD, 0); + curl_easy_setopt(ctx->curl->handle, CURLOPT_UPLOAD, 0L); curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDS, request); curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDSIZE, strlen(request)); -- 2.50.1

2 1