- Devel - libvirt List Archives

[libvirt PATCH] spec: Use consistent versioning for Obsoletes
by Jiri Denemark 27 Sep '22

27 Sep '22

rpmbuild is complaining it's not recommended to have unversioned Obsoletes. On the other hand using dynamic version/release is a bit too much as we know in which release a particular subpackage was removed. Let's just use the corresponding version in both cases to be consistent with all other Obsoletes in our spec file. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 654057bf57..f7d3931b6e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -574,9 +574,9 @@ Requires: util-linux Requires: /usr/bin/qemu-img %endif %if !%{with_storage_rbd} -Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release} +Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 %endif -Obsoletes: libvirt-daemon-driver-storage-sheepdog +Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing -- 2.37.3

2 1

[libvirt PATCH 0/2] add systemd-rpm-macros build dependency
by Pavel Hrdina 26 Sep '22

26 Sep '22

Pavel Hrdina (2): spec: add systemd-rpm-macros build dependency ci: refresh generated files ci/containers/almalinux-8.Dockerfile | 1 + ci/containers/centos-stream-8.Dockerfile | 1 + ci/containers/centos-stream-9.Dockerfile | 1 + ci/containers/fedora-35.Dockerfile | 1 + ci/containers/fedora-36-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-36-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-36.Dockerfile | 1 + ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-rawhide.Dockerfile | 1 + ci/containers/opensuse-leap-153.Dockerfile | 1 + ci/containers/opensuse-tumbleweed.Dockerfile | 1 + libvirt.spec.in | 1 + 13 files changed, 17 insertions(+), 4 deletions(-) -- 2.37.3

2 3

[PATCH 00/37] conf: Refactor virDomainNetDefParseXML
by Peter Krempa 26 Sep '22

26 Sep '22

After the partial refactor in fdd06824e3a618ca33752e0439bbd5b2d9da1b0d the function was left in a halfway state between the old parser style and new one. Try to improve it a bit, although the result is still not ideal. Peter Krempa (37): conf: domain: Register automatic pointer freeing for virDomainActualNetDef conf: domain: Automatically free 'def' and 'actual' in virDomainNetDefParseXML conf: domain: Remove 'error' label in virDomainNetDefParseXML virDomainNetDefParseXML: Remove unnecessary temporary variables virDomainNetDefParseXML: Separate and localize parsing of 'backend/@vhost' virDomainNetDefParseXML: Split out parsing of 'driver' subelement virDomainNetDefParseXML: Use virXMLPropEnumDefault for parsing 'def->type' virDomainNetIPInfoParseXML: Remove pointless automatic clearing of 'route' and 'ip' virDomainNetIPInfoParseXML: Don't VIR_FREE and overwrite autofreed 'nodes' virDomainNetIPInfoParseXML: Simplify cleanup virDomainNetIPInfoParseXML: Don't force callers to set proper 'ctxt->node' util: xml: Introduce virXMLPropUUID util: xml: Adjust documentation of virXMLPropString util: xml: Introduce virXMLPropStringRequired virDomainNetDefParseXML: Convert parsing of 'source_node' to a switch() statement virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_NETWORK util: xml: Introduce virXMLPropLongLong virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_VDS virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_INTERNAL virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_BRIDGE conf: domain: Convert 'mode' field of the 'direct' type of virDomainNetDef to proper type virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_DIRECT virDomainNetDefParseXML: Extract network device model earlier conf: domain: Move 'virDomainChrSourceReconnectDefParseXML' virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_VHOSTUSER virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_VDPA util: xml: Introduce VIR_XPATH_NODE_AUTORESTORE_NAME virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_UDP/MCAST/SERVER/CLIENT virDomainNetDefParseXML: Refactor parsing of data for VIR_DOMAIN_NET_TYPE_HOSTDEV conf: domain: Move prue validation code from virDomainNetDefParseXML to virDomainNetDefValidate virDomainNetDefParseXML: Refactor parsing of <virtualport> virDomainNetDef: Use virTristateBool for 'managed_tap' instead of int virDomainNetDefParseXML: Refactor parsing of <target> subelement virDomainNetDefParseXML: Refactor parsing of <filterref> virDomainNetDefParseXML: Don't overload 'node' variable when parsing <coalesce> virDomainNetDefParseXML: Parse attributes of <mac> only when present virDomainNetDefParseXML: Drop prehistoric error workaround src/conf/domain_conf.c | 1118 +++++++++++++++--------------------- src/conf/domain_conf.h | 5 +- src/conf/domain_validate.c | 34 ++ src/libvirt_private.syms | 3 + src/util/virxml.c | 139 ++++- src/util/virxml.h | 39 +- 6 files changed, 683 insertions(+), 655 deletions(-) -- 2.37.1

3 76

[PATCH] qemu_monitor_json: remove unnecessary variable 'rc'
by Kristina Hanicova 26 Sep '22

26 Sep '22

Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 70fba50e6c..5f7c1a8db9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8611,11 +8611,8 @@ qemuMonitorJSONQueryStats(qemuMonitor *mon, qemuMonitorQueryStatsProvider *provider = providers->pdata[i]; const char *type_str = qemuMonitorQueryStatsProviderTypeToString(provider->type); virBitmap *names = provider->names; - int rc; - rc = virJSONValueObjectAppendString(provider_obj, "provider", type_str); - - if (rc < 0) + if (virJSONValueObjectAppendString(provider_obj, "provider", type_str) < 0) return NULL; if (!virBitmapIsAllClear(names)) { @@ -8629,9 +8626,7 @@ qemuMonitorJSONQueryStats(qemuMonitor *mon, return NULL; } - rc = virJSONValueObjectAppend(provider_obj, "names", &provider_names); - - if (rc < 0) + if (virJSONValueObjectAppend(provider_obj, "names", &provider_names) < 0) return NULL; } -- 2.37.2

3 2

[PATCH 0/2] RFC: Allow using custom XML validator
by Peter Krempa 26 Sep '22

26 Sep '22

Benefits described in patch 2/2 with an example of using 'jing' as validator. Peter Krempa (2): util: xml: Introduce infrastructure to support custom XML validators daemon: Introduce the possibility for users to register custom XML validator src/libvirt_private.syms | 1 + src/remote/libvirtd.aug.in | 1 + src/remote/libvirtd.conf.in | 21 +++++++ src/remote/remote_daemon.c | 3 + src/remote/remote_daemon_config.c | 4 ++ src/remote/remote_daemon_config.h | 2 + src/remote/test_libvirtd.aug.in | 1 + src/util/virxml.c | 93 ++++++++++++++++++++++++++++++- src/util/virxml.h | 3 + 9 files changed, 127 insertions(+), 2 deletions(-) -- 2.37.1

4 8

[PATCH 0/7] Fix two bugs in XML schema
by Peter Krempa 26 Sep '22

26 Sep '22

Patches 1/7 and 6/7 outline the individual bugs. Peter Krempa (7): schema: nodedev: Fix schema attribute value for the 'vport_ops' capability nodedevschematest: Add example file for a HBA with 'vport_ops' capability qemudomainsnapshotxml2xmltest: Allow regenerating into non-existing output file schemas: Extract overrides for the domain element from 'domain.rng' schemas: domaincommon: Extract contents of the 'domain' element definition schema: Add schema for '<inactiveDomain>' element used in the snapshot definition qemudomainsnapshotxml2xmltest: Add test case for a snapshot with 'inactiveDomain' element docs/formatnode.rst | 2 +- src/conf/schemas/domain.rng | 12 +- src/conf/schemas/domaincommon.rng | 150 ++++++++++-------- src/conf/schemas/domainoverrides.rng | 16 ++ src/conf/schemas/domainsnapshot.rng | 5 + src/conf/schemas/inactiveDomain.rng | 10 ++ src/conf/schemas/nodedev.rng | 2 +- tests/nodedevschemadata/hba_vport_ops.xml | 18 +++ tests/nodedevxml2xmlout/hba_vport_ops.xml | 18 +++ tests/nodedevxml2xmltest.c | 1 + .../memory-snapshot-inactivedomain.xml | 148 +++++++++++++++++ tests/qemudomainsnapshotxml2xmltest.c | 10 +- 12 files changed, 303 insertions(+), 89 deletions(-) create mode 100644 src/conf/schemas/domainoverrides.rng create mode 100644 src/conf/schemas/inactiveDomain.rng create mode 100644 tests/nodedevschemadata/hba_vport_ops.xml create mode 100644 tests/nodedevxml2xmlout/hba_vport_ops.xml create mode 100644 tests/qemudomainsnapshotxml2xmlout/memory-snapshot-inactivedomain.xml -- 2.37.1

4 13

[PATCH] libvirt-guests: Fix dependency ordering in service file
by Martin Kletzander 26 Sep '22

26 Sep '22

After some debugging and discussion with systemd team it turns out we are misusing the ordering in libvirt-guests.service. That happened because we want to support both monolithic and modular daemon setups and on top of that we also want to support socket activation and services without socket activation. Unfortunately this is impossible to express in the unit file because of how transactions are handled in systemd when dependencies are resolved and multiple actions (jobs) are queued. For explanation from Michal Sekletar see comment #7 in the BZ this patch is fixing: https://bugzilla.redhat.com/show_bug.cgi?id=1964855#c7 In order to support all the scenarios this patch also amends the manpages so that users that are changing the default can also read how to correct the dependency ordering in libvirt-guests unit file. Ideally we would also keep the existing configuration during upgrade, but due to our huge support matrix this seems hardly feasible as it could introduce even more problems. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/manpages/libvirtd.rst | 14 ++++++++++++++ docs/manpages/virtlxcd.rst | 14 ++++++++++++++ docs/manpages/virtqemud.rst | 14 ++++++++++++++ docs/manpages/virtvboxd.rst | 14 ++++++++++++++ docs/manpages/virtvzd.rst | 14 ++++++++++++++ docs/manpages/virtxend.rst | 14 ++++++++++++++ tools/libvirt-guests.service.in | 6 ------ 7 files changed, 84 insertions(+), 6 deletions(-) diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst index ee72f0838221..1347b9b21042 100644 --- a/docs/manpages/libvirtd.rst +++ b/docs/manpages/libvirtd.rst @@ -79,6 +79,20 @@ unit files must be masked: $ systemctl mask libvirtd.socket libvirtd-ro.socket \ libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``libvirtd.service`` and +not ``libvirtd.socket``: + +:: + + [Unit] + After=libvirtd.service + OPTIONS ======= diff --git a/docs/manpages/virtlxcd.rst b/docs/manpages/virtlxcd.rst index 2e9d8fd14bbb..aebc8adb5822 100644 --- a/docs/manpages/virtlxcd.rst +++ b/docs/manpages/virtlxcd.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtlxcd.socket virtlxcd-ro.socket \ virtlxcd-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtlxcd.service`` and +not ``virtlxcd.socket``: + +:: + + [Unit] + After=virtlxcd.service + OPTIONS ======= diff --git a/docs/manpages/virtqemud.rst b/docs/manpages/virtqemud.rst index ea8d6e3105db..fa9a6ce3755c 100644 --- a/docs/manpages/virtqemud.rst +++ b/docs/manpages/virtqemud.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtqemud.socket virtqemud-ro.socket \ virtqemud-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtqemud.service`` and +not ``virtqemud.socket``: + +:: + + [Unit] + After=virtqemud.service + OPTIONS ======= diff --git a/docs/manpages/virtvboxd.rst b/docs/manpages/virtvboxd.rst index d7339d99f22b..f90de3451d8d 100644 --- a/docs/manpages/virtvboxd.rst +++ b/docs/manpages/virtvboxd.rst @@ -58,6 +58,20 @@ unit files must be masked: $ systemctl mask virtvboxd.socket virtvboxd-ro.socket \ virtvboxd-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtvboxd.service`` and +not ``virtvboxd.socket``: + +:: + + [Unit] + After=virtvboxd.service + OPTIONS ======= diff --git a/docs/manpages/virtvzd.rst b/docs/manpages/virtvzd.rst index 42dfa263e450..970719aac1d5 100644 --- a/docs/manpages/virtvzd.rst +++ b/docs/manpages/virtvzd.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtvzd.socket virtvzd-ro.socket \ virtvzd-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtvzd.service`` and +not ``virtvzd.socket``: + +:: + + [Unit] + After=virtvzd.service + OPTIONS ======= diff --git a/docs/manpages/virtxend.rst b/docs/manpages/virtxend.rst index b08346b489d2..cf7685ecc0e6 100644 --- a/docs/manpages/virtxend.rst +++ b/docs/manpages/virtxend.rst @@ -60,6 +60,20 @@ unit files must be masked: $ systemctl mask virtxend.socket virtxend-ro.socket \ virtxend-admin.socket +If using libvirt-guests service then the ordering for that service needs to be +adapted so that it is ordered after the service unit instead of the socket unit. +Since dependencies and ordering cannot be changed with drop-in overrides, the +whole libvirt-guests unit file needs to be changed. In order to preserve such +change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to +``/etc/systemd/system/libvirt-guests.service`` and make the change there, +specifically make sure the ``After=`` ordering mentions ``virtxend.service`` and +not ``virtxend.socket``: + +:: + + [Unit] + After=virtxend.service + OPTIONS ======= diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 3cf647619612..1c569c320dfd 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -9,12 +9,6 @@ After=virtlxcd.socket After=virtvboxd.socket After=virtvzd.socket After=virtxend.socket -After=libvirtd.service -After=virtqemud.service -After=virtlxcd.service -After=virtvboxd.service -After=virtvzd.service -After=virtxend.service After=virt-guest-shutdown.target Documentation=man:libvirt-guests(8) Documentation=https://libvirt.org -- 2.37.2

2 2

[PATCH v2 RESEND] qemu: fix memory leak about virDomainEventTunableNew
by luzhipeng 26 Sep '22

26 Sep '22

From: lu zhipeng <luzhipeng(a)cestc.cn> For prevent memory leak and easier to use, So change virDomainEventTunableNew to get virTypedParameterPtr *params and set it = NULL. Signed-off-by: lu zhipeng <luzhipeng(a)cestc.cn> --- v1: https://patchew.org/Libvirt/20220922130038.1616-1-luzhipeng@cestc.cn/ src/conf/domain_event.c | 12 ++++++------ src/conf/domain_event.h | 4 ++-- src/qemu/qemu_driver.c | 22 ++++++++++------------ src/remote/remote_driver.c | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index ff8ea2c389..97d58c2521 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1495,7 +1495,7 @@ static virObjectEvent * virDomainEventTunableNew(int id, const char *name, unsigned char *uuid, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { virDomainEventTunable *ev; @@ -1508,19 +1508,19 @@ virDomainEventTunableNew(int id, id, name, uuid))) goto error; - ev->params = params; + ev->params = *params; ev->nparams = nparams; - + *params = NULL; return (virObjectEvent *)ev; error: - virTypedParamsFree(params, nparams); + virTypedParamsFree(*params, nparams); return NULL; } virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { return virDomainEventTunableNew(obj->def->id, @@ -1532,7 +1532,7 @@ virDomainEventTunableNewFromObj(virDomainObj *obj, virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { return virDomainEventTunableNew(dom->id, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 4a9f6b988b..f4016dc1e9 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -195,11 +195,11 @@ virDomainEventDeviceRemovalFailedNewFromDom(virDomainPtr dom, virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 94b70872d4..3db4592945 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4472,12 +4472,12 @@ qemuDomainPinVcpuLive(virDomainObj *vm, &eventMaxparams, paramField, str) < 0) goto cleanup; - event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); + event = virDomainEventTunableNewFromObj(vm, &eventParams, eventNparams); ret = 0; cleanup: virObjectEventStateQueue(driver->domainEventState, event); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -4681,7 +4681,7 @@ qemuDomainPinEmulator(virDomainPtr dom, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { @@ -4700,6 +4700,7 @@ qemuDomainPinEmulator(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -5078,7 +5079,7 @@ qemuDomainPinIOThread(virDomainPtr dom, &eventMaxparams, paramField, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { @@ -5106,6 +5107,7 @@ qemuDomainPinIOThread(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -9633,8 +9635,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } @@ -9654,8 +9655,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } #undef SCHED_RANGE_CHECK @@ -16159,8 +16159,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } } @@ -16202,8 +16201,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, VIR_FREE(info.group_name); VIR_FREE(conf_info.group_name); virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a4efe101a3..b0dba9057b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5078,7 +5078,7 @@ remoteDomainBuildEventCallbackTunable(virNetClientProgram *prog G_GNUC_UNUSED, return; } - event = virDomainEventTunableNewFromDom(dom, params, nparams); + event = virDomainEventTunableNewFromDom(dom, &params, nparams); virObjectUnref(dom); -- 2.31.1

2 1

[PATCH v2] Log alarms should be generated even if the QEMU process is not stopped
by 丁丽敏 26 Sep '22

26 Sep '22

If the qemu process is shutdown and flag is set to VIR_QEMU_PROCESS_KILL_NOWAIT, a log alarm is generated even if the qemu process is not stopped. Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- v1:https://www.mail-archive.com/libvir-list@redhat.com/msg232232.html diff to v1: - Add the patch 's description. - Change the code format. --- src/qemu/qemu_process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cbfdd3bda5..d876e345a0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8006,9 +8006,11 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags) } if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) { - virProcessKill(vm->pid, - (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? - SIGKILL : SIGTERM); + if (virProcessKill(vm->pid, + (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? + SIGKILL : SIGTERM);) { + VIR_DEBUG("Failed to terminate qemu process"); + } return 0; } -- 2.18.4

1 0

[PATCH v2] Two branches in a conditional structure should not have exactly the same implementation
by 丁丽敏 26 Sep '22

26 Sep '22

Having two branches in the same if structure with the same implementation is at best duplicate code, and at worst a coding error.If the same logic is truly needed for both instances, then they should be combined. Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- v1 of: https://www.mail-archive.com/libvir-list@redhat.com/msg232231.html diff to v1: - Add the patch 's description. - Change the code format. --- scripts/apibuild.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index c232b4e2c8..140916ec4c 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -1248,10 +1248,8 @@ class CParser: token[1] == "," or token[1] == "="): self.index_add_ref(oldtok[1], self.filename, 0, "type") - elif oldtok[0] == "name" and oldtok[1][0:4] == "XEN_": - self.index_add_ref(oldtok[1], self.filename, - 0, "typedef") - elif oldtok[0] == "name" and oldtok[1][0:7] == "LIBXEN_": + elif oldtok[0] == "name" and (oldtok[1][0:4] == "XEN_" or + oldtok[1][0:7] == "LIBXEN_"): self.index_add_ref(oldtok[1], self.filename, 0, "typedef") -- 2.18.4 丁丽敏 IaaS产品部中国移动云能力中心电话:188-9672-5914 邮箱:dinglimin@cmss.chinamobile.com 江苏省苏州市高新区科技城昆仑山路58号中移软件园 215153

1 0