[libvirt] [PATCH 0/9] More GLib macro usage (glib chronicles)
Ján Tomko (9): util: xml: use g_auto directly for VIR_XPATH_NODE_AUTORESTORE virbuffer: use g_auto directly for virBuffer Use g_autofree instead of VIR_AUTOFREE Use G_DEFINE_AUTOPTR_CLEANUP_FUNC instead of VIR_DEFINE_AUTOPTR_FUNC Use g_autoptr instead of VIR_AUTOPTR Define G_DEFINE_AUTOPTR_CLEANUP_FUNC for virDomainCheckpointDef Use g_autoptr instead of VIR_AUTOUNREF Delete virObjectAutoUnref Remove virautoclean.h src/bhyve/bhyve_conf.c | 2 +- src/conf/checkpoint_conf.c | 10 +- src/conf/checkpoint_conf.h | 1 + src/conf/domain_capabilities.h | 3 +- src/conf/domain_conf.c | 858 ++++++++++----------- src/conf/domain_conf.h | 2 +- src/conf/interface_conf.c | 2 +- src/conf/network_conf.c | 6 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/conf/secret_conf.c | 8 +- src/conf/secret_conf.h | 2 +- src/conf/snapshot_conf.c | 4 +- src/conf/storage_conf.c | 60 +- src/conf/storage_conf.h | 7 +- src/conf/virnetworkobj.c | 10 +- src/conf/virnetworkportdef.c | 18 +- src/conf/virnetworkportdef.h | 2 +- src/conf/virstorageobj.c | 4 +- src/cpu/cpu_x86.c | 12 +- src/driver.c | 4 +- src/esx/esx_driver.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 4 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libvirt-admin.c | 4 +- src/libvirt.c | 2 +- src/libvirt_private.syms | 1 - src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 6 +- src/libxl/xen_common.c | 24 +- src/libxl/xen_xl.c | 14 +- src/libxl/xen_xm.c | 10 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/logging/log_daemon.c | 2 +- src/logging/log_daemon_config.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_native.c | 18 +- src/network/bridge_driver.c | 12 +- src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/phyp/phyp_driver.c | 4 +- src/qemu/qemu_agent.c | 16 +- src/qemu/qemu_block.c | 126 +-- src/qemu/qemu_block.h | 4 +- src/qemu/qemu_blockjob.c | 26 +- src/qemu/qemu_capabilities.c | 12 +- src/qemu/qemu_checkpoint.c | 22 +- src/qemu/qemu_command.c | 336 ++++---- src/qemu/qemu_conf.c | 54 +- src/qemu/qemu_dbus.c | 2 +- src/qemu/qemu_dbus.h | 2 +- src/qemu/qemu_domain.c | 100 +-- src/qemu/qemu_domain_address.c | 6 +- src/qemu/qemu_driver.c | 58 +- src/qemu/qemu_extdevice.c | 4 +- src/qemu/qemu_firmware.c | 46 +- src/qemu/qemu_firmware.h | 3 +- src/qemu/qemu_hotplug.c | 154 ++-- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_interop_config.c | 18 +- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_migration_params.h | 3 +- src/qemu/qemu_monitor.c | 4 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 72 +- src/qemu/qemu_process.c | 10 +- src/qemu/qemu_qapi.c | 4 +- src/qemu/qemu_slirp.c | 40 +- src/qemu/qemu_slirp.h | 2 +- src/qemu/qemu_tpm.c | 10 +- src/qemu/qemu_vhost_user.c | 18 +- src/qemu/qemu_vhost_user.h | 3 +- src/qemu/qemu_vhost_user_gpu.c | 22 +- src/remote/remote_daemon.c | 2 +- src/remote/remote_daemon_config.c | 4 +- src/remote/remote_daemon_dispatch.c | 8 +- src/remote/remote_driver.c | 42 +- src/secret/secret_driver.c | 4 +- src/security/security_selinux.c | 2 +- src/security/security_util.c | 36 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_disk.c | 20 +- src/storage/storage_backend_fs.c | 16 +- src/storage/storage_backend_gluster.c | 12 +- src/storage/storage_backend_iscsi.c | 18 +- src/storage/storage_backend_iscsi_direct.c | 14 +- src/storage/storage_backend_logical.c | 34 +- src/storage/storage_backend_mpath.c | 4 +- src/storage/storage_backend_rbd.c | 18 +- src/storage/storage_backend_scsi.c | 14 +- src/storage/storage_backend_sheepdog.c | 18 +- src/storage/storage_backend_vstorage.c | 12 +- src/storage/storage_backend_zfs.c | 20 +- src/storage/storage_driver.c | 36 +- src/storage/storage_file_gluster.c | 4 +- src/storage/storage_util.c | 106 +-- src/test/test_driver.c | 62 +- src/util/Makefile.inc.am | 1 - src/util/iohelper.c | 2 +- src/util/virarptable.c | 4 +- src/util/viraudit.c | 2 +- src/util/virauth.c | 12 +- src/util/virauthconfig.c | 4 +- src/util/virauthconfig.h | 3 +- src/util/virautoclean.h | 89 --- src/util/virbitmap.c | 2 +- src/util/virbitmap.h | 3 +- src/util/virbuffer.c | 6 +- src/util/virbuffer.h | 3 +- src/util/vircgroup.c | 40 +- src/util/vircgroupv1.c | 108 +-- src/util/vircgroupv2.c | 108 +-- src/util/vircommand.c | 26 +- src/util/vircommand.h | 3 +- src/util/virconf.h | 3 +- src/util/virerror.c | 4 +- src/util/virerror.h | 3 +- src/util/vireventpoll.c | 2 +- src/util/virfcp.c | 4 +- src/util/virfile.c | 70 +- src/util/virfile.h | 3 +- src/util/virfilecache.c | 8 +- src/util/virfirewall.c | 16 +- src/util/virfirewall.h | 3 +- src/util/virfirewalld.c | 4 +- src/util/virfirmware.h | 2 +- src/util/virhash.h | 4 +- src/util/virhook.c | 6 +- src/util/virhostdev.c | 68 +- src/util/virhostmem.c | 12 +- src/util/viriptables.c | 20 +- src/util/viriscsi.c | 34 +- src/util/virjson.c | 18 +- src/util/virjson.h | 3 +- src/util/virkmod.c | 8 +- src/util/virlease.c | 8 +- src/util/virmacaddr.h | 3 +- src/util/virmdev.c | 20 +- src/util/virmdev.h | 5 +- src/util/virnetdev.c | 4 +- src/util/virnetdev.h | 3 +- src/util/virnetdevbridge.c | 16 +- src/util/virnetdevip.c | 56 +- src/util/virnetdevip.h | 5 +- src/util/virnetdevmacvlan.c | 10 +- src/util/virnetdevopenvswitch.c | 26 +- src/util/virnetdevtap.c | 6 +- src/util/virnetdevveth.c | 10 +- src/util/virnetdevvlan.h | 3 +- src/util/virnetlink.c | 28 +- src/util/virnetlink.h | 3 +- src/util/virnodesuspend.c | 4 +- src/util/virnuma.c | 28 +- src/util/virobject.c | 14 - src/util/virobject.h | 15 - src/util/virpci.c | 96 +-- src/util/virpci.h | 7 +- src/util/virperf.c | 4 +- src/util/virperf.h | 3 +- src/util/virpidfile.c | 22 +- src/util/virprocess.c | 18 +- src/util/virqemu.c | 6 +- src/util/virresctrl.c | 2 +- src/util/virscsi.c | 22 +- src/util/virscsi.h | 3 +- src/util/virscsivhost.c | 2 +- src/util/virscsivhost.h | 3 +- src/util/virsocketaddr.c | 8 +- src/util/virsocketaddr.h | 3 +- src/util/virstoragefile.c | 80 +- src/util/virstoragefile.h | 3 +- src/util/virsystemd.h | 3 +- src/util/virtpm.c | 8 +- src/util/virtypedparam.h | 3 +- src/util/viruri.h | 3 +- src/util/virusb.c | 6 +- src/util/virusb.h | 3 +- src/util/virutil.c | 4 +- src/util/virxml.h | 11 +- src/vbox/vbox_common.c | 4 +- src/vbox/vbox_storage.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/cputest.c | 4 +- tests/networkxml2firewalltest.c | 4 +- tests/qemublocktest.c | 58 +- tests/qemucapabilitiestest.c | 4 +- tests/qemucaps2xmltest.c | 4 +- tests/qemudomaincheckpointxml2xmltest.c | 8 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemufirmwaretest.c | 14 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 88 +-- tests/qemumonitortestutils.c | 26 +- tests/qemumonitortestutils.h | 3 +- tests/qemusecuritytest.c | 10 +- tests/qemuvhostusertest.c | 14 +- tests/storagebackendsheepdogtest.c | 14 +- tests/storagepoolcapstest.c | 10 +- tests/storagepoolxml2argvtest.c | 10 +- tests/storagepoolxml2xmltest.c | 8 +- tests/storagevolxml2argvtest.c | 22 +- tests/storagevolxml2xmltest.c | 12 +- tests/testutils.c | 4 +- tests/testutilsqemu.c | 2 +- tests/virbitmaptest.c | 6 +- tests/virbuftest.c | 6 +- tests/virconftest.c | 12 +- tests/virfilewrapper.c | 12 +- tests/virhostdevtest.c | 2 +- tests/virjsontest.c | 68 +- tests/virmockstathelpers.c | 16 +- tests/virnetdevopenvswitchtest.c | 4 +- tests/virnetworkportxml2xmltest.c | 2 +- tests/virpcimock.c | 56 +- tests/virstoragetest.c | 28 +- tests/virstorageutiltest.c | 4 +- tests/virsystemdtest.c | 4 +- tests/xlconfigtest.c | 4 +- tests/xmconfigtest.c | 4 +- tools/virsh-completer-domain.c | 28 +- tools/virsh-completer-host.c | 22 +- tools/virsh-completer.c | 2 +- tools/virsh-domain-monitor.c | 10 +- tools/virsh-domain.c | 20 +- tools/virsh-network.c | 2 +- tools/virsh-pool.c | 2 +- tools/virsh-secret.c | 2 +- tools/virsh-util.h | 2 +- tools/virt-admin.c | 6 +- tools/virt-login-shell-helper.c | 2 +- 236 files changed, 2325 insertions(+), 2478 deletions(-) delete mode 100644 src/util/virautoclean.h -- 2.19.2
Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOCLEAN is just an alias for g_auto. Use the GLib macros directly instead of our custom aliases. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/util/virxml.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virxml.h b/src/util/virxml.h index c7def9ce61..8813e31f75 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -233,7 +233,7 @@ typedef virXPathContextNodeSave *virXPathContextNodeSavePtr; void virXPathContextNodeRestore(virXPathContextNodeSavePtr save); -VIR_DEFINE_AUTOCLEAN_FUNC(virXPathContextNodeSave, virXPathContextNodeRestore); +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virXPathContextNodeSave, virXPathContextNodeRestore); /** * VIR_XPATH_NODE_AUTORESTORE: @@ -243,8 +243,8 @@ VIR_DEFINE_AUTOCLEAN_FUNC(virXPathContextNodeSave, virXPathContextNodeRestore); * node pointer is reset to the original value when this macro was used. */ #define VIR_XPATH_NODE_AUTORESTORE(_ctxt) \ - VIR_AUTOCLEAN(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt,\ - .node = _ctxt->node}; \ + g_auto(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt,\ + .node = _ctxt->node}; \ ignore_value(&_ctxt ## CtxtSave) VIR_DEFINE_AUTOPTR_FUNC(xmlDoc, xmlFreeDoc); -- 2.19.2
Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOCLEAN is just an alias for g_auto. Use the GLib macros directly instead of our custom aliases. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/conf/domain_conf.c | 100 +++++++++++++------------- src/libxl/xen_common.c | 2 +- src/qemu/qemu_command.c | 136 +++++++++++++++++------------------ src/qemu/qemu_domain.c | 28 ++++---- src/qemu/qemu_firmware.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/util/virbuffer.h | 2 +- src/util/virjson.c | 2 +- tests/qemublocktest.c | 8 +-- tests/qemumonitortestutils.c | 2 +- tests/virbuftest.c | 6 +- tests/virstoragetest.c | 2 +- tests/virsystemdtest.c | 2 +- 13 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10d6bf0eea..16b939d511 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7095,8 +7095,8 @@ virDomainDeviceInfoFormat(virBufferPtr buf, virDomainDeviceInfoPtr info, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; int ret = -1; if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) && info->bootIndex) { @@ -24139,7 +24139,7 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; int ret = -1; if (!(flags & VIR_DOMAIN_DEF_FORMAT_STATUS) || @@ -24183,8 +24183,8 @@ virDomainDiskSourceFormat(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; virBufferSetChildIndent(&childBuf, buf); @@ -24271,8 +24271,8 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, virDomainXMLOptionPtr xmlopt, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; bool inactive = flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE; virStorageSourcePtr backingStore = src->backingStore; @@ -24435,8 +24435,8 @@ virDomainDiskDefFormatMirror(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; const char *formatStr = NULL; virBufferSetChildIndent(&childBuf, buf); @@ -24488,7 +24488,7 @@ virDomainDiskDefFormatPrivateData(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; if (!(flags & VIR_DOMAIN_DEF_FORMAT_STATUS) || !xmlopt || @@ -24637,7 +24637,7 @@ static int virDomainControllerDriverFormat(virBufferPtr buf, virDomainControllerDefPtr def) { - VIR_AUTOCLEAN(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; if (def->queues) virBufferAsprintf(&driverBuf, " queues='%u'", def->queues); @@ -24670,8 +24670,8 @@ virDomainControllerDefFormat(virBufferPtr buf, const char *type = virDomainControllerTypeToString(def->type); const char *model = NULL; const char *modelName = NULL; - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; virBufferSetChildIndent(&childBuf, buf); @@ -24839,7 +24839,7 @@ virDomainFSDefFormat(virBufferPtr buf, const char *fsdriver = virDomainFSDriverTypeToString(def->fsdriver); const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy); const char *src = def->src->path; - VIR_AUTOCLEAN(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; int ret = -1; if (!type) { @@ -25442,7 +25442,7 @@ virDomainNetDefFormat(virBufferPtr buf, const char *typeStr; virDomainHostdevDefPtr hostdef = NULL; char macstr[VIR_MAC_STRING_BUFLEN]; - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; /* publicActual is true if we should report the current state in * def->data.network.actual *instead of* the config (*not* in @@ -25785,8 +25785,8 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefPtr def, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; virBufferSetChildIndent(&childBuf, buf); @@ -26070,7 +26070,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, unsigned int flags) { const char *mode = virDomainSmartcardTypeToString(def->type); - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; size_t i; int ret = -1; @@ -26203,7 +26203,7 @@ virDomainSoundDefFormat(virBufferPtr buf, unsigned int flags) { const char *model = virDomainSoundModelTypeToString(def->model); - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; size_t i; int ret = -1; @@ -26246,9 +26246,9 @@ virDomainMemballoonDefFormat(virBufferPtr buf, unsigned int flags) { const char *model = virDomainMemballoonModelTypeToString(def->model); - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -26302,8 +26302,8 @@ virDomainWatchdogDefFormat(virBufferPtr buf, { const char *model = virDomainWatchdogModelTypeToString(def->model); const char *action = virDomainWatchdogActionTypeToString(def->action); - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; virBufferSetChildIndent(&childBuf, buf); @@ -26330,8 +26330,8 @@ virDomainWatchdogDefFormat(virBufferPtr buf, static int virDomainPanicDefFormat(virBufferPtr buf, virDomainPanicDefPtr def) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; if (def->model) virBufferAsprintf(&attrBuf, " model='%s'", @@ -26391,7 +26391,7 @@ virDomainRNGDefFormat(virBufferPtr buf, { const char *model = virDomainRNGModelTypeToString(def->model); const char *backend = virDomainRNGBackendTypeToString(def->backend); - VIR_AUTOCLEAN(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; virBufferAsprintf(buf, "<rng model='%s'>\n", model); virBufferAdjustIndent(buf, 2); @@ -26585,7 +26585,7 @@ virDomainVideoDefFormat(virBufferPtr buf, unsigned int flags) { const char *model = virDomainVideoTypeToString(def->type); - VIR_AUTOCLEAN(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; int ret = -1; if (!model) { @@ -26656,9 +26656,9 @@ virDomainInputDefFormat(virBufferPtr buf, { const char *type = virDomainInputTypeToString(def->type); const char *bus = virDomainInputBusTypeToString(def->bus); - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; /* don't format keyboard into migratable XML for backward compatibility */ if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && @@ -27388,8 +27388,8 @@ virDomainHubDefFormat(virBufferPtr buf, unsigned int flags) { const char *type = virDomainHubTypeToString(def->type); - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; virBufferSetChildIndent(&childBuf, buf); @@ -27656,7 +27656,7 @@ virDomainCachetuneDefFormat(virBufferPtr buf, virDomainResctrlDefPtr resctrl, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; size_t i = 0; int ret = -1; VIR_AUTOFREE(char *) vcpus = NULL; @@ -27725,7 +27725,7 @@ virDomainMemorytuneDefFormat(virBufferPtr buf, virDomainResctrlDefPtr resctrl, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; int ret = -1; VIR_AUTOFREE(char *) vcpus = NULL; @@ -27772,7 +27772,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, unsigned int flags) { size_t i; - VIR_AUTOCLEAN(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; int ret = -1; virBufferSetChildIndent(&childrenBuf, buf); @@ -27960,9 +27960,9 @@ static int virDomainIOMMUDefFormat(virBufferPtr buf, const virDomainIOMMUDef *iommu) { - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; int ret = -1; virBufferSetChildIndent(&childBuf, buf); @@ -28004,7 +28004,7 @@ static int virDomainMemtuneFormat(virBufferPtr buf, const virDomainMemtune *mem) { - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; int ret = -1; virBufferSetChildIndent(&childBuf, buf); @@ -28066,9 +28066,9 @@ static int virDomainVsockDefFormat(virBufferPtr buf, virDomainVsockDefPtr vsock) { - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) cidAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cidAttrBuf = VIR_BUFFER_INITIALIZER; int ret = -1; if (vsock->model) { @@ -28104,7 +28104,7 @@ static int virDomainDefFormatBlkiotune(virBufferPtr buf, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; ssize_t n; virBufferSetChildIndent(&childrenBuf, buf); @@ -28149,9 +28149,9 @@ static int virDomainDefFormatFeatures(virBufferPtr buf, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) tmpAttrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) tmpChildBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) tmpAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) tmpChildBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; size_t i; virBufferSetChildIndent(&childBuf, buf); @@ -28998,7 +28998,7 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt, virCapsPtr caps, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; int state; int reason; size_t i; @@ -29979,7 +29979,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, virDomainXMLOptionPtr xmlopt, void *parseOpaque) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; int flags = VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_SECURE; int rc = -1; char *netprefix; @@ -30454,7 +30454,7 @@ virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def, int *nparams, int maxparams) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; char *data = NULL; size_t i; diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 2680e88a60..9632604807 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2373,7 +2373,7 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def) static int xenFormatSound(virConfPtr conf, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char * model; VIR_AUTOFREE(char *) str = NULL; size_t i; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c2a19689c5..f4563eac37 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -209,7 +209,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, { VIR_AUTOFREE(char *) alias = NULL; VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; /* If the -object secret does not exist, then just return. This just * means the domain won't be able to use a secret master key and is @@ -730,7 +730,7 @@ static int qemuBuildObjectSecretCommandLine(virCommandPtr cmd, qemuDomainSecretInfoPtr secinfo) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props = NULL; if (qemuBuildSecretInfoProps(secinfo, &props) < 0) @@ -921,7 +921,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, const char *alias, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props = NULL; if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, @@ -962,7 +962,7 @@ static char * qemuBuildNetworkDriveStr(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; char *ret = NULL; @@ -1786,7 +1786,7 @@ static char * qemuBuildDriveStr(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; int detect_zeroes = virDomainDiskGetDetectZeroesMode(disk->discard, disk->detect_zeroes); @@ -1951,7 +1951,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, unsigned int bootindex, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; VIR_AUTOFREE(char *) backendAlias = NULL; @@ -2293,7 +2293,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, char * qemuBuildZPCIDevStr(virDomainDeviceInfoPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virBufferAsprintf(&buf, "zpci,uid=%u,fid=%u,target=%s,id=zpci%u", @@ -2345,7 +2345,7 @@ qemuBuildFloppyCommandLineControllerOptions(virCommandPtr cmd, virQEMUCapsPtr qemuCaps, unsigned int bootFloppy) { - VIR_AUTOCLEAN(virBuffer) fdc_opts = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) fdc_opts = VIR_BUFFER_INITIALIZER; bool explicitfdc = qemuDomainNeedsFDC(def); bool hasfloppy = false; unsigned int bootindex; @@ -2422,7 +2422,7 @@ static int qemuBuildObjectCommandline(virCommandPtr cmd, virJSONValuePtr objProps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!objProps) return 0; @@ -2617,7 +2617,7 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, static char * qemuBuildFSStr(virDomainFSDefPtr fs) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; const char *wrpolicy = virDomainFSWrpolicyTypeToString(fs->wrpolicy); if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || @@ -2657,7 +2657,7 @@ qemuBuildFSDevStr(const virDomainDef *def, virDomainFSDefPtr fs, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; if (qemuBuildVirtioDevStr(&opt, "virtio-9p", qemuCaps, VIR_DOMAIN_DEVICE_FS, fs) < 0) @@ -2864,7 +2864,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, virQEMUCapsPtr qemuCaps, char **devstr) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; *devstr = NULL; @@ -3643,7 +3643,7 @@ char * qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, qemuDomainObjPrivatePtr priv) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *device; if (!mem->info.alias) { @@ -3729,7 +3729,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, size_t vhostfdSize, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; bool usingVirtio = false; char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -3903,7 +3903,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, const char *slirpfd) { bool is_tap = false; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainNetType netType = virDomainNetGetActualType(net); size_t i; @@ -4046,7 +4046,7 @@ qemuBuildWatchdogDevStr(const virDomainDef *def, virDomainWatchdogDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *model = virDomainWatchdogModelTypeToString(dev->model); if (!model) { @@ -4114,7 +4114,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!virDomainDefHasMemballoon(def)) return 0; @@ -4149,7 +4149,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, static char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && dev->info.addr.spaprvio.has_reg) { @@ -4205,7 +4205,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: @@ -4262,7 +4262,7 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: @@ -4345,7 +4345,7 @@ qemuBuildSoundDevStr(const virDomainDef *def, virDomainSoundDefPtr sound, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *model = NULL; /* Hack for devices with different names in QEMU and libvirt */ @@ -4420,7 +4420,7 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, virDomainSoundCodecDefPtr codec, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *stype; int type, flags; @@ -4508,7 +4508,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virDomainVideoDefPtr video, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *model = NULL; /* We try to chose the best model for primary video device by preferring @@ -4784,7 +4784,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, unsigned int bootIndex, /* used iff dev->info->bootIndex == 0 */ virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysPCIPtr pcisrc = &dev->source.subsys.u.pci; int backend = pcisrc->backend; @@ -4833,7 +4833,7 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysUSBPtr usbsrc = &dev->source.subsys.u.usb; if (!dev->missing && !usbsrc->bus && !usbsrc->device) { @@ -4866,7 +4866,7 @@ qemuBuildHubDevStr(const virDomainDef *def, virDomainHubDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (dev->type != VIR_DOMAIN_HUB_TYPE_USB) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -4931,7 +4931,7 @@ static char * qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) netsource = NULL; VIR_AUTOPTR(virJSONValue) srcprops = NULL; virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; @@ -4967,7 +4967,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps, char *vhostfdName) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysSCSIVHostPtr hostsrc = &dev->source.subsys.u.scsi_host; if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_SCSI)) { @@ -4999,7 +4999,7 @@ char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) source = NULL; VIR_AUTOFREE(char *) drivealias = NULL; virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; @@ -5031,7 +5031,7 @@ char * qemuBuildSCSIHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; int model = -1; VIR_AUTOFREE(char *) driveAlias = NULL; const char *contAlias; @@ -5228,7 +5228,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, unsigned int flags) { qemuDomainChrSourcePrivatePtr chrSourcePriv = QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev); - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; bool telnet; VIR_AUTOFREE(char *) charAlias = NULL; @@ -5422,7 +5422,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysMediatedDevPtr mdevsrc = &dev->source.subsys.u.mdev; VIR_AUTOFREE(char *) mdevPath = NULL; const char *dev_str = NULL; @@ -5656,7 +5656,7 @@ static char * qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, virDomainChrDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *contAlias; switch (dev->deviceType) { @@ -5719,7 +5719,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, static char * qemuBuildSclpDevStr(virDomainChrDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE) { switch (dev->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: @@ -5841,7 +5841,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, virDomainRNGDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!qemuDomainCheckCCWS390AddressSupport(def, &dev->info, qemuCaps, dev->source.file)) @@ -5936,7 +5936,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, static char * qemuBuildSmbiosBiosStr(virSysinfoBIOSDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!def) return NULL; @@ -5972,7 +5972,7 @@ static char * qemuBuildSmbiosSystemStr(virSysinfoSystemDefPtr def, bool skip_uuid) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!def || (!def->manufacturer && !def->product && !def->version && @@ -6025,7 +6025,7 @@ qemuBuildSmbiosSystemStr(virSysinfoSystemDefPtr def, static char * qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!def) return NULL; @@ -6071,7 +6071,7 @@ qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr def) static char * qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; if (!def) @@ -6091,7 +6091,7 @@ qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefPtr def) static char * qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!def) return NULL; @@ -6216,7 +6216,7 @@ qemuBuildVMGenIDCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opts = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER; char guid[VIR_UUID_STRING_BUFLEN]; if (!def->genidRequested) @@ -6266,7 +6266,7 @@ static char * qemuBuildClockArgStr(virDomainClockDefPtr def) { size_t i; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; switch (def->offset) { case VIR_DOMAIN_CLOCK_OFFSET_UTC: @@ -6547,7 +6547,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) boot_buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) boot_buf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) boot_opts_str = NULL; if (def->os.bootmenu) { @@ -6627,7 +6627,7 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_INTEL: { - VIR_AUTOCLEAN(virBuffer) opts = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER; /* qemuDomainDeviceDefValidateIOMMU() already made sure we have * one of QEMU_CAPS_DEVICE_INTEL_IOMMU or QEMU_CAPS_MACHINE_IOMMU: @@ -6841,8 +6841,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virArch hostarch = virArchFromHost(); VIR_AUTOFREE(char *) cpu = NULL; VIR_AUTOFREE(char *) cpu_flags = NULL; - VIR_AUTOCLEAN(virBuffer) cpu_buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cpu_buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; if (def->cpu && @@ -7119,7 +7119,7 @@ qemuBuildNameCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virCommandAddArg(cmd, "-name"); @@ -7149,7 +7149,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virTristateSwitch vmport = def->features[VIR_DOMAIN_FEATURE_VMPORT]; virTristateSwitch smm = def->features[VIR_DOMAIN_FEATURE_SMM]; virCPUDefPtr cpu = def->cpu; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; /* This should *never* be NULL, since we always provide @@ -7469,7 +7469,7 @@ static int qemuBuildSmpCommandLine(virCommandPtr cmd, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; unsigned int maxvcpus = virDomainDefGetVcpusMax(def); unsigned int nvcpus = 0; virDomainVcpuDefPtr vcpu; @@ -7630,7 +7630,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, { size_t i, j; virQEMUCapsPtr qemuCaps = priv->qemuCaps; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; char *cpumask = NULL; char *tmpmask = NULL; char *next = NULL; @@ -7793,7 +7793,7 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, /* memory hotplug requires NUMA to be enabled - we already checked * that memory devices are present only when NUMA is */ for (i = 0; i < def->nmems; i++) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; char *dimmStr; if (qemuBuildMemoryDimmBackendStr(&buf, def->mems[i], def, cfg, priv) < 0) @@ -7820,7 +7820,7 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virQEMUCapsPtr qemuCaps G_GNUC_UNUSED, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; if (graphics->data.sdl.xauth) virCommandAddEnvPair(cmd, "XAUTHORITY", graphics->data.sdl.xauth); @@ -7867,7 +7867,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten = NULL; bool escapeAddr; @@ -8000,7 +8000,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten = NULL; int port = graphics->data.spice.port; int tlsPort = graphics->data.spice.tlsPort; @@ -8248,7 +8248,7 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; virBufferAddLit(&opt, "egl-headless"); @@ -8777,7 +8777,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, size_t i; virDomainSmartcardDefPtr smartcard; VIR_AUTOFREE(char *) devstr = NULL; - VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; const char *database; const char *contAlias = NULL; unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | @@ -8886,7 +8886,7 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def, virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -8929,7 +8929,7 @@ qemuBuildShmemDevStr(virDomainDefPtr def, virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if ((shmem->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN)) || @@ -9001,7 +9001,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, bool chardevStdioLogd) { VIR_AUTOPTR(virJSONValue) memProps = NULL; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) devstr = NULL; VIR_AUTOFREE(char *) chardev = NULL; int rc; @@ -9426,7 +9426,7 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { size_t i; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainRedirFilterDefPtr redirfilter = def->redirfilter; if (dev->bus != VIR_DOMAIN_REDIRDEV_BUS_USB) { @@ -9544,7 +9544,7 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, virDomainDefPtr def) { virDomainLoaderDefPtr loader = def->os.loader; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; int unit = 0; if (!loader) @@ -9601,7 +9601,7 @@ static char * qemuBuildTPMDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const virDomainTPMDef *tpm = def->tpm; const char *model = virDomainTPMModelTypeToString(tpm->model); virQEMUCapsFlags flag; @@ -9670,7 +9670,7 @@ qemuBuildTPMBackendStr(const virDomainDef *def, char **chardev) { const virDomainTPMDef *tpm = def->tpm; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) cancel_path = NULL; VIR_AUTOFREE(char *) devset = NULL; VIR_AUTOFREE(char *) cancelset = NULL; @@ -9780,7 +9780,7 @@ static int qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd, virDomainSEVDefPtr sev) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; qemuDomainObjPrivatePtr priv = vm->privateData; char *path = NULL; @@ -9990,7 +9990,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, const virDomainDef *def, qemuDomainObjPrivatePtr priv) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props = NULL; if (!virDomainDefHasManagedPR(def)) @@ -10049,7 +10049,7 @@ qemuBuildDBusVMStateCommandLineEach(void *payload, { qemuBuildDBusVMStateCommandLineData *data = user_data; qemuDBusVMStatePtr vms = payload; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props = NULL; if (!(props = qemuBuildDBusVMStateInfoProps(id, vms->addr))) @@ -10213,7 +10213,7 @@ qemuBuildVsockDevStr(virDomainDefPtr def, const char *fdprefix) { qemuDomainVsockPrivatePtr priv = (qemuDomainVsockPrivatePtr)vsock->privateData; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (qemuBuildVirtioDevStr(&buf, "vhost-vsock", qemuCaps, VIR_DOMAIN_DEVICE_VSOCK, vsock) < 0) { @@ -10548,7 +10548,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrDefPtr serial, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virQEMUCapsFlags caps; switch ((virDomainChrSerialTargetModel) serial->targetModel) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c638077aa8..734ea7a764 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2301,7 +2301,7 @@ static int qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, virBufferPtr buf) { - VIR_AUTOCLEAN(virBuffer) tmp = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER; qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); int ret = -1; @@ -2447,8 +2447,8 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(virBufferPtr buf, virDomainXMLOptionPtr xmlopt, bool chain) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; unsigned int xmlflags = VIR_DOMAIN_DEF_FORMAT_STATUS; virBufferSetChildIndent(&childBuf, buf); @@ -2476,9 +2476,9 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload, const void *name G_GNUC_UNUSED, void *opaque) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) chainsBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) chainsBuf = VIR_BUFFER_INITIALIZER; qemuBlockJobDataPtr job = payload; const char *state = qemuBlockjobStateTypeToString(job->state); const char *newstate = NULL; @@ -2571,8 +2571,8 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr buf, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; bool bj = qemuDomainHasBlockjob(vm, false); struct qemuDomainPrivateBlockJobFormatData iterdata = { priv->driver->xmlopt, &childBuf }; @@ -2616,8 +2616,8 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, virStorageSourcePtr src, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; int ret = -1; virBufferSetChildIndent(&childBuf, buf); @@ -2645,8 +2645,8 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; size_t i; virDomainDiskDefPtr disk; qemuDomainDiskPrivatePtr diskPriv; @@ -2683,8 +2683,8 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, virDomainObjPtr vm, qemuDomainObjPrivatePtr priv) { - VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; qemuDomainJob job = priv->job.active; int ret = -1; diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index aba2c359e7..6d3faadd23 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -290,7 +290,7 @@ qemuFirmwareInterfaceParse(const char *path, { virJSONValuePtr interfacesJSON; VIR_AUTOPTR(qemuFirmwareOSInterface) interfaces = NULL; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t ninterfaces; size_t i; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d3447dd2f3..242b637451 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -302,7 +302,7 @@ qemuMonitorJSONCommandWithFd(qemuMonitorPtr mon, { int ret = -1; qemuMonitorMessage msg; - VIR_AUTOCLEAN(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; char *id = NULL; *reply = NULL; diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index 1c9748643e..0c074121bc 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -55,7 +55,7 @@ int virBufferCheckErrorInternal(const virBuffer *buf, size_t linenr) ATTRIBUTE_NONNULL(1); -VIR_DEFINE_AUTOCLEAN_FUNC(virBuffer, virBufferFreeAndReset); +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virBuffer, virBufferFreeAndReset); /** * virBufferCheckError diff --git a/src/util/virjson.c b/src/util/virjson.c index 07b3e8823c..5e3c00a19c 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -2025,7 +2025,7 @@ char * virJSONValueToString(virJSONValuePtr object, bool pretty) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (virJSONValueToBuffer(object, &buf, pretty) < 0) return NULL; diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index bb0579056e..2056eeb2e9 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -48,7 +48,7 @@ testBackingXMLjsonXML(const void *args) const struct testBackingXMLjsonXMLdata *data = args; VIR_AUTOPTR(xmlDoc) xml = NULL; VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) backendprops = NULL; VIR_AUTOPTR(virJSONValue) wrapper = NULL; VIR_AUTOFREE(char *) propsstr = NULL; @@ -401,8 +401,8 @@ testQemuImageCreate(const void *opaque) VIR_AUTOPTR(virJSONValue) protocolprops = NULL; VIR_AUTOPTR(virJSONValue) formatprops = NULL; VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; - VIR_AUTOCLEAN(virBuffer) debug = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) actualbuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) actualbuf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) jsonprotocol = NULL; VIR_AUTOFREE(char *) jsonformat = NULL; VIR_AUTOFREE(char *) actual = NULL; @@ -482,7 +482,7 @@ static int testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) { struct testQemuDiskXMLToJSONData *data = (void *) opaque; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) jsonpath = NULL; VIR_AUTOFREE(char *) actual = NULL; size_t i; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 4dd7328028..52e4619f38 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -511,7 +511,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test, const char *cmdname, virJSONValuePtr args) { - VIR_AUTOCLEAN(virBuffer) debug = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; virJSONValuePtr schemaroot; VIR_AUTOPTR(virJSONValue) emptyargs = NULL; VIR_AUTOFREE(char *) schemapath = NULL; diff --git a/tests/virbuftest.c b/tests/virbuftest.c index f547afe7f7..385f016174 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -306,8 +306,8 @@ static int testBufAddBuffer(const void *data G_GNUC_UNUSED) static int testBufAddBuffer2(const void *opaque G_GNUC_UNUSED) { - VIR_AUTOCLEAN(virBuffer) buf1 = VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) buf2 = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf1 = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf2 = VIR_BUFFER_INITIALIZER; /* Intent of this test is to demonstrate a memleak that happen with * virBufferAddBuffer */ @@ -461,7 +461,7 @@ testBufSetIndent(const void *opaque G_GNUC_UNUSED) static int testBufferAutoclean(const void *opaque G_GNUC_UNUSED) { - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virBufferAddLit(&buf, "test test test\n"); return 0; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 20e407448f..af435189f1 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -610,7 +610,7 @@ static int testBackingParse(const void *args) { const struct testBackingParseData *data = args; - VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) xml = NULL; VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; int rc; diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 8aaac097e9..109e0a5456 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -554,7 +554,7 @@ testActivation(bool useNames) int *fds = NULL; size_t nfds = 0; VIR_AUTOPTR(virSystemdActivation) act = NULL; - VIR_AUTOCLEAN(virBuffer) names = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) names = VIR_BUFFER_INITIALIZER; virBufferAddLit(&names, "demo-unix.socket"); -- 2.19.2
Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOFREE is just an alias for g_autofree. Use the GLib macros directly instead of our custom aliases. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/conf/checkpoint_conf.c | 6 +- src/conf/domain_conf.c | 694 ++++++++++----------- src/conf/secret_conf.c | 4 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 44 +- src/conf/virnetworkobj.c | 8 +- src/conf/virnetworkportdef.c | 16 +- src/cpu/cpu_x86.c | 12 +- src/driver.c | 4 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libvirt-admin.c | 2 +- src/libxl/xen_common.c | 22 +- src/libxl/xen_xl.c | 12 +- src/libxl/xen_xm.c | 8 +- src/lxc/lxc_native.c | 16 +- src/network/bridge_driver.c | 10 +- src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_block.c | 22 +- src/qemu/qemu_blockjob.c | 8 +- src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_checkpoint.c | 8 +- src/qemu/qemu_command.c | 148 ++--- src/qemu/qemu_conf.c | 42 +- src/qemu/qemu_domain.c | 56 +- src/qemu/qemu_domain_address.c | 6 +- src/qemu/qemu_driver.c | 22 +- src/qemu/qemu_extdevice.c | 4 +- src/qemu/qemu_firmware.c | 4 +- src/qemu/qemu_hotplug.c | 118 ++-- src/qemu/qemu_interop_config.c | 16 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 4 +- src/qemu/qemu_monitor_json.c | 6 +- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_slirp.c | 26 +- src/qemu/qemu_tpm.c | 10 +- src/qemu/qemu_vhost_user.c | 4 +- src/qemu/qemu_vhost_user_gpu.c | 14 +- src/remote/remote_daemon_dispatch.c | 8 +- src/remote/remote_driver.c | 42 +- src/secret/secret_driver.c | 4 +- src/security/security_util.c | 36 +- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_disk.c | 10 +- src/storage/storage_backend_fs.c | 6 +- src/storage/storage_backend_gluster.c | 6 +- src/storage/storage_backend_iscsi.c | 16 +- src/storage/storage_backend_iscsi_direct.c | 10 +- src/storage/storage_backend_logical.c | 12 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 16 +- src/storage/storage_backend_scsi.c | 14 +- src/storage/storage_backend_sheepdog.c | 4 +- src/storage/storage_backend_vstorage.c | 8 +- src/storage/storage_backend_zfs.c | 6 +- src/storage/storage_driver.c | 26 +- src/storage/storage_file_gluster.c | 4 +- src/storage/storage_util.c | 80 +-- src/test/test_driver.c | 46 +- src/util/iohelper.c | 2 +- src/util/virarptable.c | 4 +- src/util/viraudit.c | 2 +- src/util/virauth.c | 10 +- src/util/virauthconfig.c | 4 +- src/util/virbuffer.c | 6 +- src/util/vircgroup.c | 40 +- src/util/vircgroupv1.c | 108 ++-- src/util/vircgroupv2.c | 108 ++-- src/util/vircommand.c | 20 +- src/util/virerror.c | 4 +- src/util/vireventpoll.c | 2 +- src/util/virfcp.c | 4 +- src/util/virfile.c | 68 +- src/util/virfilecache.c | 8 +- src/util/virfirewall.c | 10 +- src/util/virfirewalld.c | 4 +- src/util/virhook.c | 4 +- src/util/virhostdev.c | 20 +- src/util/virhostmem.c | 12 +- src/util/viriptables.c | 20 +- src/util/viriscsi.c | 18 +- src/util/virjson.c | 12 +- src/util/virkmod.c | 4 +- src/util/virlease.c | 4 +- src/util/virmdev.c | 16 +- src/util/virnetdevbridge.c | 14 +- src/util/virnetdevip.c | 38 +- src/util/virnetdevmacvlan.c | 4 +- src/util/virnetdevopenvswitch.c | 10 +- src/util/virnetdevtap.c | 6 +- src/util/virnetdevveth.c | 6 +- src/util/virnetlink.c | 14 +- src/util/virnodesuspend.c | 2 +- src/util/virnuma.c | 20 +- src/util/virpci.c | 78 +-- src/util/virperf.c | 4 +- src/util/virpidfile.c | 22 +- src/util/virprocess.c | 18 +- src/util/virqemu.c | 4 +- src/util/virresctrl.c | 2 +- src/util/virscsi.c | 14 +- src/util/virsocketaddr.c | 8 +- src/util/virstoragefile.c | 42 +- src/util/virtpm.c | 4 +- src/util/virusb.c | 4 +- src/util/virutil.c | 2 +- tests/cputest.c | 4 +- tests/networkxml2firewalltest.c | 4 +- tests/qemublocktest.c | 26 +- tests/qemucapabilitiestest.c | 4 +- tests/qemucaps2xmltest.c | 4 +- tests/qemudomaincheckpointxml2xmltest.c | 6 +- tests/qemufirmwaretest.c | 10 +- tests/qemumonitorjsontest.c | 8 +- tests/qemumonitortestutils.c | 18 +- tests/qemusecuritytest.c | 6 +- tests/qemuvhostusertest.c | 10 +- tests/storagebackendsheepdogtest.c | 8 +- tests/storagepoolcapstest.c | 4 +- tests/storagepoolxml2argvtest.c | 8 +- tests/storagepoolxml2xmltest.c | 6 +- tests/storagevolxml2argvtest.c | 14 +- tests/storagevolxml2xmltest.c | 8 +- tests/testutils.c | 4 +- tests/testutilsqemu.c | 2 +- tests/virfilewrapper.c | 12 +- tests/virhostdevtest.c | 2 +- tests/virjsontest.c | 36 +- tests/virmockstathelpers.c | 16 +- tests/virnetdevopenvswitchtest.c | 4 +- tests/virpcimock.c | 56 +- tests/virstoragetest.c | 14 +- tests/virstorageutiltest.c | 4 +- tools/virsh-completer-domain.c | 12 +- tools/virsh-completer-host.c | 14 +- tools/virsh-completer.c | 2 +- tools/virsh-domain-monitor.c | 10 +- tools/virsh-domain.c | 14 +- tools/virsh-network.c | 2 +- tools/virsh-pool.c | 2 +- tools/virsh-secret.c | 2 +- tools/virt-admin.c | 6 +- 144 files changed, 1473 insertions(+), 1473 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index a83863adcc..9b407dca78 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -98,7 +98,7 @@ virDomainCheckpointDiskDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainCheckpointDiskDefPtr def) { - VIR_AUTOFREE(char *) checkpoint = NULL; + g_autofree char *checkpoint = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -133,7 +133,7 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, size_t i; int n; char *tmp; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; if (!(def = virDomainCheckpointDefNew())) @@ -210,7 +210,7 @@ virDomainCheckpointDefParseNode(xmlDocPtr xml, unsigned int flags) { VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; - VIR_AUTOFREE(char *) schema = NULL; + g_autofree char *schema = NULL; if (!virXMLNodeNameEqual(root, "domaincheckpoint")) { virReportError(VIR_ERR_XML_ERROR, "%s", _("domaincheckpoint")); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 16b939d511..139dccefff 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1300,8 +1300,8 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap, { int state_type; int name_type; - VIR_AUTOFREE(char *) name = NULL; - VIR_AUTOFREE(char *) state = NULL; + g_autofree char *name = NULL; + g_autofree char *state = NULL; if (!(name = virXMLPropString(node, "name"))) { virReportError(VIR_ERR_CONF_SYNTAX, "%s", @@ -1364,8 +1364,8 @@ virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr ctxt) { size_t i; int n; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; - VIR_AUTOFREE(virDomainKeyWrapDefPtr) keywrap = NULL; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree virDomainKeyWrapDefPtr keywrap = NULL; if ((n = virXPathNodeSet("./keywrap/cipher", ctxt, &nodes)) < 0) return n; @@ -1455,7 +1455,7 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver, { int val; virDomainVirtioOptionsPtr res; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (*virtio || !driver) return 0; @@ -1544,7 +1544,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, virBlkioDevicePtr dev) { xmlNodePtr node; - VIR_AUTOFREE(char *) c = NULL; + g_autofree char *c = NULL; node = root->children; while (node) { @@ -5585,7 +5585,7 @@ virDomainDefCollectBootOrder(virDomainDefPtr def G_GNUC_UNUSED, void *data) { virHashTablePtr bootHash = data; - VIR_AUTOFREE(char *) order = NULL; + g_autofree char *order = NULL; if (info->bootIndex == 0) return 0; @@ -7251,7 +7251,7 @@ static int virDomainDeviceUSBMasterParseXML(xmlNodePtr node, virDomainDeviceUSBMasterPtr master) { - VIR_AUTOFREE(char *) startport = NULL; + g_autofree char *startport = NULL; memset(master, 0, sizeof(*master)); @@ -7271,8 +7271,8 @@ static int virDomainDeviceBootParseXML(xmlNodePtr node, virDomainDeviceInfoPtr info) { - VIR_AUTOFREE(char *) order = NULL; - VIR_AUTOFREE(char *) loadparm = NULL; + g_autofree char *order = NULL; + g_autofree char *loadparm = NULL; if (!(order = virXMLPropString(node, "order"))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -7310,8 +7310,8 @@ static int virDomainDeviceISAAddressParseXML(xmlNodePtr node, virDomainDeviceISAAddressPtr addr) { - VIR_AUTOFREE(char *) iobase = NULL; - VIR_AUTOFREE(char *) irq = NULL; + g_autofree char *iobase = NULL; + g_autofree char *irq = NULL; memset(addr, 0, sizeof(*addr)); @@ -7340,7 +7340,7 @@ static int virDomainDeviceDimmAddressParseXML(xmlNodePtr node, virDomainDeviceDimmAddressPtr addr) { - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (!(tmp = virXMLPropString(node, "slot")) || virStrToLong_uip(tmp, NULL, 10, &addr->slot) < 0) { @@ -7367,7 +7367,7 @@ static int virDomainDeviceAddressParseXML(xmlNodePtr address, virDomainDeviceInfoPtr info) { - VIR_AUTOFREE(char *) type = virXMLPropString(address, "type"); + g_autofree char *type = virXMLPropString(address, "type"); if (type) { if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) { @@ -7473,9 +7473,9 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED, xmlNodePtr boot = NULL; xmlNodePtr rom = NULL; int ret = -1; - VIR_AUTOFREE(char *) romenabled = NULL; - VIR_AUTOFREE(char *) rombar = NULL; - VIR_AUTOFREE(char *) aliasStr = NULL; + g_autofree char *romenabled = NULL; + g_autofree char *rombar = NULL; + g_autofree char *aliasStr = NULL; virDomainDeviceInfoClear(info); @@ -7586,8 +7586,8 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, bool got_product, got_vendor; xmlNodePtr cur; virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb; - VIR_AUTOFREE(char *) startupPolicy = NULL; - VIR_AUTOFREE(char *) autoAddress = NULL; + g_autofree char *startupPolicy = NULL; + g_autofree char *autoAddress = NULL; if ((startupPolicy = virXMLPropString(node, "startupPolicy"))) { def->startupPolicy = @@ -7614,7 +7614,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (virXMLNodeNameEqual(cur, "vendor")) { - VIR_AUTOFREE(char *) vendor = virXMLPropString(cur, "id"); + g_autofree char *vendor = virXMLPropString(cur, "id"); if (vendor) { got_vendor = true; @@ -7629,7 +7629,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, goto out; } } else if (virXMLNodeNameEqual(cur, "product")) { - VIR_AUTOFREE(char *) product = virXMLPropString(cur, "id"); + g_autofree char *product = virXMLPropString(cur, "id"); if (product) { got_product = true; @@ -7646,8 +7646,8 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, goto out; } } else if (virXMLNodeNameEqual(cur, "address")) { - VIR_AUTOFREE(char *) bus = NULL; - VIR_AUTOFREE(char *) device = NULL; + g_autofree char *bus = NULL; + g_autofree char *device = NULL; bus = virXMLPropString(cur, "bus"); if (bus) { @@ -7763,7 +7763,7 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node, } else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && virXMLNodeNameEqual(cur, "state")) { /* Legacy back-compat. Don't add any more attributes here */ - VIR_AUTOFREE(char *) devaddr = virXMLPropString(cur, "devaddr"); + g_autofree char *devaddr = virXMLPropString(cur, "devaddr"); if (devaddr && virDomainParseLegacyDeviceAddress(devaddr, &def->info->addr.pci) < 0) { @@ -7799,8 +7799,8 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, virStorageNetHostDefPtr host) { int ret = -1; - VIR_AUTOFREE(char *) transport = NULL; - VIR_AUTOFREE(char *) port = NULL; + g_autofree char *transport = NULL; + g_autofree char *port = NULL; memset(host, 0, sizeof(*host)); host->transport = VIR_STORAGE_NET_HOST_TRANS_TCP; @@ -7888,9 +7888,9 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode, bool got_address = false, got_adapter = false; xmlNodePtr cur; virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - VIR_AUTOFREE(char *) bus = NULL; - VIR_AUTOFREE(char *) target = NULL; - VIR_AUTOFREE(char *) unit = NULL; + g_autofree char *bus = NULL; + g_autofree char *target = NULL; + g_autofree char *unit = NULL; cur = sourcenode->children; while (cur != NULL) { @@ -8042,7 +8042,7 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode, virDomainHostdevSubsysSCSIPtr scsisrc, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(char *) protocol = NULL; + g_autofree char *protocol = NULL; if ((protocol = virXMLPropString(sourcenode, "protocol"))) { scsisrc->protocol = @@ -8066,8 +8066,8 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, virDomainHostdevDefPtr def) { virDomainHostdevSubsysSCSIVHostPtr hostsrc = &def->source.subsys.u.scsi_host; - VIR_AUTOFREE(char *) protocol = NULL; - VIR_AUTOFREE(char *) wwpn = NULL; + g_autofree char *protocol = NULL; + g_autofree char *wwpn = NULL; if (!(protocol = virXMLPropString(sourcenode, "protocol"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -8117,7 +8117,7 @@ virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDefPtr def, unsigned char uuid[VIR_UUID_BUFLEN] = {0}; xmlNodePtr node = NULL; virDomainHostdevSubsysMediatedDevPtr mdevsrc = &def->source.subsys.u.mdev; - VIR_AUTOFREE(char *) uuidxml = NULL; + g_autofree char *uuidxml = NULL; if (!(node = virXPathNode("./source/address", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -8155,12 +8155,12 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHostPtr scsihostsrc = &def->source.subsys.u.scsi_host; virDomainHostdevSubsysMediatedDevPtr mdevsrc = &def->source.subsys.u.mdev; - VIR_AUTOFREE(char *) managed = NULL; - VIR_AUTOFREE(char *) sgio = NULL; - VIR_AUTOFREE(char *) rawio = NULL; - VIR_AUTOFREE(char *) backendStr = NULL; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) display = NULL; + g_autofree char *managed = NULL; + g_autofree char *sgio = NULL; + g_autofree char *rawio = NULL; + g_autofree char *backendStr = NULL; + g_autofree char *model = NULL; + g_autofree char *display = NULL; /* @managed can be read from the xml document - it is always an * attribute of the toplevel element, no matter what type of @@ -8340,11 +8340,11 @@ virDomainNetIPParseXML(xmlNodePtr node) virNetDevIPAddrPtr ret = NULL; unsigned int prefixValue = 0; int family = AF_UNSPEC; - VIR_AUTOFREE(virNetDevIPAddrPtr) ip = NULL; - VIR_AUTOFREE(char *) prefixStr = NULL; - VIR_AUTOFREE(char *) familyStr = NULL; - VIR_AUTOFREE(char *) address = NULL; - VIR_AUTOFREE(char *) peer = NULL; + g_autofree virNetDevIPAddrPtr ip = NULL; + g_autofree char *prefixStr = NULL; + g_autofree char *familyStr = NULL; + g_autofree char *address = NULL; + g_autofree char *peer = NULL; if (!(address = virXMLPropString(node, "address"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -8408,8 +8408,8 @@ virDomainNetIPInfoParseXML(const char *source, int nnodes; int ret = -1; size_t i; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; - VIR_AUTOFREE(virNetDevIPAddrPtr) ip = NULL; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree virNetDevIPAddrPtr ip = NULL; if ((nnodes = virXPathNodeSet("./ip", ctxt, &nodes)) < 0) goto cleanup; @@ -8446,7 +8446,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, virNetDevCoalescePtr ret = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned long long tmp = 0; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; ctxt->node = node; @@ -8845,7 +8845,7 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, size_t i = 0, j; int n; virCapsHostPtr host = &caps->host; - VIR_AUTOFREE(xmlNodePtr *) list = NULL; + g_autofree xmlNodePtr *list = NULL; /* Allocate a security labels based on XML */ if ((n = virXPathNodeSet("./seclabel", ctxt, &list)) < 0) @@ -8946,7 +8946,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr **seclabels_rtn, int n; size_t i, j; char *model, *relabel, *label, *labelskip; - VIR_AUTOFREE(xmlNodePtr *) list = NULL; + g_autofree xmlNodePtr *list = NULL; if ((n = virXPathNodeSet("./seclabel", ctxt, &list)) < 0) goto error; @@ -9062,10 +9062,10 @@ virDomainLeaseDefParseXML(xmlNodePtr node) { virDomainLeaseDefPtr def; xmlNodePtr cur; - VIR_AUTOFREE(char *) lockspace = NULL; - VIR_AUTOFREE(char *) key = NULL; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) offset = NULL; + g_autofree char *lockspace = NULL; + g_autofree char *key = NULL; + g_autofree char *path = NULL; + g_autofree char *offset = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -9124,7 +9124,7 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, { virStorageSourcePoolDefPtr source; int ret = -1; - VIR_AUTOFREE(char *) mode = NULL; + g_autofree char *mode = NULL; *srcpool = NULL; @@ -9172,9 +9172,9 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, unsigned int flags) { int tlsCfgVal; - VIR_AUTOFREE(char *) protocol = NULL; - VIR_AUTOFREE(char *) haveTLS = NULL; - VIR_AUTOFREE(char *) tlsCfg = NULL; + g_autofree char *protocol = NULL; + g_autofree char *haveTLS = NULL; + g_autofree char *tlsCfg = NULL; if (!(protocol = virXMLPropString(node, "protocol"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9403,9 +9403,9 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr source; VIR_AUTOUNREF(virStorageSourcePtr) backingStore = NULL; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) format = NULL; - VIR_AUTOFREE(char *) idx = NULL; + g_autofree char *type = NULL; + g_autofree char *format = NULL; + g_autofree char *idx = NULL; if (!(ctxt->node = virXPathNode("./backingStore", ctxt))) return 0; @@ -9539,11 +9539,11 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def, { xmlNodePtr mirrorNode; VIR_XPATH_NODE_AUTORESTORE(ctxt); - VIR_AUTOFREE(char *) mirrorFormat = NULL; - VIR_AUTOFREE(char *) mirrorType = NULL; - VIR_AUTOFREE(char *) ready = NULL; - VIR_AUTOFREE(char *) blockJob = NULL; - VIR_AUTOFREE(char *) index = NULL; + g_autofree char *mirrorFormat = NULL; + g_autofree char *mirrorType = NULL; + g_autofree char *ready = NULL; + g_autofree char *blockJob = NULL; + g_autofree char *index = NULL; ctxt->node = cur; @@ -9612,7 +9612,7 @@ static int virDomainDiskDefGeometryParse(virDomainDiskDefPtr def, xmlNodePtr cur) { - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if ((tmp = virXMLPropString(cur, "cyls"))) { if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.cylinders) < 0) { @@ -9795,7 +9795,7 @@ static int virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def, xmlNodePtr cur) { - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; def->driverName = virXMLPropString(cur, "name"); @@ -9955,23 +9955,23 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, bool source = false; virStorageEncryptionPtr encryption = NULL; VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(char *) snapshot = NULL; - VIR_AUTOFREE(char *) rawio = NULL; - VIR_AUTOFREE(char *) sgio = NULL; - VIR_AUTOFREE(char *) target = NULL; - VIR_AUTOFREE(char *) bus = NULL; - VIR_AUTOFREE(char *) devaddr = NULL; - VIR_AUTOFREE(char *) serial = NULL; - VIR_AUTOFREE(char *) startupPolicy = NULL; - VIR_AUTOFREE(char *) tray = NULL; - VIR_AUTOFREE(char *) removable = NULL; - VIR_AUTOFREE(char *) logical_block_size = NULL; - VIR_AUTOFREE(char *) physical_block_size = NULL; - VIR_AUTOFREE(char *) wwn = NULL; - VIR_AUTOFREE(char *) vendor = NULL; - VIR_AUTOFREE(char *) product = NULL; - VIR_AUTOFREE(char *) domain_name = NULL; + g_autofree char *tmp = NULL; + g_autofree char *snapshot = NULL; + g_autofree char *rawio = NULL; + g_autofree char *sgio = NULL; + g_autofree char *target = NULL; + g_autofree char *bus = NULL; + g_autofree char *devaddr = NULL; + g_autofree char *serial = NULL; + g_autofree char *startupPolicy = NULL; + g_autofree char *tray = NULL; + g_autofree char *removable = NULL; + g_autofree char *logical_block_size = NULL; + g_autofree char *physical_block_size = NULL; + g_autofree char *wwn = NULL; + g_autofree char *vendor = NULL; + g_autofree char *product = NULL; + g_autofree char *domain_name = NULL; if (!(def = virDomainDiskDefNew(xmlopt))) return NULL; @@ -10406,9 +10406,9 @@ virDomainParseScaledValue(const char *xpath, bool required) { unsigned long long bytes; - VIR_AUTOFREE(char *) xpath_full = NULL; - VIR_AUTOFREE(char *) unit = NULL; - VIR_AUTOFREE(char *) bytes_str = NULL; + g_autofree char *xpath_full = NULL; + g_autofree char *unit = NULL; + g_autofree char *bytes_str = NULL; *val = 0; if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) @@ -10653,21 +10653,21 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt, int ports = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); int rc; - VIR_AUTOFREE(char *) typeStr = NULL; - VIR_AUTOFREE(char *) idx = NULL; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) queues = NULL; - VIR_AUTOFREE(char *) cmd_per_lun = NULL; - VIR_AUTOFREE(char *) max_sectors = NULL; - VIR_AUTOFREE(char *) modelName = NULL; - VIR_AUTOFREE(char *) chassisNr = NULL; - VIR_AUTOFREE(char *) chassis = NULL; - VIR_AUTOFREE(char *) port = NULL; - VIR_AUTOFREE(char *) busNr = NULL; - VIR_AUTOFREE(char *) targetIndex = NULL; - VIR_AUTOFREE(char *) ioeventfd = NULL; - VIR_AUTOFREE(char *) portsStr = NULL; - VIR_AUTOFREE(char *) iothread = NULL; + g_autofree char *typeStr = NULL; + g_autofree char *idx = NULL; + g_autofree char *model = NULL; + g_autofree char *queues = NULL; + g_autofree char *cmd_per_lun = NULL; + g_autofree char *max_sectors = NULL; + g_autofree char *modelName = NULL; + g_autofree char *chassisNr = NULL; + g_autofree char *chassis = NULL; + g_autofree char *port = NULL; + g_autofree char *busNr = NULL; + g_autofree char *targetIndex = NULL; + g_autofree char *ioeventfd = NULL; + g_autofree char *portsStr = NULL; + g_autofree char *iothread = NULL; ctxt->node = node; @@ -10806,7 +10806,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt, switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: { - VIR_AUTOFREE(char *) vectors = virXMLPropString(node, "vectors"); + g_autofree char *vectors = virXMLPropString(node, "vectors"); def->opts.vioserial.ports = ports; if (vectors) { @@ -10974,7 +10974,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt, } break; case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: { - VIR_AUTOFREE(char *) gntframes = virXMLPropString(node, "maxGrantFrames"); + g_autofree char *gntframes = virXMLPropString(node, "maxGrantFrames"); if (gntframes) { int r = virStrToLong_i(gntframes, NULL, 10, @@ -11022,16 +11022,16 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainFSDefPtr def; xmlNodePtr cur; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) fsdriver = NULL; - VIR_AUTOFREE(char *) source = NULL; - VIR_AUTOFREE(char *) target = NULL; - VIR_AUTOFREE(char *) format = NULL; - VIR_AUTOFREE(char *) accessmode = NULL; - VIR_AUTOFREE(char *) wrpolicy = NULL; - VIR_AUTOFREE(char *) usage = NULL; - VIR_AUTOFREE(char *) units = NULL; - VIR_AUTOFREE(char *) model = NULL; + g_autofree char *type = NULL; + g_autofree char *fsdriver = NULL; + g_autofree char *source = NULL; + g_autofree char *target = NULL; + g_autofree char *format = NULL; + g_autofree char *accessmode = NULL; + g_autofree char *wrpolicy = NULL; + g_autofree char *usage = NULL; + g_autofree char *units = NULL; + g_autofree char *model = NULL; ctxt->node = node; @@ -11207,11 +11207,11 @@ virDomainActualNetDefParseXML(xmlNodePtr node, xmlNodePtr bandwidth_node = NULL; xmlNodePtr vlanNode; xmlNodePtr virtPortNode; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) mode = NULL; - VIR_AUTOFREE(char *) addrtype = NULL; - VIR_AUTOFREE(char *) trustGuestRxFilters = NULL; - VIR_AUTOFREE(char *) macTableManager = NULL; + g_autofree char *type = NULL; + g_autofree char *mode = NULL; + g_autofree char *addrtype = NULL; + g_autofree char *trustGuestRxFilters = NULL; + g_autofree char *macTableManager = NULL; if (VIR_ALLOC(actual) < 0) return -1; @@ -11310,7 +11310,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } } else if (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE || actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - VIR_AUTOFREE(char *) class_id = NULL; + g_autofree char *class_id = NULL; xmlNodePtr sourceNode; class_id = virXPathString("string(./class/@id)", ctxt); @@ -11404,7 +11404,7 @@ virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, int tmpVal; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cur; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; ctxt->node = node; @@ -11463,43 +11463,43 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainChrSourceReconnectDef reconnect = {0}; int rv, val; - VIR_AUTOFREE(char *) macaddr = NULL; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) network = NULL; - VIR_AUTOFREE(char *) portgroup = NULL; - VIR_AUTOFREE(char *) portid = NULL; - VIR_AUTOFREE(char *) bridge = NULL; - VIR_AUTOFREE(char *) dev = NULL; - VIR_AUTOFREE(char *) ifname = NULL; - VIR_AUTOFREE(char *) managed_tap = NULL; - VIR_AUTOFREE(char *) ifname_guest = NULL; - VIR_AUTOFREE(char *) ifname_guest_actual = NULL; - VIR_AUTOFREE(char *) script = NULL; - VIR_AUTOFREE(char *) address = NULL; - VIR_AUTOFREE(char *) port = NULL; - VIR_AUTOFREE(char *) localaddr = NULL; - VIR_AUTOFREE(char *) localport = NULL; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) backend = NULL; - VIR_AUTOFREE(char *) txmode = NULL; - VIR_AUTOFREE(char *) ioeventfd = NULL; - VIR_AUTOFREE(char *) event_idx = NULL; - VIR_AUTOFREE(char *) queues = NULL; - VIR_AUTOFREE(char *) rx_queue_size = NULL; - VIR_AUTOFREE(char *) tx_queue_size = NULL; - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) filter = NULL; - VIR_AUTOFREE(char *) internal = NULL; - VIR_AUTOFREE(char *) devaddr = NULL; - VIR_AUTOFREE(char *) mode = NULL; - VIR_AUTOFREE(char *) linkstate = NULL; - VIR_AUTOFREE(char *) addrtype = NULL; - VIR_AUTOFREE(char *) domain_name = NULL; - VIR_AUTOFREE(char *) vhostuser_mode = NULL; - VIR_AUTOFREE(char *) vhostuser_path = NULL; - VIR_AUTOFREE(char *) vhostuser_type = NULL; - VIR_AUTOFREE(char *) trustGuestRxFilters = NULL; - VIR_AUTOFREE(char *) vhost_path = NULL; + g_autofree char *macaddr = NULL; + g_autofree char *type = NULL; + g_autofree char *network = NULL; + g_autofree char *portgroup = NULL; + g_autofree char *portid = NULL; + g_autofree char *bridge = NULL; + g_autofree char *dev = NULL; + g_autofree char *ifname = NULL; + g_autofree char *managed_tap = NULL; + g_autofree char *ifname_guest = NULL; + g_autofree char *ifname_guest_actual = NULL; + g_autofree char *script = NULL; + g_autofree char *address = NULL; + g_autofree char *port = NULL; + g_autofree char *localaddr = NULL; + g_autofree char *localport = NULL; + g_autofree char *model = NULL; + g_autofree char *backend = NULL; + g_autofree char *txmode = NULL; + g_autofree char *ioeventfd = NULL; + g_autofree char *event_idx = NULL; + g_autofree char *queues = NULL; + g_autofree char *rx_queue_size = NULL; + g_autofree char *tx_queue_size = NULL; + g_autofree char *str = NULL; + g_autofree char *filter = NULL; + g_autofree char *internal = NULL; + g_autofree char *devaddr = NULL; + g_autofree char *mode = NULL; + g_autofree char *linkstate = NULL; + g_autofree char *addrtype = NULL; + g_autofree char *domain_name = NULL; + g_autofree char *vhostuser_mode = NULL; + g_autofree char *vhostuser_path = NULL; + g_autofree char *vhostuser_type = NULL; + g_autofree char *trustGuestRxFilters = NULL; + g_autofree char *vhost_path = NULL; if (!(def = virDomainNetDefNew(xmlopt))) return NULL; @@ -12359,11 +12359,11 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, { xmlNodePtr child; unsigned int port; - VIR_AUTOFREE(char *) targetType = virXMLPropString(cur, "type"); - VIR_AUTOFREE(char *) targetModel = NULL; - VIR_AUTOFREE(char *) addrStr = NULL; - VIR_AUTOFREE(char *) portStr = NULL; - VIR_AUTOFREE(char *) stateStr = NULL; + g_autofree char *targetType = virXMLPropString(cur, "type"); + g_autofree char *targetModel = NULL; + g_autofree char *addrStr = NULL; + g_autofree char *portStr = NULL; + g_autofree char *stateStr = NULL; if ((def->targetType = virDomainChrTargetTypeFromString(def->deviceType, @@ -12495,7 +12495,7 @@ typedef enum { static int virDomainChrSourceDefParseMode(xmlNodePtr source) { - VIR_AUTOFREE(char *) mode = virXMLPropString(source, "mode"); + g_autofree char *mode = virXMLPropString(source, "mode"); if (!mode || STREQ(mode, "connect")) { return VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; @@ -12517,7 +12517,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def, { int mode; int tmpVal; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if ((mode = virDomainChrSourceDefParseMode(source)) < 0) return -1; @@ -12607,7 +12607,7 @@ static int virDomainChrSourceDefParseFile(virDomainChrSourceDefPtr def, xmlNodePtr source) { - VIR_AUTOFREE(char *) append = NULL; + g_autofree char *append = NULL; def->data.file.path = virXMLPropString(source, "path"); @@ -12627,7 +12627,7 @@ static int virDomainChrSourceDefParseProtocol(virDomainChrSourceDefPtr def, xmlNodePtr protocol) { - VIR_AUTOFREE(char *) prot = NULL; + g_autofree char *prot = NULL; if (def->type != VIR_DOMAIN_CHR_TYPE_TCP) return 0; @@ -12648,7 +12648,7 @@ static int virDomainChrSourceDefParseLog(virDomainChrSourceDefPtr def, xmlNodePtr log) { - VIR_AUTOFREE(char *) append = NULL; + g_autofree char *append = NULL; def->logfile = virXMLPropString(log, "file"); @@ -12910,7 +12910,7 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt, const char *nodeName; virDomainChrDefPtr def; bool seenTarget = false; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *type = NULL; if (!(def = virDomainChrDefNew(xmlopt))) return NULL; @@ -12994,8 +12994,8 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr cur; virDomainSmartcardDefPtr def; size_t i; - VIR_AUTOFREE(char *) mode = NULL; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *mode = NULL; + g_autofree char *type = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -13148,12 +13148,12 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainTPMDefPtr def; VIR_XPATH_NODE_AUTORESTORE(ctxt); int nbackends; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) backend = NULL; - VIR_AUTOFREE(char *) version = NULL; - VIR_AUTOFREE(char *) secretuuid = NULL; - VIR_AUTOFREE(xmlNodePtr *) backends = NULL; + g_autofree char *path = NULL; + g_autofree char *model = NULL; + g_autofree char *backend = NULL; + g_autofree char *version = NULL; + g_autofree char *secretuuid = NULL; + g_autofree xmlNodePtr *backends = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -13249,7 +13249,7 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr xmlopt, unsigned int flags) { virDomainPanicDefPtr panic; - VIR_AUTOFREE(char *) model = NULL; + g_autofree char *model = NULL; if (VIR_ALLOC(panic) < 0) return NULL; @@ -13285,10 +13285,10 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt, { VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainInputDefPtr def; - VIR_AUTOFREE(char *) evdev = NULL; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) bus = NULL; - VIR_AUTOFREE(char *) model = NULL; + g_autofree char *evdev = NULL; + g_autofree char *type = NULL; + g_autofree char *bus = NULL; + g_autofree char *model = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -13441,7 +13441,7 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xmlopt, unsigned int flags) { virDomainHubDefPtr def; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *type = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -13482,11 +13482,11 @@ virDomainTimerDefParseXML(xmlNodePtr node, VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr catchup; int ret; - VIR_AUTOFREE(char *) name = NULL; - VIR_AUTOFREE(char *) present = NULL; - VIR_AUTOFREE(char *) tickpolicy = NULL; - VIR_AUTOFREE(char *) track = NULL; - VIR_AUTOFREE(char *) mode = NULL; + g_autofree char *name = NULL; + g_autofree char *present = NULL; + g_autofree char *tickpolicy = NULL; + g_autofree char *track = NULL; + g_autofree char *mode = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -13602,8 +13602,8 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr def, int type) { - VIR_AUTOFREE(char *) validTo = NULL; - VIR_AUTOFREE(char *) connected = virXMLPropString(node, "connected"); + g_autofree char *validTo = NULL; + g_autofree char *connected = virXMLPropString(node, "connected"); def->passwd = virXMLPropString(node, "passwd"); @@ -13689,14 +13689,14 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, int ret = -1; const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); int tmp, typeVal; - VIR_AUTOFREE(char *) type = virXMLPropString(node, "type"); - VIR_AUTOFREE(char *) address = virXMLPropString(node, "address"); - VIR_AUTOFREE(char *) network = virXMLPropString(node, "network"); - VIR_AUTOFREE(char *) socketPath = virXMLPropString(node, "socket"); - VIR_AUTOFREE(char *) fromConfig = virXMLPropString(node, "fromConfig"); - VIR_AUTOFREE(char *) autoGenerated = virXMLPropString(node, "autoGenerated"); - VIR_AUTOFREE(char *) addressCompat = NULL; - VIR_AUTOFREE(char *) socketCompat = NULL; + g_autofree char *type = virXMLPropString(node, "type"); + g_autofree char *address = virXMLPropString(node, "address"); + g_autofree char *network = virXMLPropString(node, "network"); + g_autofree char *socketPath = virXMLPropString(node, "socket"); + g_autofree char *fromConfig = virXMLPropString(node, "fromConfig"); + g_autofree char *autoGenerated = virXMLPropString(node, "autoGenerated"); + g_autofree char *addressCompat = NULL; + g_autofree char *socketCompat = NULL; if (parent) { addressCompat = virXMLPropString(parent, "listen"); @@ -13835,8 +13835,8 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def, virDomainGraphicsListenDef newListen = {0}; int nListens; int ret = -1; - VIR_AUTOFREE(xmlNodePtr *) listenNodes = NULL; - VIR_AUTOFREE(char *) socketPath = NULL; + g_autofree xmlNodePtr *listenNodes = NULL; + g_autofree char *socketPath = NULL; ctxt->node = node; @@ -13912,11 +13912,11 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_AUTOFREE(char *) port = virXMLPropString(node, "port"); - VIR_AUTOFREE(char *) websocket = virXMLPropString(node, "websocket"); - VIR_AUTOFREE(char *) websocketGenerated = virXMLPropString(node, "websocketGenerated"); - VIR_AUTOFREE(char *) sharePolicy = virXMLPropString(node, "sharePolicy"); - VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport"); + g_autofree char *port = virXMLPropString(node, "port"); + g_autofree char *websocket = virXMLPropString(node, "websocket"); + g_autofree char *websocketGenerated = virXMLPropString(node, "websocketGenerated"); + g_autofree char *sharePolicy = virXMLPropString(node, "sharePolicy"); + g_autofree char *autoport = virXMLPropString(node, "autoport"); if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) return -1; @@ -13994,8 +13994,8 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def, int enableVal; xmlNodePtr glNode; int ret = -1; - VIR_AUTOFREE(char *) fullscreen = virXMLPropString(node, "fullscreen"); - VIR_AUTOFREE(char *) enable = NULL; + g_autofree char *fullscreen = virXMLPropString(node, "fullscreen"); + g_autofree char *enable = NULL; ctxt->node = node; @@ -14042,10 +14042,10 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDefPtr def, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_AUTOFREE(char *) port = virXMLPropString(node, "port"); - VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport"); - VIR_AUTOFREE(char *) replaceUser = virXMLPropString(node, "replaceUser"); - VIR_AUTOFREE(char *) multiUser = virXMLPropString(node, "multiUser"); + g_autofree char *port = virXMLPropString(node, "port"); + g_autofree char *autoport = virXMLPropString(node, "autoport"); + g_autofree char *replaceUser = virXMLPropString(node, "replaceUser"); + g_autofree char *multiUser = virXMLPropString(node, "multiUser"); if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) return -1; @@ -14085,7 +14085,7 @@ static int virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDefPtr def, xmlNodePtr node) { - VIR_AUTOFREE(char *) fullscreen = virXMLPropString(node, "fullscreen"); + g_autofree char *fullscreen = virXMLPropString(node, "fullscreen"); if (fullscreen != NULL) { if (virStringParseYesNo(fullscreen, &def->data.desktop.fullscreen) < 0) { @@ -14111,10 +14111,10 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, { xmlNodePtr cur; int defaultModeVal; - VIR_AUTOFREE(char *) port = virXMLPropString(node, "port"); - VIR_AUTOFREE(char *) tlsPort = virXMLPropString(node, "tlsPort"); - VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport"); - VIR_AUTOFREE(char *) defaultMode = virXMLPropString(node, "defaultMode"); + g_autofree char *port = virXMLPropString(node, "port"); + g_autofree char *tlsPort = virXMLPropString(node, "tlsPort"); + g_autofree char *autoport = virXMLPropString(node, "autoport"); + g_autofree char *defaultMode = virXMLPropString(node, "defaultMode"); if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) return -1; @@ -14175,8 +14175,8 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, if (cur->type == XML_ELEMENT_NODE) { if (virXMLNodeNameEqual(cur, "channel")) { int nameval, modeval; - VIR_AUTOFREE(char *) name = NULL; - VIR_AUTOFREE(char *) mode = NULL; + g_autofree char *name = NULL; + g_autofree char *mode = NULL; name = virXMLPropString(cur, "name"); mode = virXMLPropString(cur, "mode"); @@ -14203,7 +14203,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.channels[nameval] = modeval; } else if (virXMLNodeNameEqual(cur, "image")) { int compressionVal; - VIR_AUTOFREE(char *) compression = virXMLPropString(cur, "compression"); + g_autofree char *compression = virXMLPropString(cur, "compression"); if (!compression) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -14222,7 +14222,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.image = compressionVal; } else if (virXMLNodeNameEqual(cur, "jpeg")) { int compressionVal; - VIR_AUTOFREE(char *) compression = virXMLPropString(cur, "compression"); + g_autofree char *compression = virXMLPropString(cur, "compression"); if (!compression) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -14241,7 +14241,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.jpeg = compressionVal; } else if (virXMLNodeNameEqual(cur, "zlib")) { int compressionVal; - VIR_AUTOFREE(char *) compression = virXMLPropString(cur, "compression"); + g_autofree char *compression = virXMLPropString(cur, "compression"); if (!compression) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -14260,7 +14260,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.zlib = compressionVal; } else if (virXMLNodeNameEqual(cur, "playback")) { int compressionVal; - VIR_AUTOFREE(char *) compression = virXMLPropString(cur, "compression"); + g_autofree char *compression = virXMLPropString(cur, "compression"); if (!compression) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -14278,7 +14278,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.playback = compressionVal; } else if (virXMLNodeNameEqual(cur, "streaming")) { int modeVal; - VIR_AUTOFREE(char *) mode = virXMLPropString(cur, "mode"); + g_autofree char *mode = virXMLPropString(cur, "mode"); if (!mode) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -14295,7 +14295,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.streaming = modeVal; } else if (virXMLNodeNameEqual(cur, "clipboard")) { int copypasteVal; - VIR_AUTOFREE(char *) copypaste = virXMLPropString(cur, "copypaste"); + g_autofree char *copypaste = virXMLPropString(cur, "copypaste"); if (!copypaste) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -14313,7 +14313,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.copypaste = copypasteVal; } else if (virXMLNodeNameEqual(cur, "filetransfer")) { int enableVal; - VIR_AUTOFREE(char *) enable = virXMLPropString(cur, "enable"); + g_autofree char *enable = virXMLPropString(cur, "enable"); if (!enable) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -14331,8 +14331,8 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, def->data.spice.filetransfer = enableVal; } else if (virXMLNodeNameEqual(cur, "gl")) { int enableVal; - VIR_AUTOFREE(char *) enable = virXMLPropString(cur, "enable"); - VIR_AUTOFREE(char *) rendernode = virXMLPropString(cur, "rendernode"); + g_autofree char *enable = virXMLPropString(cur, "enable"); + g_autofree char *rendernode = virXMLPropString(cur, "rendernode"); if (!enable) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -14352,7 +14352,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, } else if (virXMLNodeNameEqual(cur, "mouse")) { int modeVal; - VIR_AUTOFREE(char *) mode = virXMLPropString(cur, "mode"); + g_autofree char *mode = virXMLPropString(cur, "mode"); if (!mode) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -14439,7 +14439,7 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr xmlopt, { virDomainGraphicsDefPtr def; int typeVal; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *type = NULL; if (!(def = virDomainGraphicsDefNew(xmlopt))) return NULL; @@ -14501,7 +14501,7 @@ static virDomainSoundCodecDefPtr virDomainSoundCodecDefParseXML(xmlNodePtr node) { virDomainSoundCodecDefPtr def; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *type = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -14531,7 +14531,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt, { virDomainSoundDefPtr def; VIR_XPATH_NODE_AUTORESTORE(ctxt); - VIR_AUTOFREE(char *) model = NULL; + g_autofree char *model = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -14548,7 +14548,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt, if (def->model == VIR_DOMAIN_SOUND_MODEL_ICH6 || def->model == VIR_DOMAIN_SOUND_MODEL_ICH9) { int ncodecs; - VIR_AUTOFREE(xmlNodePtr *) codecNodes = NULL; + g_autofree xmlNodePtr *codecNodes = NULL; /* parse the <codec> subelements for sound models that support it */ ncodecs = virXPathNodeSet("./codec", ctxt, &codecNodes); @@ -14591,8 +14591,8 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt, unsigned int flags) { virDomainWatchdogDefPtr def; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) action = NULL; + g_autofree char *model = NULL; + g_autofree char *action = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -14644,10 +14644,10 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainRNGDefPtr def; VIR_XPATH_NODE_AUTORESTORE(ctxt); int nbackends; - VIR_AUTOFREE(xmlNodePtr *) backends = NULL; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) backend = NULL; - VIR_AUTOFREE(char *) type = NULL; + g_autofree xmlNodePtr *backends = NULL; + g_autofree char *model = NULL; + g_autofree char *backend = NULL; + g_autofree char *type = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -14757,8 +14757,8 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainMemballoonDefPtr def; VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned int period = 0; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) deflate = NULL; + g_autofree char *model = NULL; + g_autofree char *deflate = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -14844,7 +14844,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr msi = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr server = NULL; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -14998,7 +14998,7 @@ virSysinfoSystemParseXML(xmlNodePtr node, VIR_XPATH_NODE_AUTORESTORE(ctxt); int ret = -1; virSysinfoSystemDefPtr def; - VIR_AUTOFREE(char *) tmpUUID = NULL; + g_autofree char *tmpUUID = NULL; ctxt->node = node; @@ -15073,8 +15073,8 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, size_t i, nboards = 0; VIR_XPATH_NODE_AUTORESTORE(ctxt); int n; - VIR_AUTOFREE(virSysinfoBaseBoardDefPtr) boards = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree virSysinfoBaseBoardDefPtr boards = NULL; + g_autofree xmlNodePtr *nodes = NULL; if ((n = virXPathNodeSet("./baseBoard", ctxt, &nodes)) < 0) return ret; @@ -15126,7 +15126,7 @@ virSysinfoOEMStringsParseXML(xmlNodePtr node, virSysinfoOEMStringsDefPtr def; int nstrings; size_t i; - VIR_AUTOFREE(xmlNodePtr *) strings = NULL; + g_autofree xmlNodePtr *strings = NULL; ctxt->node = node; @@ -15207,7 +15207,7 @@ virSysinfoParseXML(xmlNodePtr node, { virSysinfoDefPtr def; xmlNodePtr tmpnode; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *type = NULL; if (!virXMLNodeNameEqual(node, "sysinfo")) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -15358,9 +15358,9 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) xmlNodePtr cur; virDomainVideoAccelDefPtr def; int val; - VIR_AUTOFREE(char *) accel2d = NULL; - VIR_AUTOFREE(char *) accel3d = NULL; - VIR_AUTOFREE(char *) rendernode = NULL; + g_autofree char *accel2d = NULL; + g_autofree char *accel3d = NULL; + g_autofree char *rendernode = NULL; cur = node->children; while (cur != NULL) { @@ -15412,7 +15412,7 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node) xmlNodePtr cur; virDomainVideoDriverDefPtr def; int val; - VIR_AUTOFREE(char *) vgaconf = NULL; + g_autofree char *vgaconf = NULL; cur = node->children; while (cur != NULL) { @@ -15452,14 +15452,14 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainVideoDefPtr def; xmlNodePtr cur; VIR_XPATH_NODE_AUTORESTORE(ctxt); - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) driver_name = NULL; - VIR_AUTOFREE(char *) heads = NULL; - VIR_AUTOFREE(char *) vram = NULL; - VIR_AUTOFREE(char *) vram64 = NULL; - VIR_AUTOFREE(char *) ram = NULL; - VIR_AUTOFREE(char *) vgamem = NULL; - VIR_AUTOFREE(char *) primary = NULL; + g_autofree char *type = NULL; + g_autofree char *driver_name = NULL; + g_autofree char *heads = NULL; + g_autofree char *vram = NULL; + g_autofree char *vram64 = NULL; + g_autofree char *ram = NULL; + g_autofree char *vgamem = NULL; + g_autofree char *primary = NULL; if (!(def = virDomainVideoDefNew(xmlopt))) return NULL; @@ -15594,8 +15594,8 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, { virDomainHostdevDefPtr def; VIR_XPATH_NODE_AUTORESTORE(ctxt); - VIR_AUTOFREE(char *) mode = virXMLPropString(node, "mode"); - VIR_AUTOFREE(char *) type = virXMLPropString(node, "type"); + g_autofree char *mode = virXMLPropString(node, "mode"); + g_autofree char *type = virXMLPropString(node, "type"); ctxt->node = node; @@ -15671,8 +15671,8 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt, { xmlNodePtr cur; virDomainRedirdevDefPtr def; - VIR_AUTOFREE(char *) bus = NULL; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *bus = NULL; + g_autofree char *type = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -15778,11 +15778,11 @@ static virDomainRedirFilterUSBDevDefPtr virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node) { virDomainRedirFilterUSBDevDefPtr def; - VIR_AUTOFREE(char *) class = NULL; - VIR_AUTOFREE(char *) vendor = NULL; - VIR_AUTOFREE(char *) product = NULL; - VIR_AUTOFREE(char *) version = NULL; - VIR_AUTOFREE(char *) allow = NULL; + g_autofree char *class = NULL; + g_autofree char *vendor = NULL; + g_autofree char *product = NULL; + g_autofree char *version = NULL; + g_autofree char *allow = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -15866,7 +15866,7 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, size_t i; VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainRedirFilterDefPtr def = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; if (VIR_ALLOC(def) < 0) goto error; @@ -15902,7 +15902,7 @@ virDomainEventActionParseXML(xmlXPathContextPtr ctxt, int defaultVal, virEventActionFromStringFunc convFunc) { - VIR_AUTOFREE(char *) tmp = virXPathString(xpath, ctxt); + g_autofree char *tmp = virXPathString(xpath, ctxt); if (tmp == NULL) { *val = defaultVal; @@ -15922,7 +15922,7 @@ virDomainPMStateParseXML(xmlXPathContextPtr ctxt, const char *xpath, int *val) { - VIR_AUTOFREE(char *) tmp = virXPathString(xpath, ctxt); + g_autofree char *tmp = virXPathString(xpath, ctxt); if (tmp) { *val = virTristateBoolTypeFromString(tmp); @@ -15942,8 +15942,8 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr perf, xmlNodePtr node) { int event; - VIR_AUTOFREE(char *) name = NULL; - VIR_AUTOFREE(char *) enabled = NULL; + g_autofree char *name = NULL; + g_autofree char *enabled = NULL; if (!(name = virXMLPropString(node, "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing perf event name")); @@ -15984,7 +15984,7 @@ virDomainPerfDefParseXML(virDomainDefPtr def, { size_t i; int n; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; if ((n = virXPathNodeSet("./perf/event", ctxt, &nodes)) < 0) return n; @@ -16005,7 +16005,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, int ret = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; - VIR_AUTOFREE(char *) nodemask = NULL; + g_autofree char *nodemask = NULL; switch ((virDomainMemoryModel) def->model) { case VIR_DOMAIN_MEMORY_MODEL_DIMM: @@ -16113,7 +16113,7 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainSEVDefPtr def; unsigned long policy; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *type = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -16181,7 +16181,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node; virDomainMemoryDefPtr def; int val; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -16257,8 +16257,8 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr driver; int val; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(virDomainIOMMUDefPtr) iommu = NULL; + g_autofree char *tmp = NULL; + g_autofree virDomainIOMMUDefPtr iommu = NULL; ctxt->node = node; @@ -16332,8 +16332,8 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cid; int val; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(virDomainVsockDefPtr) vsock = NULL; + g_autofree char *tmp = NULL; + g_autofree virDomainVsockDefPtr vsock = NULL; ctxt->node = node; @@ -16395,7 +16395,7 @@ virDomainDeviceDefParse(const char *xmlStr, VIR_AUTOPTR(xmlDoc) xml = NULL; xmlNodePtr node; VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; - VIR_AUTOFREE(virDomainDeviceDefPtr) dev = NULL; + g_autofree virDomainDeviceDefPtr dev = NULL; char *netprefix; if (!(xml = virXMLParseStringCtxt(xmlStr, _("(device_definition)"), &ctxt))) @@ -18004,7 +18004,7 @@ virDomainDefGetDefaultEmulator(virDomainDefPtr def, virCapsPtr caps) { char *retemu; - VIR_AUTOFREE(virCapsDomainDataPtr) capsdata = NULL; + g_autofree virCapsDomainDataPtr capsdata = NULL; if (!(capsdata = virCapabilitiesDomainDataLookup(caps, def->os.type, def->os.arch, def->virtType, NULL, NULL))) @@ -18023,8 +18023,8 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, xmlNodePtr node; size_t i; int n; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree char *tmp = NULL; + g_autofree xmlNodePtr *nodes = NULL; /* analysis of the boot devices */ if ((n = virXPathNodeSet("./os/boot", ctxt, &nodes)) < 0) @@ -18182,7 +18182,7 @@ static virDomainIOThreadIDDefPtr virDomainIOThreadIDDefParseXML(xmlNodePtr node) { virDomainIOThreadIDDefPtr iothrid; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (VIR_ALLOC(iothrid) < 0) return NULL; @@ -18216,8 +18216,8 @@ virDomainDefParseIOThreads(virDomainDefPtr def, size_t i; int n = 0; unsigned int iothreads = 0; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree char *tmp = NULL; + g_autofree xmlNodePtr *nodes = NULL; tmp = virXPathString("string(./iothreads[1])", ctxt); if (tmp && virStrToLong_uip(tmp, NULL, 10, &iothreads) < 0) { @@ -18266,7 +18266,7 @@ virDomainVcpuPinDefParseXML(virDomainDefPtr def, { virDomainVcpuDefPtr vcpu; unsigned int vcpuid; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (!(tmp = virXMLPropString(node, "vcpu"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing vcpu id in vcpupin")); @@ -18320,7 +18320,7 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node, { virDomainIOThreadIDDefPtr iothrid; unsigned int iothreadid; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; VIR_AUTOPTR(virBitmap) cpumask = NULL; if (!(tmp = virXMLPropString(node, "iothread"))) { @@ -18385,7 +18385,7 @@ static virBitmapPtr virDomainEmulatorPinDefParseXML(xmlNodePtr node) { virBitmapPtr ret = NULL; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; VIR_AUTOPTR(virBitmap) def = NULL; if (!(tmp = virXMLPropString(node, "cpuset"))) { @@ -18539,7 +18539,7 @@ virDomainHugepagesParseXML(xmlNodePtr node, { int ret = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); - VIR_AUTOFREE(char *) nodeset = NULL; + g_autofree char *nodeset = NULL; ctxt->node = node; @@ -18640,9 +18640,9 @@ virDomainLoaderDefParseXML(xmlNodePtr node, virDomainLoaderDefPtr loader, bool fwAutoSelect) { - VIR_AUTOFREE(char *) readonly_str = NULL; - VIR_AUTOFREE(char *) secure_str = NULL; - VIR_AUTOFREE(char *) type_str = NULL; + g_autofree char *readonly_str = NULL; + g_autofree char *secure_str = NULL; + g_autofree char *type_str = NULL; secure_str = virXMLPropString(node, "secure"); @@ -18688,7 +18688,7 @@ virDomainSchedulerParseCommonAttrs(xmlNodePtr node, int *priority) { int pol = 0; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (!(tmp = virXMLPropString(node, "scheduler"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -18728,7 +18728,7 @@ static int virDomainEmulatorSchedParse(xmlNodePtr node, virDomainDefPtr def) { - VIR_AUTOFREE(virDomainThreadSchedParamPtr) sched = NULL; + g_autofree virDomainThreadSchedParamPtr sched = NULL; if (VIR_ALLOC(sched) < 0) return -1; @@ -18750,7 +18750,7 @@ virDomainSchedulerParse(xmlNodePtr node, int *priority) { virBitmapPtr ret = NULL; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (!(tmp = virXMLPropString(node, name))) { virReportError(VIR_ERR_XML_ERROR, @@ -18861,8 +18861,8 @@ virDomainVcpuParse(virDomainDefPtr def, size_t i; unsigned int maxvcpus; unsigned int vcpus; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree char *tmp = NULL; + g_autofree xmlNodePtr *nodes = NULL; vcpus = maxvcpus = 1; @@ -19004,8 +19004,8 @@ virDomainDefParseBootOptions(virDomainDefPtr def, char *name = NULL; size_t i; int n; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree char *tmp = NULL; /* * Booting options for different OS types.... @@ -19078,7 +19078,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def, def->os.type == VIR_DOMAIN_OSTYPE_XENPVH || def->os.type == VIR_DOMAIN_OSTYPE_HVM || def->os.type == VIR_DOMAIN_OSTYPE_UML) { - VIR_AUTOFREE(char *) firmware = NULL; + g_autofree char *firmware = NULL; xmlNodePtr loader_node; def->os.kernel = virXPathString("string(./os/kernel[1])", ctxt); @@ -19162,7 +19162,7 @@ virDomainResctrlParseVcpus(virDomainDefPtr def, xmlNodePtr node, virBitmapPtr *vcpus) { - VIR_AUTOFREE(char *) vcpus_str = NULL; + g_autofree char *vcpus_str = NULL; vcpus_str = virXMLPropString(node, "vcpus"); if (!vcpus_str) { @@ -19221,7 +19221,7 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt, int type; unsigned long long size; int ret = -1; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; ctxt->node = node; @@ -19368,9 +19368,9 @@ virDomainResctrlMonDefParse(virDomainDefPtr def, int n = 0; int rv = -1; int ret = -1; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(char *) id = NULL; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree char *tmp = NULL; + g_autofree char *id = NULL; ctxt->node = node; @@ -19470,8 +19470,8 @@ virDomainResctrlNew(xmlNodePtr node, { virDomainResctrlDefPtr resctrl = NULL; virDomainResctrlDefPtr ret = NULL; - VIR_AUTOFREE(char *) vcpus_str = NULL; - VIR_AUTOFREE(char *) alloc_id = NULL; + g_autofree char *vcpus_str = NULL; + g_autofree char *alloc_id = NULL; /* We need to format it back because we need to be consistent in the naming * even when users specify some "sub-optimal" string there. */ @@ -19525,7 +19525,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def, int n; int ret = -1; VIR_AUTOPTR(virBitmap) vcpus = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; ctxt->node = node; @@ -19590,10 +19590,10 @@ virDomainDefParseCaps(virDomainDefPtr def, virCapsPtr caps, unsigned int flags) { - VIR_AUTOFREE(char *) virttype = NULL; - VIR_AUTOFREE(char *) arch = NULL; - VIR_AUTOFREE(char *) ostype = NULL; - VIR_AUTOFREE(virCapsDomainDataPtr) capsdata = NULL; + g_autofree char *virttype = NULL; + g_autofree char *arch = NULL; + g_autofree char *ostype = NULL; + g_autofree virCapsDomainDataPtr capsdata = NULL; virttype = virXPathString("string(./@type)", ctxt); ostype = virXPathString("string(./os/type[1])", ctxt); @@ -19675,7 +19675,7 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr ctxt, unsigned int id; unsigned int bandwidth; int ret = -1; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; ctxt->node = node; @@ -19723,7 +19723,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainResctrlDefPtr resctrl = NULL; VIR_AUTOPTR(virBitmap) vcpus = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; ssize_t i = 0; int n; @@ -19795,11 +19795,11 @@ virDomainDefParseXML(xmlDocPtr xml, bool usb_other = false; bool usb_master = false; char *netprefix = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree char *tmp = NULL; if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { - VIR_AUTOFREE(char *) schema = NULL; + g_autofree char *schema = NULL; schema = virFileFindResource("domain.rng", abs_top_srcdir "/docs/schemas", @@ -21512,8 +21512,8 @@ virDomainObjParseXML(xmlDocPtr xml, int state; int reason = 0; void *parseOpaque = NULL; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree char *tmp = NULL; + g_autofree xmlNodePtr *nodes = NULL; if (!(obj = virDomainObjNew(xmlopt))) return NULL; @@ -22383,8 +22383,8 @@ virDomainChannelDefCheckABIStability(virDomainChrDefPtr src, case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: if (memcmp(src->target.addr, dst->target.addr, sizeof(*src->target.addr)) != 0) { - VIR_AUTOFREE(char *) saddr = virSocketAddrFormatFull(src->target.addr, true, ":"); - VIR_AUTOFREE(char *) daddr = virSocketAddrFormatFull(dst->target.addr, true, ":"); + g_autofree char *saddr = virSocketAddrFormatFull(src->target.addr, true, ":"); + g_autofree char *daddr = virSocketAddrFormatFull(dst->target.addr, true, ":"); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target channel addr %s does not match source %s"), NULLSTR(daddr), NULLSTR(saddr)); @@ -23160,8 +23160,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, { size_t i; virErrorPtr err; - VIR_AUTOFREE(char *) strSrc = NULL; - VIR_AUTOFREE(char *) strDst = NULL; + g_autofree char *strSrc = NULL; + g_autofree char *strDst = NULL; if (src->virtType != dst->virtType) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -24089,7 +24089,7 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf, unsigned int flags) { size_t n; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; virBufferAsprintf(attrBuf, " protocol='%s'", virStorageNetProtocolTypeToString(src->protocol)); @@ -25684,9 +25684,9 @@ virDomainNetDefFormat(virBufferPtr buf, virDomainNetGetModelString(def)); if (virDomainNetIsVirtioModel(def)) { int rc = 0; - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) gueststr = NULL; - VIR_AUTOFREE(char *) hoststr = NULL; + g_autofree char *str = NULL; + g_autofree char *gueststr = NULL; + g_autofree char *hoststr = NULL; if (virDomainVirtioNetDriverFormat(&str, def) < 0 || virDomainVirtioNetGuestOptsFormat(&gueststr, def) < 0 || @@ -25926,7 +25926,7 @@ virDomainChrTargetDefFormat(virBufferPtr buf, switch (def->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: { int port = virSocketAddrGetPort(def->target.addr); - VIR_AUTOFREE(char *) addr = NULL; + g_autofree char *addr = NULL; if (port < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to format guestfwd port")); @@ -26463,7 +26463,7 @@ static int virDomainMemorySourceDefFormat(virBufferPtr buf, virDomainMemoryDefPtr def) { - VIR_AUTOFREE(char *) bitmap = NULL; + g_autofree char *bitmap = NULL; if (!def->pagesize && !def->sourceNodes && !def->nvdimmPath) return 0; @@ -27428,7 +27428,7 @@ virDomainHugepagesFormatBuf(virBufferPtr buf, hugepage->size); if (hugepage->nodemask) { - VIR_AUTOFREE(char *) nodeset = NULL; + g_autofree char *nodeset = NULL; if (!(nodeset = virBitmapFormat(hugepage->nodemask))) return -1; virBufferAsprintf(buf, " nodeset='%s'", nodeset); @@ -27629,7 +27629,7 @@ virDomainResctrlMonDefFormatHelper(virDomainResctrlMonDefPtr domresmon, virResctrlMonitorType tag, virBufferPtr buf) { - VIR_AUTOFREE(char *) vcpus = NULL; + g_autofree char *vcpus = NULL; if (domresmon->tag != tag) return 0; @@ -27659,7 +27659,7 @@ virDomainCachetuneDefFormat(virBufferPtr buf, g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; size_t i = 0; int ret = -1; - VIR_AUTOFREE(char *) vcpus = NULL; + g_autofree char *vcpus = NULL; virBufferSetChildIndent(&childrenBuf, buf); if (virResctrlAllocForeachCache(resctrl->alloc, @@ -27727,7 +27727,7 @@ virDomainMemorytuneDefFormat(virBufferPtr buf, { g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; int ret = -1; - VIR_AUTOFREE(char *) vcpus = NULL; + g_autofree char *vcpus = NULL; virBufferSetChildIndent(&childrenBuf, buf); if (virResctrlAllocForeachMemory(resctrl->alloc, @@ -27902,7 +27902,7 @@ virDomainCpuDefFormat(virBufferPtr buf, { virDomainVcpuDefPtr vcpu; size_t i; - VIR_AUTOFREE(char *) cpumask = NULL; + g_autofree char *cpumask = NULL; virBufferAddLit(buf, "<vcpu"); virBufferAsprintf(buf, " placement='%s'", @@ -29160,7 +29160,7 @@ virDomainSaveXML(const char *configDir, const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - VIR_AUTOFREE(char *) configFile = NULL; + g_autofree char *configFile = NULL; if (!configDir) return 0; @@ -29186,7 +29186,7 @@ virDomainSaveConfig(const char *configDir, virCapsPtr caps, virDomainDefPtr def) { - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; if (!(xml = virDomainDefFormat(def, caps, VIR_DOMAIN_DEF_FORMAT_SECURE))) return -1; @@ -29206,7 +29206,7 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES | VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST); - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; if (!(xml = virDomainObjFormat(xmlopt, obj, caps, flags))) return -1; @@ -29220,8 +29220,8 @@ virDomainDeleteConfig(const char *configDir, const char *autostartDir, virDomainObjPtr dom) { - VIR_AUTOFREE(char *) configFile = NULL; - VIR_AUTOFREE(char *) autostartLink = NULL; + g_autofree char *configFile = NULL; + g_autofree char *autostartLink = NULL; if ((configFile = virDomainConfigFile(configDir, dom->def->name)) == NULL) return -1; @@ -29506,7 +29506,7 @@ virDomainDefCopy(virDomainDefPtr src, unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; if (migratable) format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_MIGRATABLE; @@ -29983,7 +29983,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, int flags = VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_SECURE; int rc = -1; char *netprefix; - VIR_AUTOFREE(char *) xmlStr = NULL; + g_autofree char *xmlStr = NULL; switch ((virDomainDeviceType) src->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -30397,7 +30397,7 @@ virDomainDefGetShortName(const virDomainDef *def) wchar_t wshortname[VIR_DOMAIN_SHORT_NAME_MAX + 1] = {0}; size_t len = 0; char *ret = NULL; - VIR_AUTOFREE(char *) shortname = NULL; + g_autofree char *shortname = NULL; /* No need to do the whole conversion thing when there are no multibyte * characters. The same applies for illegal sequences as they can occur @@ -30939,7 +30939,7 @@ virDomainNetCreatePort(virConnectPtr conn, VIR_AUTOUNREF(virNetworkPtr) net = NULL; VIR_AUTOPTR(virNetworkPortDef) portdef = NULL; VIR_AUTOUNREF(virNetworkPortPtr) port = NULL; - VIR_AUTOFREE(char *) portxml = NULL; + g_autofree char *portxml = NULL; if (!(net = virNetworkLookupByName(conn, iface->data.network.name))) return -1; @@ -31155,7 +31155,7 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) { virNetworkDefPtr def = NULL; int ret = -1; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; VIR_AUTOUNREF(virConnectPtr) conn = NULL; VIR_AUTOUNREF(virNetworkPtr) net = NULL; @@ -31343,7 +31343,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def) { virStorageVolInfo info; VIR_AUTOPTR(virStoragePoolDef) pooldef = NULL; - VIR_AUTOFREE(char *) poolxml = NULL; + g_autofree char *poolxml = NULL; VIR_AUTOUNREF(virConnectPtr) conn = NULL; VIR_AUTOUNREF(virStoragePoolPtr) pool = NULL; VIR_AUTOUNREF(virStorageVolPtr) vol = NULL; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index da61c6917e..cb2aeea172 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -133,8 +133,8 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) { VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; VIR_AUTOPTR(virSecretDef) def = NULL; - VIR_AUTOFREE(char *) prop = NULL; - VIR_AUTOFREE(char *) uuidstr = NULL; + g_autofree char *prop = NULL; + g_autofree char *uuidstr = NULL; if (!virXMLNodeNameEqual(root, "secret")) { virReportError(VIR_ERR_XML_ERROR, diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index a77f521302..184dec5e77 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -437,7 +437,7 @@ virDomainSnapshotDefParseNode(xmlDocPtr xml, } if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE) { - VIR_AUTOFREE(char *) schema = NULL; + g_autofree char *schema = NULL; schema = virFileFindResource("domainsnapshot.rng", abs_top_srcdir "/docs/schemas", diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2658f80e33..b0bb9d2b8e 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -535,10 +535,10 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, virStoragePoolOptionsPtr options; int n; VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; - VIR_AUTOFREE(char *) port = NULL; - VIR_AUTOFREE(char *) ver = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodeset = NULL; - VIR_AUTOFREE(char *) sourcedir = NULL; + g_autofree char *port = NULL; + g_autofree char *ver = NULL; + g_autofree xmlNodePtr *nodeset = NULL; + g_autofree char *sourcedir = NULL; relnode = ctxt->node; ctxt->node = node; @@ -554,7 +554,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, } if (options->formatFromString) { - VIR_AUTOFREE(char *) format = NULL; + g_autofree char *format = NULL; format = virXPathString("string(./format/@type)", ctxt); if (format == NULL) @@ -607,7 +607,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, goto cleanup; for (i = 0; i < nsource; i++) { - VIR_AUTOFREE(char *) partsep = NULL; + g_autofree char *partsep = NULL; virStoragePoolSourceDevice dev = { .path = NULL }; dev.path = virXMLPropString(nodeset[i], "path"); @@ -731,7 +731,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, int ret = -1; xmlNodePtr relnode; xmlNodePtr node; - VIR_AUTOFREE(char *) mode = NULL; + g_autofree char *mode = NULL; node = virXPathNode(permxpath, ctxt); if (node == NULL) { @@ -802,8 +802,8 @@ static int virStoragePoolDefRefreshParse(xmlXPathContextPtr ctxt, virStoragePoolDefPtr def) { - VIR_AUTOFREE(virStoragePoolDefRefreshPtr) refresh = NULL; - VIR_AUTOFREE(char *) allocation = NULL; + g_autofree virStoragePoolDefRefreshPtr refresh = NULL; + g_autofree char *allocation = NULL; int tmp; allocation = virXPathString("string(./refresh/volume/@allocation)", ctxt); @@ -850,9 +850,9 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) virStoragePoolDefPtr ret = NULL; xmlNodePtr source_node; VIR_AUTOPTR(virStoragePoolDef) def = NULL; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) uuid = NULL; - VIR_AUTOFREE(char *) target_path = NULL; + g_autofree char *type = NULL; + g_autofree char *uuid = NULL; + g_autofree char *target_path = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -1279,12 +1279,12 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, size_t i; int n; VIR_AUTOPTR(virStorageVolDef) def = NULL; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) allocation = NULL; - VIR_AUTOFREE(char *) capacity = NULL; - VIR_AUTOFREE(char *) unit = NULL; - VIR_AUTOFREE(char *) backingStore = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree char *type = NULL; + g_autofree char *allocation = NULL; + g_autofree char *capacity = NULL; + g_autofree char *unit = NULL; + g_autofree char *backingStore = NULL; + g_autofree xmlNodePtr *nodes = NULL; virCheckFlags(VIR_VOL_XML_PARSE_NO_CAPACITY | VIR_VOL_XML_PARSE_OPT_CAPACITY, NULL); @@ -1328,7 +1328,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, backingStore = NULL; if (options->formatFromString) { - VIR_AUTOFREE(char *) format = NULL; + g_autofree char *format = NULL; format = virXPathString("string(./backingStore/format/@type)", ctxt); if (format == NULL) @@ -1375,7 +1375,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, def->target.path = virXPathString("string(./target/path)", ctxt); if (options->formatFromString) { - VIR_AUTOFREE(char *) format = NULL; + g_autofree char *format = NULL; format = virXPathString("string(./target/format/@type)", ctxt); if (format == NULL) @@ -1708,7 +1708,7 @@ virStoragePoolSaveState(const char *stateFile, virStoragePoolDefPtr def) { virBuffer buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; virBufferAddLit(&buf, "<poolstate>\n"); virBufferAdjustIndent(&buf, 2); @@ -1736,7 +1736,7 @@ int virStoragePoolSaveConfig(const char *configFile, virStoragePoolDefPtr def) { - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; if (!(xml = virStoragePoolDefFormat(def))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 966956e719..94e598ddea 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1640,7 +1640,7 @@ virNetworkObjAddPort(virNetworkObjPtr net, const char *stateDir) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - VIR_AUTOFREE(char *) dir = NULL; + g_autofree char *dir = NULL; virUUIDFormat(portdef->uuid, uuidstr); @@ -1693,7 +1693,7 @@ virNetworkObjDeletePort(virNetworkObjPtr net, const char *stateDir) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - VIR_AUTOFREE(char *) dir = NULL; + g_autofree char *dir = NULL; virNetworkPortDefPtr portdef; virUUIDFormat(uuid, uuidstr); @@ -1722,7 +1722,7 @@ int virNetworkObjDeleteAllPorts(virNetworkObjPtr net, const char *stateDir) { - VIR_AUTOFREE(char *) dir = NULL; + g_autofree char *dir = NULL; DIR *dh = NULL; struct dirent *de; int rc; @@ -1881,7 +1881,7 @@ static int virNetworkObjLoadAllPorts(virNetworkObjPtr net, const char *stateDir) { - VIR_AUTOFREE(char *) dir = NULL; + g_autofree char *dir = NULL; DIR *dh = NULL; struct dirent *de; int ret = -1; diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 3e43da064e..43140198f8 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -76,18 +76,18 @@ static virNetworkPortDefPtr virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) { VIR_AUTOPTR(virNetworkPortDef) def = NULL; - VIR_AUTOFREE(char *) uuid = NULL; + g_autofree char *uuid = NULL; xmlNodePtr virtPortNode; xmlNodePtr vlanNode; xmlNodePtr bandwidthNode; xmlNodePtr addressNode; - VIR_AUTOFREE(char *) trustGuestRxFilters = NULL; - VIR_AUTOFREE(char *) mac = NULL; - VIR_AUTOFREE(char *) macmgr = NULL; - VIR_AUTOFREE(char *) mode = NULL; - VIR_AUTOFREE(char *) plugtype = NULL; - VIR_AUTOFREE(char *) managed = NULL; - VIR_AUTOFREE(char *) driver = NULL; + g_autofree char *trustGuestRxFilters = NULL; + g_autofree char *mac = NULL; + g_autofree char *macmgr = NULL; + g_autofree char *mode = NULL; + g_autofree char *plugtype = NULL; + g_autofree char *managed = NULL; + g_autofree char *driver = NULL; if (VIR_ALLOC(def) < 0) return NULL; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 70159a6613..7a52ab5d4f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1350,7 +1350,7 @@ x86ModelParseAncestor(virCPUx86ModelPtr model, xmlXPathContextPtr ctxt, virCPUx86MapPtr map) { - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *name = NULL; virCPUx86ModelPtr ancestor; int rc; @@ -1385,7 +1385,7 @@ static int x86ModelParseSignatures(virCPUx86ModelPtr model, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; xmlNodePtr root = ctxt->node; size_t i; int n; @@ -1436,7 +1436,7 @@ x86ModelParseVendor(virCPUx86ModelPtr model, xmlXPathContextPtr ctxt, virCPUx86MapPtr map) { - VIR_AUTOFREE(char *) vendor = NULL; + g_autofree char *vendor = NULL; int rc; if ((rc = virXPathBoolean("boolean(./vendor)", ctxt)) <= 0) @@ -1466,7 +1466,7 @@ x86ModelParseFeatures(virCPUx86ModelPtr model, xmlXPathContextPtr ctxt, virCPUx86MapPtr map) { - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; size_t i; int n; @@ -1474,7 +1474,7 @@ x86ModelParseFeatures(virCPUx86ModelPtr model, return n; for (i = 0; i < n; i++) { - VIR_AUTOFREE(char *) ftname = NULL; + g_autofree char *ftname = NULL; virCPUx86FeaturePtr feature; if (!(ftname = virXMLPropString(nodes[i], "name"))) { @@ -2120,7 +2120,7 @@ x86Decode(virCPUDefPtr cpu, virCPUx86Data features = VIR_CPU_X86_DATA_INIT; virCPUx86VendorPtr vendor; virDomainCapsCPUModelPtr hvModel = NULL; - VIR_AUTOFREE(char *) sigs = NULL; + g_autofree char *sigs = NULL; uint32_t signature; ssize_t i; int rc; diff --git a/src/driver.c b/src/driver.c index 4b526a73ae..125cf02890 100644 --- a/src/driver.c +++ b/src/driver.c @@ -86,7 +86,7 @@ int virDriverShouldAutostart(const char *dir, bool *autostart) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; *autostart = false; @@ -149,7 +149,7 @@ virGetConnectGeneric(virThreadLocalPtr threadPtr, const char *name) VIR_DEBUG("Return cached %s connection %p", name, conn); virObjectRef(conn); } else { - VIR_AUTOFREE(char *) uri = NULL; + g_autofree char *uri = NULL; const char *uriPath = geteuid() == 0 ? "/system" : "/session"; if (virAsprintf(&uri, "%s://%s", name, uriPath) < 0) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index a45d429973..00b5c00822 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -105,7 +105,7 @@ netcfStateInitialize(bool privileged, "%s/libvirt/interface", RUNSTATEDIR) < 0) goto error; } else { - VIR_AUTOFREE(char *) rundir = NULL; + g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto error; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1e5bf067fe..dcf22af440 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1184,7 +1184,7 @@ udevStateInitialize(bool privileged, "%s/libvirt/interface", RUNSTATEDIR) < 0) goto cleanup; } else { - VIR_AUTOFREE(char *) rundir = NULL; + g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 091473e698..adb783395a 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -122,7 +122,7 @@ getSocketPath(virURIPtr uri) } if (!sock_path) { - VIR_AUTOFREE(char *) sockbase = NULL; + g_autofree char *sockbase = NULL; bool legacy = false; if (!uri->scheme) { diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 9632604807..88d6189eae 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -180,7 +180,7 @@ xenConfigCopyStringOpt(virConfPtr conf, const char *name, char **value) static int xenConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) { - VIR_AUTOFREE(char *) string = NULL; + g_autofree char *string = NULL; int rc; if (!uuid || !name || !conf) { @@ -339,9 +339,9 @@ xenParseTimeOffset(virConfPtr conf, virDomainDefPtr def) static int xenParseEventsActions(virConfPtr conf, virDomainDefPtr def) { - VIR_AUTOFREE(char *) on_poweroff = NULL; - VIR_AUTOFREE(char *) on_reboot = NULL; - VIR_AUTOFREE(char *) on_crash = NULL; + g_autofree char *on_poweroff = NULL; + g_autofree char *on_reboot = NULL; + g_autofree char *on_crash = NULL; if (xenConfigGetString(conf, "on_poweroff", &on_poweroff, "destroy") < 0) return -1; @@ -504,8 +504,8 @@ xenParseCPUFeatures(virConfPtr conf, virDomainXMLOptionPtr xmlopt) { unsigned long count = 0; - VIR_AUTOFREE(char *) cpus = NULL; - VIR_AUTOFREE(char *) tsc_mode = NULL; + g_autofree char *cpus = NULL; + g_autofree char *tsc_mode = NULL; int val = 0; virDomainTimerDefPtr timer; @@ -915,7 +915,7 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat) virDomainChrDefPtr chr = NULL; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { - VIR_AUTOFREE(char *) parallel = NULL; + g_autofree char *parallel = NULL; int rc; if (xenConfigGetString(conf, "parallel", ¶llel, NULL) < 0) @@ -960,7 +960,7 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat) goto cleanup; } } else { - VIR_AUTOFREE(char *) serial = NULL; + g_autofree char *serial = NULL; if (xenHandleConfGetValueStringListErrors(rc) < 0) goto cleanup; @@ -1428,7 +1428,7 @@ xenParseSxprSound(virDomainDefPtr def, static int xenParseEmulatedDevices(virConfPtr conf, virDomainDefPtr def) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (xenConfigGetString(conf, "soundhw", &str, NULL) < 0) @@ -1447,7 +1447,7 @@ static int xenParseGeneralMeta(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) { virCapsDomainDataPtr capsdata = NULL; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; int ret = -1; if (xenConfigCopyString(conf, "name", &def->name) < 0) @@ -2375,7 +2375,7 @@ xenFormatSound(virConfPtr conf, virDomainDefPtr def) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char * model; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; size_t i; if (def->os.type != VIR_DOMAIN_OSTYPE_HVM || diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 9e3d307078..65c7a6c2d8 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -64,9 +64,9 @@ extern int xlu_disk_parse(XLU_Config *cfg, static int xenParseCmdline(virConfPtr conf, char **r_cmdline) { char *cmdline = NULL; - VIR_AUTOFREE(char *) root = NULL; - VIR_AUTOFREE(char *) extra = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *root = NULL; + g_autofree char *extra = NULL; + g_autofree char *buf = NULL; if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) return -1; @@ -105,8 +105,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) size_t i; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { - VIR_AUTOFREE(char *) bios = NULL; - VIR_AUTOFREE(char *) boot = NULL; + g_autofree char *bios = NULL; + g_autofree char *boot = NULL; int val = 0; if (xenConfigGetString(conf, "bios", &bios, NULL) < 0) @@ -259,7 +259,7 @@ xenTranslateCPUFeature(const char *feature_name, bool from_libxl) static int xenParseXLCPUID(virConfPtr conf, virDomainDefPtr def) { - VIR_AUTOFREE(char *) cpuid_str = NULL; + g_autofree char *cpuid_str = NULL; char **cpuid_pairs = NULL; char **name_and_value = NULL; size_t i; diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 0296e78ddc..086e438cbc 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -41,7 +41,7 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) size_t i; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { - VIR_AUTOFREE(char *) boot = NULL; + g_autofree char *boot = NULL; if (VIR_ALLOC(def->os.loader) < 0 || xenConfigCopyString(conf, "kernel", &def->os.loader->path) < 0) @@ -69,8 +69,8 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) def->os.nBootDevs++; } } else { - VIR_AUTOFREE(char *) extra = NULL; - VIR_AUTOFREE(char *) root = NULL; + g_autofree char *extra = NULL; + g_autofree char *root = NULL; if (xenConfigCopyStringOpt(conf, "bootloader", &def->os.bootloader) < 0) return -1; @@ -415,7 +415,7 @@ xenFormatXMDisks(virConfPtr conf, virDomainDefPtr def) static int xenParseXMInputDevs(virConfPtr conf, virDomainDefPtr def) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (xenConfigGetString(conf, "usbdevice", &str, NULL) < 0) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index f9d43a1b3e..7a3d1cc00e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -211,7 +211,7 @@ lxcSetRootfs(virDomainDefPtr def, virConfPtr properties) { int type = VIR_DOMAIN_FS_TYPE_MOUNT; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; if (virConfGetValueString(properties, "lxc.rootfs.path", &value) <= 0) { virResetLastError(); @@ -756,7 +756,7 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) static int lxcCreateConsoles(virDomainDefPtr def, virConfPtr properties) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; int nbttys = 0; virDomainChrDefPtr console; size_t i; @@ -841,7 +841,7 @@ lxcIdmapWalkCallback(const char *name, virConfValuePtr value, void *data) static int lxcSetMemTune(virDomainDefPtr def, virConfPtr properties) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; unsigned long long size = 0; if (virConfGetValueString(properties, @@ -877,7 +877,7 @@ lxcSetMemTune(virDomainDefPtr def, virConfPtr properties) static int lxcSetCpuTune(virDomainDefPtr def, virConfPtr properties) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; if (virConfGetValueString(properties, "lxc.cgroup.cpu.shares", &value) > 0) { @@ -911,7 +911,7 @@ lxcSetCpuTune(virDomainDefPtr def, virConfPtr properties) static int lxcSetCpusetTune(virDomainDefPtr def, virConfPtr properties) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; virBitmapPtr nodeset = NULL; if (virConfGetValueString(properties, "lxc.cgroup.cpuset.cpus", @@ -1033,7 +1033,7 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfValuePtr value, void *data) static int lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; if (virConfGetValueString(properties, "lxc.cgroup.blkio.weight", &value) > 0) { @@ -1053,7 +1053,7 @@ lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties) static void lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; char **toDrop = NULL; const char *capString; size_t i; @@ -1080,7 +1080,7 @@ lxcParseConfigString(const char *config, { virDomainDefPtr vmdef = NULL; VIR_AUTOPTR(virConf) properties = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; if (!(properties = virConfReadString(config, VIR_CONF_FLAG_LXC_FORMAT))) return NULL; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fe47668d4d..b3b4e8ab2c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -154,7 +154,7 @@ static int networkDnsmasqDefNamespaceParseOptions(networkDnsmasqXmlNsDefPtr nsdef, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; ssize_t nnodes; size_t i; @@ -676,9 +676,9 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED, } else if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) { - VIR_AUTOFREE(char *) name = NULL; - VIR_AUTOFREE(char *) old_owner = NULL; - VIR_AUTOFREE(char *) new_owner = NULL; + g_autofree char *name = NULL; + g_autofree char *old_owner = NULL; + g_autofree char *new_owner = NULL; if (virDBusMessageDecode(message, "sss", &name, &old_owner, &new_owner) < 0) { VIR_WARN("Failed to decode DBus NameOwnerChanged message"); @@ -1470,7 +1470,7 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, } else { /* IPv4 - dnsmasq requires a netmask rather than prefix */ virSocketAddr netmask; - VIR_AUTOFREE(char *) netmaskStr = NULL; + g_autofree char *netmaskStr = NULL; if (virSocketAddrPrefixToNetmask(prefix, &netmask, AF_INET) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 32e99bc830..4b5d806fa6 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -622,7 +622,7 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED, "%s/libvirt/nodedev", RUNSTATEDIR) < 0) goto failure; } else { - VIR_AUTOFREE(char *) rundir = NULL; + g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto failure; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 75cf576c3c..f6729308d7 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1833,7 +1833,7 @@ nodeStateInitialize(bool privileged, "%s/libvirt/nodedev", RUNSTATEDIR) < 0) goto cleanup; } else { - VIR_AUTOFREE(char *) rundir = NULL; + g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 599ca629e0..17e2ccc98f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -279,7 +279,7 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk, { qemuBlockNodeNameBackingChainDataPtr entry = NULL; virStorageSourcePtr src = disk->src; - VIR_AUTOFREE(char *) alias = NULL; + g_autofree char *alias = NULL; int ret = -1; /* don't attempt the detection if the top level already has node names */ @@ -473,7 +473,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, VIR_AUTOPTR(virJSONValue) server = NULL; const char *transport; const char *field; - VIR_AUTOFREE(char *) port = NULL; + g_autofree char *port = NULL; switch ((virStorageNetHostTransport) host->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: @@ -567,7 +567,7 @@ static virJSONValuePtr qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) { virJSONValuePtr ret = NULL; - VIR_AUTOFREE(char *) port = NULL; + g_autofree char *port = NULL; if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -697,7 +697,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src, const char *username = NULL; virJSONValuePtr ret = NULL; VIR_AUTOPTR(virURI) uri = NULL; - VIR_AUTOFREE(char *) uristr = NULL; + g_autofree char *uristr = NULL; /** * Common options: @@ -738,11 +738,11 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src, bool onlytarget) { qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - VIR_AUTOFREE(char *) target = NULL; + g_autofree char *target = NULL; char *lunStr = NULL; char *username = NULL; char *objalias = NULL; - VIR_AUTOFREE(char *) portal = NULL; + g_autofree char *portal = NULL; unsigned int lun = 0; virJSONValuePtr ret = NULL; @@ -1870,8 +1870,8 @@ qemuBlockSnapshotAddLegacy(virJSONValuePtr actions, bool reuse) { const char *format = virStorageFileFormatTypeToString(newsrc->format); - VIR_AUTOFREE(char *) device = NULL; - VIR_AUTOFREE(char *) source = NULL; + g_autofree char *device = NULL; + g_autofree char *source = NULL; if (!(device = qemuAliasDiskDriveFromDisk(disk))) return -1; @@ -1930,7 +1930,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src) int actualType = virStorageSourceGetActualType(src); VIR_AUTOPTR(virJSONValue) backingProps = NULL; VIR_AUTOPTR(virURI) uri = NULL; - VIR_AUTOFREE(char *) backingJSON = NULL; + g_autofree char *backingJSON = NULL; char *ret = NULL; if (virStorageSourceIsLocalStorage(src)) { @@ -1989,7 +1989,7 @@ qemuBlockStorageSourceCreateAddBacking(virStorageSourcePtr backing, virJSONValuePtr props, bool format) { - VIR_AUTOFREE(char *) backingFileStr = NULL; + g_autofree char *backingFileStr = NULL; const char *backingFormatStr = NULL; if (!virStorageSourceIsBacking(backing)) @@ -2046,7 +2046,7 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStorageSourcePtr src, { qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); VIR_AUTOPTR(virJSONValue) props = NULL; - VIR_AUTOFREE(char *) cipheralg = NULL; + g_autofree char *cipheralg = NULL; const char *keysecret = NULL; if (srcpriv && diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 89c28986b0..3d52cfe0ef 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -225,7 +225,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; - VIR_AUTOFREE(char *) jobname = NULL; + g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { if (virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->nodeformat) < 0) @@ -256,7 +256,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; - VIR_AUTOFREE(char *) jobname = NULL; + g_autofree char *jobname = NULL; qemuBlockJobType jobtype = QEMU_BLOCKJOB_TYPE_COMMIT; if (topparent == NULL) @@ -291,7 +291,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, bool storage) { VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; - VIR_AUTOFREE(char *) jobname = NULL; + g_autofree char *jobname = NULL; const char *nodename = src->nodeformat; if (storage) @@ -324,7 +324,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; - VIR_AUTOFREE(char *) jobname = NULL; + g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { if (virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->nodeformat) < 0) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index efd71d69c5..00ac2aed0e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2415,7 +2415,7 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, for (i = 0; i < G_N_ELEMENTS(virQEMUCapsMachineProps); i++) { virQEMUCapsObjectTypeProps props = virQEMUCapsMachineProps[i]; const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, props.type); - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *type = NULL; if (!virQEMUCapsIsMachineSupported(qemuCaps, canon)) continue; @@ -4151,7 +4151,7 @@ virQEMUCapsKVMSupportsNesting(void) { static char const * const kmod[] = {"kvm_intel", "kvm_amd", "kvm_hv", "kvm"}; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; int rc; size_t i; @@ -4541,7 +4541,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { int major, minor, micro; - VIR_AUTOFREE(char *) package = NULL; + g_autofree char *package = NULL; /* @mon is supposed to be locked by callee */ diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 0c4385083b..5f2372779a 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -84,9 +84,9 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm, { unsigned int flags = VIR_DOMAIN_CHECKPOINT_FORMAT_SECURE; virDomainCheckpointDefPtr def = virDomainCheckpointObjGetDef(checkpoint); - VIR_AUTOFREE(char *) newxml = NULL; - VIR_AUTOFREE(char *) chkDir = NULL; - VIR_AUTOFREE(char *) chkFile = NULL; + g_autofree char *newxml = NULL; + g_autofree char *chkDir = NULL; + g_autofree char *chkFile = NULL; newxml = virDomainCheckpointDefFormat(def, caps, xmlopt, flags); if (newxml == NULL) @@ -119,7 +119,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, virDomainCheckpointDefPtr parentdef = NULL; size_t i, j; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOFREE(char *) chkFile = NULL; + g_autofree char *chkFile = NULL; if (!metadata_only && !virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f4563eac37..130476b9e5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -207,8 +207,8 @@ static int qemuBuildMasterKeyCommandLine(virCommandPtr cmd, qemuDomainObjPrivatePtr priv) { - VIR_AUTOFREE(char *) alias = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *alias = NULL; + g_autofree char *path = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; /* If the -object secret does not exist, then just return. This just @@ -299,7 +299,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, virDomainDeviceInfoPtr info, virQEMUCapsPtr qemuCaps) { - VIR_AUTOFREE(char *) devStr = NULL; + g_autofree char *devStr = NULL; const char *contAlias = NULL; bool contIsPHB = false; int contTargetIndex = 0; @@ -698,7 +698,7 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo, virJSONValuePtr *propsret) { int ret = -1; - VIR_AUTOFREE(char *) keyid = NULL; + g_autofree char *keyid = NULL; if (!(keyid = qemuDomainGetMasterKeyAlias())) return -1; @@ -1483,7 +1483,7 @@ bool qemuCheckFips(void) { if (virFileExists("/proc/sys/crypto/fips_enabled")) { - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; if (virFileReadAll("/proc/sys/crypto/fips_enabled", 10, &buf) < 0) return false; @@ -1574,7 +1574,7 @@ static int qemuBuildDriveSourcePR(virBufferPtr buf, virDomainDiskDefPtr disk) { - VIR_AUTOFREE(char *) alias = NULL; + g_autofree char *alias = NULL; const char *defaultAlias = NULL; if (!disk->src->pr) @@ -1601,7 +1601,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, qemuDomainSecretInfoPtr secinfo = NULL; qemuDomainSecretInfoPtr encinfo = NULL; VIR_AUTOPTR(virJSONValue) srcprops = NULL; - VIR_AUTOFREE(char *) source = NULL; + g_autofree char *source = NULL; bool rawluks = false; if (srcpriv) { @@ -1794,7 +1794,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, goto error; if (!qemuDiskBusNeedsDriveArg(disk->bus)) { - VIR_AUTOFREE(char *) drivealias = qemuAliasDiskDriveFromDisk(disk); + g_autofree char *drivealias = qemuAliasDiskDriveFromDisk(disk); if (!drivealias) goto error; @@ -1954,8 +1954,8 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; - VIR_AUTOFREE(char *) backendAlias = NULL; - VIR_AUTOFREE(char *) scsiVPDDeviceId = NULL; + g_autofree char *backendAlias = NULL; + g_autofree char *scsiVPDDeviceId = NULL; int controllerModel; if (qemuCheckDiskConfig(disk, qemuCaps) < 0) @@ -2312,7 +2312,7 @@ static int qemuCommandAddZPCIDevice(virCommandPtr cmd, virDomainDeviceInfoPtr dev) { - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; virCommandAddArg(cmd, "-device"); @@ -2355,9 +2355,9 @@ qemuBuildFloppyCommandLineControllerOptions(virCommandPtr cmd, virBufferAddLit(&fdc_opts, "isa-fdc,"); for (i = 0; i < def->ndisks; i++) { - VIR_AUTOFREE(char *) backendAlias = NULL; - VIR_AUTOFREE(char *) backendStr = NULL; - VIR_AUTOFREE(char *) bootindexStr = NULL; + g_autofree char *backendAlias = NULL; + g_autofree char *backendStr = NULL; + g_autofree char *bootindexStr = NULL; virDomainDiskDefPtr disk = def->disks[i]; if (disk->bus != VIR_DOMAIN_DISK_BUS_FDC) @@ -2479,7 +2479,7 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, { VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; VIR_AUTOPTR(virJSONValue) copyOnReadProps = NULL; - VIR_AUTOFREE(char *) copyOnReadPropsStr = NULL; + g_autofree char *copyOnReadPropsStr = NULL; size_t i; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -2522,7 +2522,7 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps, unsigned int bootindex) { - VIR_AUTOFREE(char *) optstr = NULL; + g_autofree char *optstr = NULL; if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0) return -1; @@ -2688,8 +2688,8 @@ qemuBuildFSDevCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOFREE(char *) fsdevstr = NULL; - VIR_AUTOFREE(char *) devicestr = NULL; + g_autofree char *fsdevstr = NULL; + g_autofree char *devicestr = NULL; virCommandAddArg(cmd, "-fsdev"); if (!(fsdevstr = qemuBuildFSStr(fs))) @@ -3152,7 +3152,7 @@ qemuBuildControllersByTypeCommandLine(virCommandPtr cmd, for (i = 0; i < def->ncontrollers; i++) { virDomainControllerDefPtr cont = def->controllers[i]; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; if (cont->type != type) continue; @@ -3326,7 +3326,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, const long system_page_size = virGetSystemPageSizeKB(); virDomainMemoryAccess memAccess = mem->access; size_t i; - VIR_AUTOFREE(char *) memPath = NULL; + g_autofree char *memPath = NULL; bool prealloc = false; virBitmapPtr nodemask = NULL; int rc; @@ -3585,7 +3585,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, virBufferPtr buf) { VIR_AUTOPTR(virJSONValue) props = NULL; - VIR_AUTOFREE(char *) alias = NULL; + g_autofree char *alias = NULL; int rc; virDomainMemoryDef mem = { 0 }; unsigned long long memsize = virDomainNumaGetNodeMemorySize(def->numa, @@ -3617,7 +3617,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, qemuDomainObjPrivatePtr priv) { VIR_AUTOPTR(virJSONValue) props = NULL; - VIR_AUTOFREE(char *) alias = NULL; + g_autofree char *alias = NULL; if (!mem->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3974,7 +3974,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, virBufferAddLit(&buf, "user,"); for (i = 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip = net->guestIP.ips[i]; - VIR_AUTOFREE(char *) addr = NULL; + g_autofree char *addr = NULL; const char *prefix = ""; if (!(addr = virSocketAddrFormat(&ip->address))) @@ -4072,7 +4072,7 @@ qemuBuildWatchdogCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { virDomainWatchdogDefPtr watchdog = def->watchdog; - VIR_AUTOFREE(char *) optstr = NULL; + g_autofree char *optstr = NULL; const char *action; int actualAction; @@ -4184,7 +4184,7 @@ qemuBuildNVRAMCommandLine(virCommandPtr cmd, return -1; } - VIR_AUTOFREE(char *) optstr = NULL; + g_autofree char *optstr = NULL; virCommandAddArg(cmd, "-global"); optstr = qemuBuildNVRAMDevStr(def->nvram); if (!optstr) @@ -4322,7 +4322,7 @@ qemuBuildInputCommandLine(virCommandPtr cmd, for (i = 0; i < def->ninputs; i++) { virDomainInputDefPtr input = def->inputs[i]; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; if (qemuCommandAddExtDevice(cmd, &input->info) < 0) return -1; @@ -4450,7 +4450,7 @@ qemuBuildSoundCommandLine(virCommandPtr cmd, for (i = 0; i < def->nsounds; i++) { virDomainSoundDefPtr sound = def->sounds[i]; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; /* Sadly pcspk device doesn't use -device syntax. Fortunately * we don't need to set any PCI address on it, so we don't @@ -4470,7 +4470,7 @@ qemuBuildSoundCommandLine(virCommandPtr cmd, sound->model == VIR_DOMAIN_SOUND_MODEL_ICH9) { for (j = 0; j < sound->ncodecs; j++) { - VIR_AUTOFREE(char *) codecstr = NULL; + g_autofree char *codecstr = NULL; virCommandAddArg(cmd, "-device"); if (!(codecstr = qemuBuildSoundCodecStr(sound, sound->codecs[j], @@ -4481,7 +4481,7 @@ qemuBuildSoundCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, codecstr); } if (j == 0) { - VIR_AUTOFREE(char *) codecstr = NULL; + g_autofree char *codecstr = NULL; virDomainSoundCodecDef codec = { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, 0 @@ -4724,7 +4724,7 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, size_t i; for (i = 0; i < def->nvideos; i++) { - VIR_AUTOFREE(char *) chardev = NULL; + g_autofree char *chardev = NULL; virDomainVideoDefPtr video = def->videos[i]; if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) { @@ -4738,7 +4738,7 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, } for (i = 0; i < def->nvideos; i++) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; virDomainVideoDefPtr video = def->videos[i]; if (video->type == VIR_DOMAIN_VIDEO_TYPE_NONE) @@ -4902,7 +4902,7 @@ qemuBuildHubCommandLine(virCommandPtr cmd, for (i = 0; i < def->nhubs; i++) { virDomainHubDefPtr hub = def->hubs[i]; - VIR_AUTOFREE(char *) optstr = NULL; + g_autofree char *optstr = NULL; virCommandAddArg(cmd, "-device"); if (!(optstr = qemuBuildHubDevStr(def, hub, qemuCaps))) @@ -4932,7 +4932,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) netsource = NULL; + g_autofree char *netsource = NULL; VIR_AUTOPTR(virJSONValue) srcprops = NULL; virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; @@ -5000,8 +5000,8 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) source = NULL; - VIR_AUTOFREE(char *) drivealias = NULL; + g_autofree char *source = NULL; + g_autofree char *drivealias = NULL; virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { @@ -5033,7 +5033,7 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; int model = -1; - VIR_AUTOFREE(char *) driveAlias = NULL; + g_autofree char *driveAlias = NULL; const char *contAlias; model = qemuDomainFindSCSIControllerModel(def, dev->info); @@ -5097,8 +5097,8 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, const char *appendarg, int appendval) { if (logManager) { - VIR_AUTOFREE(char *) fdset = NULL; - VIR_AUTOFREE(char *) fdpath = NULL; + g_autofree char *fdset = NULL; + g_autofree char *fdpath = NULL; int flags = 0; int logfd; @@ -5230,7 +5230,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, qemuDomainChrSourcePrivatePtr chrSourcePriv = QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev); g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; bool telnet; - VIR_AUTOFREE(char *) charAlias = NULL; + g_autofree char *charAlias = NULL; if (!(charAlias = qemuAliasChardevFromDevAlias(alias))) return NULL; @@ -5320,7 +5320,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, qemuBuildChrChardevReconnectStr(&buf, &dev->data.tcp.reconnect); if (dev->data.tcp.haveTLS == VIR_TRISTATE_BOOL_YES) { - VIR_AUTOFREE(char *) objalias = NULL; + g_autofree char *objalias = NULL; const char *tlsCertEncSecAlias = NULL; /* Add the secret object first if necessary. The @@ -5424,7 +5424,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysMediatedDevPtr mdevsrc = &dev->source.subsys.u.mdev; - VIR_AUTOFREE(char *) mdevPath = NULL; + g_autofree char *mdevPath = NULL; const char *dev_str = NULL; if (!(mdevPath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr))) @@ -5465,7 +5465,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, for (i = 0; i < def->nhostdevs; i++) { virDomainHostdevDefPtr hostdev = def->hostdevs[i]; virDomainHostdevSubsysPtr subsys = &hostdev->source.subsys; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; /* USB */ if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && @@ -5516,7 +5516,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (virHostdevIsSCSIDevice(hostdev)) { virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; - VIR_AUTOFREE(char *) drvstr = NULL; + g_autofree char *drvstr = NULL; if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = @@ -5546,7 +5546,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) { if (hostdev->source.subsys.u.scsi_host.protocol == VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST) { - VIR_AUTOFREE(char *) vhostfdName = NULL; + g_autofree char *vhostfdName = NULL; int vhostfd = -1; if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) @@ -5628,7 +5628,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager, virDomainDefPtr def, qemuDomainObjPrivatePtr priv) { - VIR_AUTOFREE(char *) chrdev = NULL; + g_autofree char *chrdev = NULL; unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | QEMU_BUILD_CHARDEV_UNIX_FD_PASS; if (priv->chardevStdioLogd) @@ -5786,8 +5786,8 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, virQEMUCapsPtr qemuCaps, virJSONValuePtr *props) { - VIR_AUTOFREE(char *) objAlias = NULL; - VIR_AUTOFREE(char *) charBackendAlias = NULL; + g_autofree char *objAlias = NULL; + g_autofree char *charBackendAlias = NULL; if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) return -1; @@ -5890,8 +5890,8 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, VIR_AUTOPTR(virJSONValue) props = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainRNGDefPtr rng = def->rngs[i]; - VIR_AUTOFREE(char *) chardev = NULL; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *chardev = NULL; + g_autofree char *devstr = NULL; int rc; if (!rng->info.alias) { @@ -6387,7 +6387,7 @@ qemuBuildClockCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { size_t i; - VIR_AUTOFREE(char *) rtcopt = NULL; + g_autofree char *rtcopt = NULL; virCommandAddArg(cmd, "-rtc"); if (!(rtcopt = qemuBuildClockArgStr(&def->clock))) @@ -6548,7 +6548,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { g_auto(virBuffer) boot_buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) boot_opts_str = NULL; + g_autofree char *boot_opts_str = NULL; if (def->os.bootmenu) { if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES) @@ -6839,8 +6839,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { virArch hostarch = virArchFromHost(); - VIR_AUTOFREE(char *) cpu = NULL; - VIR_AUTOFREE(char *) cpu_flags = NULL; + g_autofree char *cpu = NULL; + g_autofree char *cpu_flags = NULL; g_auto(virBuffer) cpu_buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; @@ -7516,7 +7516,7 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, qemuDomainObjPrivatePtr priv) { const long system_page_size = virGetSystemPageSizeKB(); - VIR_AUTOFREE(char *) mem_path = NULL; + g_autofree char *mem_path = NULL; /* There are two cases where we want to put -mem-path onto * the command line: First one is when there are no guest @@ -8386,16 +8386,16 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, { virDomainDefPtr def = vm->def; int ret = -1; - VIR_AUTOFREE(char *) nic = NULL; - VIR_AUTOFREE(char *) host = NULL; - VIR_AUTOFREE(char *) chardev = NULL; + g_autofree char *nic = NULL; + g_autofree char *host = NULL; + g_autofree char *chardev = NULL; int *tapfd = NULL; size_t tapfdSize = 0; int *vhostfd = NULL; size_t vhostfdSize = 0; char **tapfdName = NULL; char **vhostfdName = NULL; - VIR_AUTOFREE(char *) slirpfdName = NULL; + g_autofree char *slirpfdName = NULL; virDomainNetType actualType = virDomainNetGetActualType(net); virNetDevBandwidthPtr actualBandwidth; bool requireNicdev = false; @@ -8776,7 +8776,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, { size_t i; virDomainSmartcardDefPtr smartcard; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; const char *database; const char *contAlias = NULL; @@ -8970,8 +8970,8 @@ qemuBuildShmemDevStr(virDomainDefPtr def, virJSONValuePtr qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) { - VIR_AUTOFREE(char *) mem_alias = NULL; - VIR_AUTOFREE(char *) mem_path = NULL; + g_autofree char *mem_alias = NULL; + g_autofree char *mem_path = NULL; virJSONValuePtr ret = NULL; if (virAsprintf(&mem_path, "/dev/shm/%s", shmem->name) < 0) @@ -9002,8 +9002,8 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, { VIR_AUTOPTR(virJSONValue) memProps = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) devstr = NULL; - VIR_AUTOFREE(char *) chardev = NULL; + g_autofree char *devstr = NULL; + g_autofree char *chardev = NULL; int rc; unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT | QEMU_BUILD_CHARDEV_UNIX_FD_PASS; @@ -9120,7 +9120,7 @@ qemuBuildChrDeviceCommandLine(virCommandPtr cmd, virDomainChrDefPtr chr, virQEMUCapsPtr qemuCaps) { - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; if (qemuBuildChrDeviceStr(&devstr, def, chr, qemuCaps) < 0) return -1; @@ -9193,7 +9193,7 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager, for (i = 0; i < def->nserials; i++) { virDomainChrDefPtr serial = def->serials[i]; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; if (serial->source->type == VIR_DOMAIN_CHR_TYPE_SPICEPORT && !havespice) continue; @@ -9249,7 +9249,7 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager, for (i = 0; i < def->nparallels; i++) { virDomainChrDefPtr parallel = def->parallels[i]; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; if (!(devstr = qemuBuildChrChardevStr(logManager, secManager, cmd, cfg, def, @@ -9671,9 +9671,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, { const virDomainTPMDef *tpm = def->tpm; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) cancel_path = NULL; - VIR_AUTOFREE(char *) devset = NULL; - VIR_AUTOFREE(char *) cancelset = NULL; + g_autofree char *cancel_path = NULL; + g_autofree char *devset = NULL; + g_autofree char *cancelset = NULL; const char *tpmdev; *tpmfd = -1; @@ -9730,7 +9730,7 @@ qemuBuildTPMCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { char *optstr; - VIR_AUTOFREE(char *) chardev = NULL; + g_autofree char *chardev = NULL; int tpmfd = -1; int cancelfd = -1; char *fdset; @@ -9962,7 +9962,7 @@ qemuBuildPRManagerInfoPropsInternal(const char *alias, virJSONValuePtr qemuBuildPRManagedManagerInfoProps(qemuDomainObjPrivatePtr priv) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (!(path = qemuDomainGetManagedPRSocketPath(priv))) return NULL; @@ -10028,7 +10028,7 @@ virJSONValuePtr qemuBuildDBusVMStateInfoProps(const char *id, const char *addr) { - VIR_AUTOFREE(char *) alias = qemuAliasDBusVMStateFromId(id); + g_autofree char *alias = qemuAliasDBusVMStateFromId(id); if (!alias) return NULL; @@ -10240,7 +10240,7 @@ qemuBuildVsockCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { qemuDomainVsockPrivatePtr priv = (qemuDomainVsockPrivatePtr)vsock->privateData; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; if (!(devstr = qemuBuildVsockDevStr(def, vsock, qemuCaps, ""))) return -1; @@ -10612,7 +10612,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, virDomainChrDefPtr chr) { int ret = -1; - VIR_AUTOFREE(char *) addr = NULL; + g_autofree char *addr = NULL; int port; switch ((virDomainChrChannelTargetType)chr->targetType) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 08cd784054..de03069036 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -181,8 +181,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) virGetGroupID("tss", &cfg->swtpm_group) < 0) cfg->swtpm_group = 0; /* fall back to root */ } else { - VIR_AUTOFREE(char *) rundir = NULL; - VIR_AUTOFREE(char *) cachedir = NULL; + g_autofree char *rundir = NULL; + g_autofree char *cachedir = NULL; cachedir = virGetUserCacheDirectory(); if (!cachedir) @@ -618,8 +618,8 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) { VIR_AUTOSTRINGLIST hugetlbfs = NULL; - VIR_AUTOFREE(char *) stdioHandler = NULL; - VIR_AUTOFREE(char *) corestr = NULL; + g_autofree char *stdioHandler = NULL; + g_autofree char *corestr = NULL; size_t i; if (virConfGetValueStringList(conf, "hugetlbfs_mount", true, @@ -848,8 +848,8 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg, { VIR_AUTOSTRINGLIST controllers = NULL; VIR_AUTOSTRINGLIST namespaces = NULL; - VIR_AUTOFREE(char *) user = NULL; - VIR_AUTOFREE(char *) group = NULL; + g_autofree char *user = NULL; + g_autofree char *group = NULL; size_t i, j; if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0) @@ -967,8 +967,8 @@ static int virQEMUDriverConfigLoadSWTPMEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) { - VIR_AUTOFREE(char *) swtpm_user = NULL; - VIR_AUTOFREE(char *) swtpm_group = NULL; + g_autofree char *swtpm_user = NULL; + g_autofree char *swtpm_group = NULL; if (virConfGetValueString(conf, "swtpm_user", &swtpm_user) < 0) return -1; @@ -1244,7 +1244,7 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) { size_t i, j; VIR_AUTOUNREF(virCapsPtr) caps = NULL; - VIR_AUTOFREE(virSecurityManagerPtr) *sec_managers = NULL; + g_autofree virSecurityManagerPtr *sec_managers = NULL; /* Security driver data */ const char *doi, *model, *lbl, *type; const int virtTypes[] = {VIR_DOMAIN_VIRT_KVM, @@ -1457,8 +1457,8 @@ qemuCheckUnprivSGIO(virHashTablePtr sharedDevices, const char *device_path, int sgio) { - VIR_AUTOFREE(char *) sysfs_path = NULL; - VIR_AUTOFREE(char *) key = NULL; + g_autofree char *sysfs_path = NULL; + g_autofree char *key = NULL; int val; if (!(sysfs_path = virGetUnprivSGIOSysfsPath(device_path, NULL))) @@ -1637,7 +1637,7 @@ qemuSharedDiskAddRemoveInternal(virQEMUDriverPtr driver, const char *name, bool addDisk) { - VIR_AUTOFREE(char *) key = NULL; + g_autofree char *key = NULL; int ret = -1; if (virStorageSourceIsEmpty(disk->src) || @@ -1701,7 +1701,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) { virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - VIR_AUTOFREE(char *) dev_name = NULL; + g_autofree char *dev_name = NULL; char *dev_path = NULL; if (!(dev_name = virSCSIDeviceGetDevName(NULL, @@ -1722,8 +1722,8 @@ qemuSharedHostdevAddRemoveInternal(virQEMUDriverPtr driver, const char *name, bool addDevice) { - VIR_AUTOFREE(char *) dev_path = NULL; - VIR_AUTOFREE(char *) key = NULL; + g_autofree char *dev_path = NULL; + g_autofree char *key = NULL; int ret = -1; if (!qemuIsSharedHostdev(hostdev)) @@ -1816,7 +1816,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) { virDomainDiskDefPtr disk = NULL; virDomainHostdevDefPtr hostdev = NULL; - VIR_AUTOFREE(char *) sysfs_path = NULL; + g_autofree char *sysfs_path = NULL; const char *path = NULL; int val = -1; @@ -1899,8 +1899,8 @@ char * qemuGetDomainHugepagePath(const virDomainDef *def, virHugeTLBFSPtr hugepage) { - VIR_AUTOFREE(char *) base = qemuGetBaseHugepagePath(hugepage); - VIR_AUTOFREE(char *) domPath = virDomainDefGetShortName(def); + g_autofree char *base = qemuGetBaseHugepagePath(hugepage); + g_autofree char *domPath = virDomainDefGetShortName(def); char *ret = NULL; if (base && domPath) @@ -1965,8 +1965,8 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *def, virQEMUDriverConfigPtr cfg, char **path) { - VIR_AUTOFREE(char *) shortName = NULL; - VIR_AUTOFREE(char *) base = NULL; + g_autofree char *shortName = NULL; + g_autofree char *base = NULL; if (!(shortName = virDomainDefGetShortName(def)) || qemuGetMemoryBackingBasePath(cfg, &base) < 0 || @@ -1995,7 +1995,7 @@ qemuGetMemoryBackingPath(const virDomainDef *def, const char *alias, char **memPath) { - VIR_AUTOFREE(char *) domainPath = NULL; + g_autofree char *domainPath = NULL; if (!alias) { /* This should never happen (TM) */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 734ea7a764..5b3e1d8fcb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3012,9 +3012,9 @@ qemuDomainObjPrivateXMLParseBlockjobChain(xmlNodePtr node, { VIR_XPATH_NODE_AUTORESTORE(ctxt); - VIR_AUTOFREE(char *) format = NULL; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) index = NULL; + g_autofree char *format = NULL; + g_autofree char *type = NULL; + g_autofree char *index = NULL; VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; xmlNodePtr sourceNode; unsigned int xmlflags = VIR_DOMAIN_DEF_PARSE_STATUS; @@ -3049,7 +3049,7 @@ qemuDomainObjPrivateXMLParseBlockjobNodename(qemuBlockJobDataPtr job, virStorageSourcePtr *src, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(char *) nodename = NULL; + g_autofree char *nodename = NULL; *src = NULL; @@ -3080,8 +3080,8 @@ qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job, xmlXPathContextPtr ctxt, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOFREE(char *) createmode = NULL; - VIR_AUTOFREE(char *) shallownew = NULL; + g_autofree char *createmode = NULL; + g_autofree char *shallownew = NULL; xmlNodePtr tmp; switch ((qemuBlockJobType) job->type) { @@ -3162,14 +3162,14 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObjPtr vm, VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainDiskDefPtr disk = NULL; VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; - VIR_AUTOFREE(char *) name = NULL; - VIR_AUTOFREE(char *) typestr = NULL; + g_autofree char *name = NULL; + g_autofree char *typestr = NULL; int type; - VIR_AUTOFREE(char *) statestr = NULL; + g_autofree char *statestr = NULL; int state = QEMU_BLOCKJOB_STATE_FAILED; - VIR_AUTOFREE(char *) diskdst = NULL; - VIR_AUTOFREE(char *) newstatestr = NULL; - VIR_AUTOFREE(char *) mirror = NULL; + g_autofree char *diskdst = NULL; + g_autofree char *newstatestr = NULL; + g_autofree char *mirror = NULL; int newstate = -1; bool invalidData = false; xmlNodePtr tmp; @@ -3245,9 +3245,9 @@ qemuDomainObjPrivateXMLParseBlockjobs(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; ssize_t nnodes = 0; - VIR_AUTOFREE(char *) active = NULL; + g_autofree char *active = NULL; int tmp; size_t i; @@ -3311,8 +3311,8 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, { VIR_XPATH_NODE_AUTORESTORE(ctxt); qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - VIR_AUTOFREE(char *) format = NULL; - VIR_AUTOFREE(char *) type = NULL; + g_autofree char *format = NULL; + g_autofree char *type = NULL; VIR_AUTOUNREF(virStorageSourcePtr) migrSource = NULL; xmlNodePtr sourceNode; @@ -3469,7 +3469,7 @@ qemuDomainObjPrivateXMLParseSlirpFeatures(xmlNodePtr featuresNode, qemuSlirpPtr slirp) { VIR_XPATH_NODE_AUTORESTORE(ctxt); - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; size_t i; int n; @@ -3482,7 +3482,7 @@ qemuDomainObjPrivateXMLParseSlirpFeatures(xmlNodePtr featuresNode, } for (i = 0; i < n; i++) { - VIR_AUTOFREE(char *) str = virXMLPropString(nodes[i], "name"); + g_autofree char *str = virXMLPropString(nodes[i], "name"); int feature; if (!str) @@ -3646,8 +3646,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, goto error; } for (i = 0; i < n; i++) { - VIR_AUTOFREE(char *) alias = virXMLPropString(nodes[i], "alias"); - VIR_AUTOFREE(char *) pid = virXMLPropString(nodes[i], "pid"); + g_autofree char *alias = virXMLPropString(nodes[i], "alias"); + g_autofree char *pid = virXMLPropString(nodes[i], "pid"); VIR_AUTOPTR(qemuSlirp) slirp = qemuSlirpNew(); virDomainDeviceDef dev; @@ -3778,7 +3778,7 @@ static int qemuDomainDefNamespaceParseCommandlineArgs(qemuDomainXmlNsDefPtr nsdef, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; ssize_t nnodes; size_t i; @@ -3826,7 +3826,7 @@ static int qemuDomainDefNamespaceParseCommandlineEnv(qemuDomainXmlNsDefPtr nsdef, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; ssize_t nnodes; size_t i; @@ -3863,9 +3863,9 @@ static int qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDefPtr nsdef, xmlXPathContextPtr ctxt) { - VIR_AUTOFREE(xmlNodePtr *) nodesadd = NULL; + g_autofree xmlNodePtr *nodesadd = NULL; ssize_t nnodesadd; - VIR_AUTOFREE(xmlNodePtr *) nodesdel = NULL; + g_autofree xmlNodePtr *nodesdel = NULL; ssize_t nnodesdel; size_t i; @@ -9820,8 +9820,8 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, virDomainObjPtr vm) { virQEMUDriverConfigPtr cfg; - VIR_AUTOFREE(char *) snapDir = NULL; - VIR_AUTOFREE(char *) chkDir = NULL; + g_autofree char *snapDir = NULL; + g_autofree char *chkDir = NULL; cfg = virQEMUDriverGetConfig(driver); @@ -11713,7 +11713,7 @@ ppc64VFIODeviceIsNV2Bridge(const char *device) size_t i; for (i = 0; i < G_N_ELEMENTS(nvlink2Files); i++) { - VIR_AUTOFREE(char *) file = NULL; + g_autofree char *file = NULL; if ((virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", device, nvlink2Files[i])) < 0) @@ -11766,7 +11766,7 @@ getPPC64MemLockLimitBytes(virDomainDefPtr def) pciAddr = &dev->source.subsys.u.pci.addr; if (virPCIDeviceAddressIsValid(pciAddr, false)) { - VIR_AUTOFREE(char *) pciAddrStr = NULL; + g_autofree char *pciAddrStr = NULL; pciAddrStr = virPCIDeviceAddressAsString(pciAddr); if (ppc64VFIODeviceIsNV2Bridge(pciAddrStr)) { diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 438fa72262..fa40ba4f7d 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1525,7 +1525,7 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, * inappropriate address types. */ if (!info->pciConnectFlags) { - VIR_AUTOFREE(char *) addrStr = virPCIDeviceAddressAsString(&info->addr.pci); + g_autofree char *addrStr = virPCIDeviceAddressAsString(&info->addr.pci); VIR_WARN("qemuDomainDeviceCalculatePCIConnectFlags() thinks that the " "device with PCI address %s should not have a PCI address", @@ -1723,7 +1723,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def, size_t i; virPCIDeviceAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - VIR_AUTOFREE(char *) addrStr = NULL; + g_autofree char *addrStr = NULL; virDomainPCIConnectFlags flags = (VIR_PCI_CONNECT_HOTPLUGGABLE | VIR_PCI_CONNECT_TYPE_PCI_DEVICE); @@ -1864,7 +1864,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, size_t i; virPCIDeviceAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - VIR_AUTOFREE(char *) addrStr = NULL; + g_autofree char *addrStr = NULL; virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCIE_DEVICE; for (i = 0; i < def->ncontrollers; i++) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6ce6348593..69919ac203 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4921,7 +4921,7 @@ processRdmaGidStatusChangedEvent(virDomainObjPtr vm, { unsigned int prefix_len; virSocketAddr addr; - VIR_AUTOFREE(char *) addrStr = NULL; + g_autofree char *addrStr = NULL; int rc; if (!virDomainObjIsActive(vm)) @@ -7520,7 +7520,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, for (i = 0; i < vm->def->nnets; i++) { virDomainNetDefPtr net = vm->def->nets[i]; unsigned int bootIndex = net->info.bootIndex; - VIR_AUTOFREE(char *) model = NULL; + g_autofree char *model = NULL; virMacAddr mac = net->mac; char *script = net->script; @@ -15777,14 +15777,14 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, bool resume = false; int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; virDomainSnapshotDefPtr snapdef = virDomainSnapshotObjGetDef(snap); bool memory = snapdef->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; bool memory_unlink = false; int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; int compressed; - VIR_AUTOFREE(char *) compressedpath = NULL; + g_autofree char *compressedpath = NULL; virQEMUSaveDataPtr data = NULL; /* If quiesce was requested, then issue a freeze command, and a @@ -17682,8 +17682,8 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm, virDomainDiskDefPtr disk; virStorageSourcePtr baseSource = NULL; unsigned int baseIndex = 0; - VIR_AUTOFREE(char *) basePath = NULL; - VIR_AUTOFREE(char *) backingPath = NULL; + g_autofree char *basePath = NULL; + g_autofree char *backingPath = NULL; unsigned long long speed = bandwidth; qemuBlockJobDataPtr job = NULL; bool persistjob = false; @@ -18693,9 +18693,9 @@ qemuDomainBlockCommit(virDomainPtr dom, unsigned int baseIndex = 0; virStorageSourcePtr top_parent = NULL; bool clean_access = false; - VIR_AUTOFREE(char *) topPath = NULL; - VIR_AUTOFREE(char *) basePath = NULL; - VIR_AUTOFREE(char *) backingPath = NULL; + g_autofree char *topPath = NULL; + g_autofree char *basePath = NULL; + g_autofree char *backingPath = NULL; unsigned long long speed = bandwidth; qemuBlockJobDataPtr job = NULL; VIR_AUTOUNREF(virStorageSourcePtr) mirror = NULL; @@ -21585,7 +21585,7 @@ qemuDomainGetStats(virConnectPtr conn, virDomainStatsRecordPtr *record, unsigned int flags) { - VIR_AUTOFREE(virDomainStatsRecordPtr) tmp = NULL; + g_autofree virDomainStatsRecordPtr tmp = NULL; VIR_AUTOPTR(virTypedParamList) params = NULL; size_t i; @@ -22841,7 +22841,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentPtr agent; int ret = -1; int maxparams = 0; - VIR_AUTOFREE(char *) hostname = NULL; + g_autofree char *hostname = NULL; unsigned int supportedTypes = types; int rc; diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index abcaa9fca2..463f76c21a 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -43,8 +43,8 @@ qemuExtDeviceLogCommand(virQEMUDriverPtr driver, virCommandPtr cmd, const char *info) { - VIR_AUTOFREE(char *) timestamp = virTimeStringNow(); - VIR_AUTOFREE(char *) cmds = virCommandToString(cmd, false); + g_autofree char *timestamp = virTimeStringNow(); + g_autofree char *cmds = virCommandToString(cmd, false); if (!timestamp || !cmds) return -1; diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 6d3faadd23..d043b46e6c 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -545,7 +545,7 @@ qemuFirmwareTargetParse(const char *path, for (j = 0; j < nmachines; j++) { virJSONValuePtr machine = virJSONValueArrayGet(machines, j); - VIR_AUTOFREE(char *) machineStr = NULL; + g_autofree char *machineStr = NULL; if (VIR_STRDUP(machineStr, virJSONValueGetString(machine)) < 0) goto cleanup; @@ -618,7 +618,7 @@ qemuFirmwareFeatureParse(const char *path, qemuFirmwarePtr qemuFirmwareParse(const char *path) { - VIR_AUTOFREE(char *) cont = NULL; + g_autofree char *cont = NULL; VIR_AUTOPTR(virJSONValue) doc = NULL; VIR_AUTOPTR(qemuFirmware) fw = NULL; qemuFirmwarePtr ret = NULL; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fcb206a8af..f22b509ffa 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -136,7 +136,7 @@ static int qemuDomainAttachZPCIDevice(qemuMonitorPtr mon, virDomainDeviceInfoPtr info) { - VIR_AUTOFREE(char *) devstr_zpci = NULL; + g_autofree char *devstr_zpci = NULL; if (!(devstr_zpci = qemuBuildZPCIDevStr(info))) return -1; @@ -152,7 +152,7 @@ static int qemuDomainDetachZPCIDevice(qemuMonitorPtr mon, virDomainDeviceInfoPtr info) { - VIR_AUTOFREE(char *) zpciAlias = NULL; + g_autofree char *zpciAlias = NULL; if (virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid) < 0) return -1; @@ -249,11 +249,11 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver, bool force) { int rc; - VIR_AUTOFREE(char *) driveAlias = NULL; + g_autofree char *driveAlias = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); const char *format = NULL; - VIR_AUTOFREE(char *) sourcestr = NULL; + g_autofree char *sourcestr = NULL; if (!disk->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -463,7 +463,7 @@ qemuDomainDetachDBusVMState(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) alias = qemuAliasDBusVMStateFromId(id); + g_autofree char *alias = qemuAliasDBusVMStateFromId(id); int ret; if (!alias || @@ -507,7 +507,7 @@ qemuDomainChangeMediaBlockdev(virQEMUDriverPtr driver, qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); VIR_AUTOPTR(qemuBlockStorageSourceChainData) newbackend = NULL; VIR_AUTOPTR(qemuBlockStorageSourceChainData) oldbackend = NULL; - VIR_AUTOFREE(char *) nodename = NULL; + g_autofree char *nodename = NULL; int rc; if (!virStorageSourceIsEmpty(oldsrc) && @@ -675,10 +675,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); VIR_AUTOPTR(virJSONValue) corProps = NULL; - VIR_AUTOFREE(char *) corAlias = NULL; + g_autofree char *corAlias = NULL; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0) @@ -808,7 +808,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver, { int ret = -1; const char* type = virDomainControllerTypeToString(controller->type); - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_CONTROLLER, { .controller = controller } }; @@ -1131,7 +1131,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_NET, { .net = net } }; virErrorPtr originalError = NULL; - VIR_AUTOFREE(char *) slirpfdName = NULL; + g_autofree char *slirpfdName = NULL; int slirpfd = -1; char **tapfdName = NULL; int *tapfd = NULL; @@ -1140,8 +1140,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, int *vhostfd = NULL; size_t vhostfdSize = 0; size_t queueSize = 0; - VIR_AUTOFREE(char *) nicstr = NULL; - VIR_AUTOFREE(char *) netstr = NULL; + g_autofree char *nicstr = NULL; + g_autofree char *netstr = NULL; int ret = -1; bool releaseaddr = false; bool iface_connected = false; @@ -1150,10 +1150,10 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); virDomainCCWAddressSetPtr ccwaddrs = NULL; size_t i; - VIR_AUTOFREE(char *) charDevAlias = NULL; + g_autofree char *charDevAlias = NULL; bool charDevPlugged = false; bool netdevPlugged = false; - VIR_AUTOFREE(char *) netdev_name = NULL; + g_autofree char *netdev_name = NULL; virConnectPtr conn = NULL; virErrorPtr save_err = NULL; @@ -1536,7 +1536,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, { .hostdev = hostdev } }; virDomainDeviceInfoPtr info = hostdev->info; int ret; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; bool releaseaddr = false; bool teardowncgroup = false; bool teardownlabel = false; @@ -1702,7 +1702,7 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; virErrorPtr orig_err; - VIR_AUTOFREE(char *) secAlias = NULL; + g_autofree char *secAlias = NULL; if (!tlsProps && !secProps) return 0; @@ -1825,8 +1825,8 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr driver, { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) tlsAlias = NULL; - VIR_AUTOFREE(char *) secAlias = NULL; + g_autofree char *tlsAlias = NULL; + g_autofree char *secAlias = NULL; if (dev->type != VIR_DOMAIN_CHR_TYPE_TCP || dev->data.tcp.haveTLS != VIR_TRISTATE_BOOL_YES) { @@ -1864,10 +1864,10 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; - VIR_AUTOFREE(char *) charAlias = NULL; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *charAlias = NULL; + g_autofree char *devstr = NULL; bool chardevAdded = false; - VIR_AUTOFREE(char *) tlsAlias = NULL; + g_autofree char *tlsAlias = NULL; const char *secAlias = NULL; bool need_release = false; virErrorPtr orig_err; @@ -2097,14 +2097,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virErrorPtr orig_err; virDomainDefPtr vmdef = vm->def; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; virDomainChrSourceDefPtr dev = chr->source; - VIR_AUTOFREE(char *)charAlias = NULL; + g_autofree char *charAlias = NULL; bool chardevAttached = false; bool teardowncgroup = false; bool teardowndevice = false; bool teardownlabel = false; - VIR_AUTOFREE(char *) tlsAlias = NULL; + g_autofree char *tlsAlias = NULL; const char *secAlias = NULL; bool need_release = false; bool guestfwd = false; @@ -2209,10 +2209,10 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_RNG, { .rng = rng } }; virErrorPtr orig_err; - VIR_AUTOFREE(char *) devstr = NULL; - VIR_AUTOFREE(char *) charAlias = NULL; - VIR_AUTOFREE(char *) objAlias = NULL; - VIR_AUTOFREE(char *) tlsAlias = NULL; + g_autofree char *devstr = NULL; + g_autofree char *charAlias = NULL; + g_autofree char *objAlias = NULL; + g_autofree char *tlsAlias = NULL; const char *secAlias = NULL; bool releaseaddr = false; bool teardowncgroup = false; @@ -2336,8 +2336,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); unsigned long long oldmem = virDomainDefGetMemoryTotal(vm->def); unsigned long long newmem = oldmem + mem->size; - VIR_AUTOFREE(char *) devstr = NULL; - VIR_AUTOFREE(char *) objalias = NULL; + g_autofree char *devstr = NULL; + g_autofree char *objalias = NULL; bool objAdded = false; bool teardownlabel = false; bool teardowncgroup = false; @@ -2472,7 +2472,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver, virDomainHostdevDefPtr hostdev) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; bool added = false; bool teardowncgroup = false; bool teardownlabel = false; @@ -2547,10 +2547,10 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; virErrorPtr orig_err; - VIR_AUTOFREE(char *) devstr = NULL; - VIR_AUTOFREE(char *) drvstr = NULL; - VIR_AUTOFREE(char *) drivealias = NULL; - VIR_AUTOFREE(char *) secobjAlias = NULL; + g_autofree char *devstr = NULL; + g_autofree char *drvstr = NULL; + g_autofree char *drivealias = NULL; + g_autofree char *secobjAlias = NULL; bool teardowncgroup = false; bool teardownlabel = false; bool teardowndevice = false; @@ -2681,9 +2681,9 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV, { .hostdev = hostdev } }; virDomainCCWAddressSetPtr ccwaddrs = NULL; - VIR_AUTOFREE(char *) vhostfdName = NULL; + g_autofree char *vhostfdName = NULL; int vhostfd = -1; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; bool teardowncgroup = false; bool teardownlabel = false; bool teardowndevice = false; @@ -2789,7 +2789,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, virDomainHostdevDefPtr hostdev) { int ret = -1; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; bool added = false; bool teardowncgroup = false; bool teardownlabel = false; @@ -2938,9 +2938,9 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, virDomainShmemDefPtr shmem) { int ret = -1; - VIR_AUTOFREE(char *) shmstr = NULL; - VIR_AUTOFREE(char *) charAlias = NULL; - VIR_AUTOFREE(char *) memAlias = NULL; + g_autofree char *shmstr = NULL; + g_autofree char *charAlias = NULL; + g_autofree char *memAlias = NULL; bool release_backing = false; bool release_address = true; virErrorPtr orig_err = NULL; @@ -3060,7 +3060,7 @@ qemuDomainAttachWatchdog(virQEMUDriverPtr driver, virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_WATCHDOG, { .watchdog = watchdog } }; virDomainWatchdogAction actualAction = watchdog->action; const char *actionStr = NULL; - VIR_AUTOFREE(char *) watchdogstr = NULL; + g_autofree char *watchdogstr = NULL; bool releaseAddress = false; int rv; @@ -3127,7 +3127,7 @@ qemuDomainAttachInputDevice(virQEMUDriverPtr driver, virDomainInputDefPtr input) { int ret = -1; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *devstr = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_INPUT, { .input = input } }; @@ -3234,8 +3234,8 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, virErrorPtr originalError = NULL; const char *fdprefix = "vsockfd"; bool releaseaddr = false; - VIR_AUTOFREE(char *) fdname = NULL; - VIR_AUTOFREE(char *) devstr = NULL; + g_autofree char *fdname = NULL; + g_autofree char *devstr = NULL; int ret = -1; if (vm->def->vsock) { @@ -3965,7 +3965,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; time_t now = time(NULL); const char *expire; - VIR_AUTOFREE(char *) validTo = NULL; + g_autofree char *validTo = NULL; const char *connected = NULL; const char *password; int ret = -1; @@ -4236,7 +4236,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, virDomainDeviceDef dev; size_t i; qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) corAlias = NULL; + g_autofree char *corAlias = NULL; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); int ret = -1; @@ -4339,7 +4339,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; unsigned long long oldmem = virDomainDefGetMemoryTotal(vm->def); unsigned long long newmem = oldmem - mem->size; - VIR_AUTOFREE(char *) backendAlias = NULL; + g_autofree char *backendAlias = NULL; int rc; int idx; @@ -4438,8 +4438,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virDomainNetDefPtr net = NULL; size_t i; qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) drivealias = NULL; - VIR_AUTOFREE(char *) objAlias = NULL; + g_autofree char *drivealias = NULL; + g_autofree char *objAlias = NULL; bool is_vfio = false; VIR_DEBUG("Removing host device %s from domain %p %s", @@ -4557,8 +4557,8 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) hostnet_name = NULL; - VIR_AUTOFREE(char *) charDevAlias = NULL; + g_autofree char *hostnet_name = NULL; + g_autofree char *charDevAlias = NULL; size_t i; int actualType = virDomainNetGetActualType(net); @@ -4661,7 +4661,7 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, bool monitor) { virObjectEventPtr event; - VIR_AUTOFREE(char *) charAlias = NULL; + g_autofree char *charAlias = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; int rc = 0; @@ -4716,8 +4716,8 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainRNGDefPtr rng) { - VIR_AUTOFREE(char *) charAlias = NULL; - VIR_AUTOFREE(char *) objAlias = NULL; + g_autofree char *charAlias = NULL; + g_autofree char *objAlias = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; ssize_t idx; int rc = 0; @@ -4778,8 +4778,8 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, { int rc; ssize_t idx = -1; - VIR_AUTOFREE(char *) charAlias = NULL; - VIR_AUTOFREE(char *) memAlias = NULL; + g_autofree char *charAlias = NULL; + g_autofree char *memAlias = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; VIR_DEBUG("Removing shmem device %s from domain %p %s", @@ -4880,7 +4880,7 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver, virDomainRedirdevDefPtr dev) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOFREE(char *) charAlias = NULL; + g_autofree char *charAlias = NULL; ssize_t idx; VIR_DEBUG("Removing redirdev device %s from domain %p %s", @@ -4983,7 +4983,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, { virDomainDeviceInfoPtr info; virObjectEventPtr event; - VIR_AUTOFREE(char *) alias = NULL; + g_autofree char *alias = NULL; /* * save the alias to use when sending a DEVICE_REMOVED event after diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 1f39d4b576..9281935d9a 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -48,8 +48,8 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) return 0; while ((rc = virDirRead(dirp, &ent, dir)) > 0) { - VIR_AUTOFREE(char *) filename = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *filename = NULL; + g_autofree char *path = NULL; struct stat sb; if (STRPREFIX(ent->d_name, ".")) @@ -100,11 +100,11 @@ qemuInteropFetchConfigs(const char *name, bool privileged) { VIR_AUTOPTR(virHashTable) files = NULL; - VIR_AUTOFREE(char *) homeConfig = NULL; - VIR_AUTOFREE(char *) xdgConfig = NULL; - VIR_AUTOFREE(char *) sysLocation = virFileBuildPath(QEMU_SYSTEM_LOCATION, name, NULL); - VIR_AUTOFREE(char *) etcLocation = virFileBuildPath(QEMU_ETC_LOCATION, name, NULL); - VIR_AUTOFREE(virHashKeyValuePairPtr) pairs = NULL; + g_autofree char *homeConfig = NULL; + g_autofree char *xdgConfig = NULL; + g_autofree char *sysLocation = virFileBuildPath(QEMU_SYSTEM_LOCATION, name, NULL); + g_autofree char *etcLocation = virFileBuildPath(QEMU_ETC_LOCATION, name, NULL); + g_autofree virHashKeyValuePairPtr pairs = NULL; virHashKeyValuePairPtr tmp = NULL; *configs = NULL; @@ -119,7 +119,7 @@ qemuInteropFetchConfigs(const char *name, return -1; if (!xdgConfig) { - VIR_AUTOFREE(char *) home = virGetUserDirectory(); + g_autofree char *home = virGetUserDirectory(); if (!home) return -1; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 52ef1874aa..fbd6681051 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -869,7 +869,7 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver, unsigned long long mirror_speed, bool mirror_shallow) { - VIR_AUTOFREE(char *) nbd_dest = NULL; + g_autofree char *nbd_dest = NULL; int mon_ret; if (strchr(host, ':')) { diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 49f9159315..33dae75e41 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1129,7 +1129,7 @@ qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon, const char *videoName) { int rc = -1; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; QEMU_CHECK_MONITOR(mon); @@ -1159,7 +1159,7 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitorPtr mon, const char *videoName) { int rc = -1; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; QEMU_CHECK_MONITOR(mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 242b637451..e9967eadfe 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2527,7 +2527,7 @@ static qemuBlockStatsPtr qemuMonitorJSONBlockStatsCollectData(virJSONValuePtr dev, int *nstats) { - VIR_AUTOFREE(qemuBlockStatsPtr) bstats = NULL; + g_autofree qemuBlockStatsPtr bstats = NULL; virJSONValuePtr parent; virJSONValuePtr parentstats; virJSONValuePtr stats; @@ -2601,11 +2601,11 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValuePtr dev, virHashTablePtr hash, bool backingChain) { - VIR_AUTOFREE(qemuBlockStatsPtr) bstats = NULL; + g_autofree qemuBlockStatsPtr bstats = NULL; int nstats = 0; const char *qdevname = NULL; const char *nodename = NULL; - VIR_AUTOFREE(char *) devicename = NULL; + g_autofree char *devicename = NULL; virJSONValuePtr backing; if (dev_name && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9c50c4a1d8..afbbe1a853 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5508,7 +5508,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, return -1; if (n > 0) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; str = virStringListJoin((const char **)features, ", "); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 716b73759d..53e8f27e2d 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -99,7 +99,7 @@ qemuSlirpNewForHelper(const char *helper) { VIR_AUTOPTR(qemuSlirp) slirp = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; VIR_AUTOPTR(virJSONValue) doc = NULL; virJSONValuePtr featuresJSON; size_t i, nfeatures; @@ -150,8 +150,8 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfigPtr cfg, const virDomainDef *def, const char *alias) { - VIR_AUTOFREE(char *) shortName = NULL; - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *shortName = NULL; + g_autofree char *name = NULL; if (!(shortName = virDomainDefGetShortName(def)) || virAsprintf(&name, "%s-%s-slirp", shortName, alias) < 0) @@ -221,7 +221,7 @@ qemuSlirpGetDBusPath(virQEMUDriverConfigPtr cfg, const virDomainDef *def, const char *alias) { - VIR_AUTOFREE(char *) shortName = NULL; + g_autofree char *shortName = NULL; char *path = NULL; if (!(shortName = virDomainDefGetShortName(def)) || @@ -241,9 +241,9 @@ qemuSlirpStop(qemuSlirpPtr slirp, bool hot) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOFREE(char *) pidfile = NULL; - VIR_AUTOFREE(char *) dbus_path = NULL; - VIR_AUTOFREE(char *) id = qemuSlirpGetDBusVMStateId(net); + g_autofree char *pidfile = NULL; + g_autofree char *dbus_path = NULL; + g_autofree char *id = qemuSlirpGetDBusVMStateId(net); virErrorPtr orig_err; pid_t pid; int rc; @@ -298,10 +298,10 @@ qemuSlirpStart(qemuSlirpPtr slirp, { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) pidfile = NULL; - VIR_AUTOFREE(char *) dbus_path = NULL; - VIR_AUTOFREE(char *) dbus_addr = NULL; - VIR_AUTOFREE(char *) id = NULL; + g_autofree char *pidfile = NULL; + g_autofree char *dbus_path = NULL; + g_autofree char *dbus_addr = NULL; + g_autofree char *id = NULL; size_t i; const unsigned long long timeout = 5 * 1000; /* ms */ pid_t pid = (pid_t) -1; @@ -334,7 +334,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, for (i = 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip = net->guestIP.ips[i]; - VIR_AUTOFREE(char *) addr = NULL; + g_autofree char *addr = NULL; const char *opt = ""; if (!(addr = virSocketAddrFormat(&ip->address))) @@ -350,7 +350,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, if (ip->prefix) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET)) { virSocketAddr netmask; - VIR_AUTOFREE(char *) netmaskStr = NULL; + g_autofree char *netmaskStr = NULL; if (virSocketAddrPrefixToNetmask(ip->prefix, &netmask, AF_INET) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 31fdfa995f..f21dbf9727 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -280,7 +280,7 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir, pid_t *pid) { int ret; - VIR_AUTOFREE(char *) swtpm = virTPMGetSwtpm(); + g_autofree char *swtpm = virTPMGetSwtpm(); char *pidfile = qemuTPMEmulatorCreatePidFilename(swtpmStateDir, shortName); if (!pidfile) @@ -399,7 +399,7 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, int ret = -1; int pipefd[2] = { -1, -1 }; virConnectPtr conn; - VIR_AUTOFREE(uint8_t *) secret = NULL; + g_autofree uint8_t *secret = NULL; size_t secret_len; virSecretLookupTypeDef seclookupdef = { .type = VIR_SECRET_LOOKUP_TYPE_UUID, @@ -475,7 +475,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, int ret = -1; char uuid[VIR_UUID_STRING_BUFLEN]; char *vmid = NULL; - VIR_AUTOFREE(char *)swtpm_setup = virTPMGetSwtpmSetup(); + g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); VIR_AUTOCLOSE pwdfile_fd = -1; if (!swtpm_setup) @@ -597,7 +597,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm, virCommandPtr cmd = NULL; bool created = false; char *pidfile; - VIR_AUTOFREE(char *) swtpm = virTPMGetSwtpm(); + g_autofree char *swtpm = virTPMGetSwtpm(); VIR_AUTOCLOSE pwdfile_fd = -1; VIR_AUTOCLOSE migpwdfile_fd = -1; const unsigned char *secretuuid = NULL; @@ -713,7 +713,7 @@ qemuTPMEmulatorStop(const char *swtpmStateDir, virCommandPtr cmd; char *pathname; char *errbuf = NULL; - VIR_AUTOFREE(char *) swtpm_ioctl = virTPMGetSwtpmIoctl(); + g_autofree char *swtpm_ioctl = virTPMGetSwtpmIoctl(); if (!swtpm_ioctl) return; diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index bdc6cfb104..d1dbc3bd5c 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -182,7 +182,7 @@ qemuVhostUserBinaryParse(const char *path, qemuVhostUserPtr qemuVhostUserParse(const char *path) { - VIR_AUTOFREE(char *) cont = NULL; + g_autofree char *cont = NULL; VIR_AUTOPTR(virJSONValue) doc = NULL; VIR_AUTOPTR(qemuVhostUser) vu = NULL; qemuVhostUserPtr ret = NULL; @@ -351,7 +351,7 @@ qemuVhostUserFillDomainGPU(virQEMUDriverPtr driver, for (i = 0; i < nvus; i++) { VIR_AUTOPTR(virJSONValue) doc = NULL; - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; vu = vus[i]; diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 1d6fdcb5e9..291a6a0d9e 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -45,7 +45,7 @@ qemuVhostUserGPUCreatePidFilename(const char *stateDir, const char *shortName, const char *alias) { - VIR_AUTOFREE(char *) devicename = NULL; + g_autofree char *devicename = NULL; if (virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias) < 0) return NULL; @@ -73,7 +73,7 @@ qemuVhostUserGPUGetPid(const char *binPath, const char *alias, pid_t *pid) { - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *pidfile = NULL; pidfile = qemuVhostUserGPUCreatePidFilename(stateDir, shortName, alias); if (!pidfile) @@ -106,8 +106,8 @@ int qemuExtVhostUserGPUStart(virQEMUDriverPtr driver, virDomainVideoDefPtr video) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOFREE(char *) shortname = NULL; - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *shortname = NULL; + g_autofree char *pidfile = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; int pair[2] = { -1, -1 }; int cmdret = 0, rc; @@ -210,8 +210,8 @@ void qemuExtVhostUserGPUStop(virQEMUDriverPtr driver, virDomainVideoDefPtr video) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOFREE(char *) pidfile = NULL; - VIR_AUTOFREE(char *) shortname = NULL; + g_autofree char *pidfile = NULL; + g_autofree char *shortname = NULL; virErrorPtr orig_err; shortname = virDomainDefGetShortName(vm->def); @@ -253,7 +253,7 @@ qemuExtVhostUserGPUSetupCgroup(virQEMUDriverPtr driver, virCgroupPtr cgroup) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOFREE(char *) shortname = NULL; + g_autofree char *shortname = NULL; int rc; pid_t pid; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 9153791b3c..56a46a13be 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2177,8 +2177,8 @@ remoteDispatchProbeURI(bool readonly, ssize_t i; for (i = 0; i < (ssize_t) G_N_ELEMENTS(drivers) && !*probeduri; i++) { - VIR_AUTOFREE(char *) daemonname = NULL; - VIR_AUTOFREE(char *) daemonpath = NULL; + g_autofree char *daemonname = NULL; + g_autofree char *daemonpath = NULL; if (virAsprintf(&daemonname, "virt%sd", drivers[i]) < 0) return -1; @@ -2223,7 +2223,7 @@ remoteDispatchProbeURI(bool readonly, ssize_t i; for (i = 0; i < (ssize_t) G_N_ELEMENTS(drivers) && !*probeduri; i++) { - VIR_AUTOFREE(char *) sockname = NULL; + g_autofree char *sockname = NULL; if (virAsprintf(&sockname, "%s/libvirt/virt%sd-%s", RUNSTATEDIR, drivers[i], @@ -2262,7 +2262,7 @@ remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, { const char *name; #ifdef VIRTPROXYD - VIR_AUTOFREE(char *) probeduri = NULL; + g_autofree char *probeduri = NULL; #endif unsigned int flags; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 5251079282..a0a0e311e0 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -771,7 +771,7 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transport, unsigned int flags) { char *sockname = NULL; - VIR_AUTOFREE(char *) userdir = NULL; + g_autofree char *userdir = NULL; if (flags & VIR_DRV_OPEN_REMOTE_USER) { if (transport != REMOTE_DRIVER_TRANSPORT_UNIX) { @@ -817,10 +817,10 @@ remoteGetUNIXSocket(remoteDriverTransport transport, unsigned int flags) { char *sock_name = NULL; - VIR_AUTOFREE(char *) direct_daemon = NULL; - VIR_AUTOFREE(char *) legacy_daemon = NULL; - VIR_AUTOFREE(char *) direct_sock_name = NULL; - VIR_AUTOFREE(char *) legacy_sock_name = NULL; + g_autofree char *direct_daemon = NULL; + g_autofree char *legacy_daemon = NULL; + g_autofree char *direct_sock_name = NULL; + g_autofree char *legacy_sock_name = NULL; if (driver && virAsprintf(&direct_daemon, "virt%sd", driver) < 0) @@ -945,23 +945,23 @@ doRemoteOpen(virConnectPtr conn, { int transport; #ifndef WIN32 - VIR_AUTOFREE(char *) daemonPath = NULL; + g_autofree char *daemonPath = NULL; #endif - VIR_AUTOFREE(char *) tls_priority = NULL; - VIR_AUTOFREE(char *) name = NULL; - VIR_AUTOFREE(char *) command = NULL; - VIR_AUTOFREE(char *) sockname = NULL; - VIR_AUTOFREE(char *) netcat = NULL; - VIR_AUTOFREE(char *) port = NULL; - VIR_AUTOFREE(char *) authtype = NULL; - VIR_AUTOFREE(char *) username = NULL; - VIR_AUTOFREE(char *) pkipath = NULL; - VIR_AUTOFREE(char *) keyfile = NULL; - VIR_AUTOFREE(char *) sshauth = NULL; - VIR_AUTOFREE(char *) knownHostsVerify = NULL; - VIR_AUTOFREE(char *) knownHosts = NULL; - VIR_AUTOFREE(char *) mode_str = NULL; - VIR_AUTOFREE(char *) daemon_name = NULL; + g_autofree char *tls_priority = NULL; + g_autofree char *name = NULL; + g_autofree char *command = NULL; + g_autofree char *sockname = NULL; + g_autofree char *netcat = NULL; + g_autofree char *port = NULL; + g_autofree char *authtype = NULL; + g_autofree char *username = NULL; + g_autofree char *pkipath = NULL; + g_autofree char *keyfile = NULL; + g_autofree char *sshauth = NULL; + g_autofree char *knownHostsVerify = NULL; + g_autofree char *knownHosts = NULL; + g_autofree char *mode_str = NULL; + g_autofree char *daemon_name = NULL; bool sanity = true; bool verify = true; #ifndef WIN32 diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 7e0a8351b4..ad4a684c16 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -476,8 +476,8 @@ secretStateInitialize(bool privileged, "%s/libvirt/secrets", RUNSTATEDIR) < 0) goto error; } else { - VIR_AUTOFREE(char *) rundir = NULL; - VIR_AUTOFREE(char *) cfgdir = NULL; + g_autofree char *rundir = NULL; + g_autofree char *cfgdir = NULL; if (!(cfgdir = virGetUserConfigDirectory())) goto error; diff --git a/src/security/security_util.c b/src/security/security_util.c index 4fd8289413..e6fbae7e34 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -162,9 +162,9 @@ static int virSecurityValidateTimestamp(const char *name, const char *path) { - VIR_AUTOFREE(char *) expected_timestamp = NULL; - VIR_AUTOFREE(char *) timestamp_name = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *expected_timestamp = NULL; + g_autofree char *timestamp_name = NULL; + g_autofree char *value = NULL; if (!(expected_timestamp = virSecurityGetTimestamp()) || !(timestamp_name = virSecurityGetTimestampAttrName(name))) @@ -208,8 +208,8 @@ static int virSecurityAddTimestamp(const char *name, const char *path) { - VIR_AUTOFREE(char *) timestamp_name = NULL; - VIR_AUTOFREE(char *) timestamp_value = NULL; + g_autofree char *timestamp_name = NULL; + g_autofree char *timestamp_value = NULL; if (!(timestamp_value = virSecurityGetTimestamp()) || !(timestamp_name = virSecurityGetTimestampAttrName(name))) @@ -223,7 +223,7 @@ static int virSecurityRemoveTimestamp(const char *name, const char *path) { - VIR_AUTOFREE(char *) timestamp_name = NULL; + g_autofree char *timestamp_name = NULL; if (!(timestamp_name = virSecurityGetTimestampAttrName(name))) return -1; @@ -265,9 +265,9 @@ virSecurityGetRememberedLabel(const char *name, const char *path, char **label) { - VIR_AUTOFREE(char *) ref_name = NULL; - VIR_AUTOFREE(char *) attr_name = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *ref_name = NULL; + g_autofree char *attr_name = NULL; + g_autofree char *value = NULL; unsigned int refcount = 0; *label = NULL; @@ -363,9 +363,9 @@ virSecuritySetRememberedLabel(const char *name, const char *path, const char *label) { - VIR_AUTOFREE(char *) ref_name = NULL; - VIR_AUTOFREE(char *) attr_name = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *ref_name = NULL; + g_autofree char *attr_name = NULL; + g_autofree char *value = NULL; unsigned int refcount = 0; if (!(ref_name = virSecurityGetRefCountAttrName(name))) @@ -448,12 +448,12 @@ virSecurityMoveRememberedLabel(const char *name, const char *src, const char *dst) { - VIR_AUTOFREE(char *) ref_name = NULL; - VIR_AUTOFREE(char *) ref_value = NULL; - VIR_AUTOFREE(char *) attr_name = NULL; - VIR_AUTOFREE(char *) attr_value = NULL; - VIR_AUTOFREE(char *) timestamp_name = NULL; - VIR_AUTOFREE(char *) timestamp_value = NULL; + g_autofree char *ref_name = NULL; + g_autofree char *ref_value = NULL; + g_autofree char *attr_name = NULL; + g_autofree char *attr_value = NULL; + g_autofree char *timestamp_name = NULL; + g_autofree char *timestamp_value = NULL; if (!(ref_name = virSecurityGetRefCountAttrName(name)) || !(attr_name = virSecurityGetAttrName(name)) || diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 6ab5844235..e9f6663e6d 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -87,7 +87,7 @@ virStorageDriverLoadBackendModule(const char *name, const char *regfunc, bool forceload) { - VIR_AUTOFREE(char *) modfile = NULL; + g_autofree char *modfile = NULL; if (!(modfile = virFileFindResourceFull(name, "libvirt_storage_backend_", diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 5bf704bcc8..742539036c 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -58,7 +58,7 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); char *tmp, *partname; bool addVol = false; - VIR_AUTOFREE(char *) devpath = NULL; + g_autofree char *devpath = NULL; /* Prepended path will be same for all partitions, so we can * strip the path to form a reasonable pool-unique name @@ -359,7 +359,7 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPtr pool, .pool = pool, .vol = vol, }; - VIR_AUTOFREE(char *) parthelper_path = NULL; + g_autofree char *parthelper_path = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; if (!(parthelper_path = virFileFindResource("libvirt_parthelper", @@ -413,7 +413,7 @@ static int virStorageBackendDiskReadGeometry(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOFREE(char *) parthelper_path = NULL; + g_autofree char *parthelper_path = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; if (!(parthelper_path = virFileFindResource("libvirt_parthelper", @@ -773,7 +773,7 @@ virStorageBackendDiskDeleteVol(virStoragePoolObjPtr pool, char *src_path = def->source.devices[0].path; char *srcname = last_component(src_path); bool isDevMapperDevice; - VIR_AUTOFREE(char *) devpath = NULL; + g_autofree char *devpath = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; virCheckFlags(0, -1); @@ -855,7 +855,7 @@ virStorageBackendDiskCreateVol(virStoragePoolObjPtr pool, unsigned long long startOffset = 0, endOffset = 0; virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virErrorPtr save_err; - VIR_AUTOFREE(char *)partFormat = NULL; + g_autofree char *partFormat = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; cmd = virCommandNewArgList(PARTED, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index ed677058ed..132b7e721f 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -249,7 +249,7 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) struct mntent ent; char buf[1024]; int rc1, rc2; - VIR_AUTOFREE(char *) src = NULL; + g_autofree char *src = NULL; if ((mtab = fopen(_PATH_MOUNTED, "r")) == NULL) { virReportSystemError(errno, @@ -298,7 +298,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int rc; - VIR_AUTOFREE(char *) src = NULL; + g_autofree char *src = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; if (virStorageBackendFileSystemIsValid(pool) < 0) @@ -576,7 +576,7 @@ virStoragePoolDefFSNamespaceParse(xmlXPathContextPtr ctxt, int nnodes; size_t i; int ret = -1; - VIR_AUTOFREE(xmlNodePtr *)nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; nnodes = virXPathNodeSet("./fs:mount_opts/fs:option", ctxt, &nodes); if (nnodes < 0) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 5955d834d9..7fb4e1ef8e 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -127,7 +127,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) if (glfs_set_volfile_server(ret->vol, "tcp", ret->uri->server, ret->uri->port) < 0 || glfs_init(ret->vol) < 0) { - VIR_AUTOFREE(char *) uri = NULL; + g_autofree char *uri = NULL; uri = virURIFormat(ret->uri); virReportSystemError(errno, _("failed to connect to %s"), NULLSTR(uri)); goto error; @@ -186,7 +186,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, const char *name) { char *tmp; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; VIR_FREE(vol->key); VIR_FREE(vol->target.path); @@ -240,7 +240,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, int backingFormat; VIR_AUTOPTR(virStorageVolDef) vol = NULL; VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; - VIR_AUTOFREE(char *) header = NULL; + g_autofree char *header = NULL; *volptr = NULL; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 06f815625f..eba9c4790f 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -131,7 +131,7 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool, const char *session) { uint32_t host; - VIR_AUTOFREE(char *) sysfs_path = NULL; + g_autofree char *sysfs_path = NULL; if (virAsprintf(&sysfs_path, "/sys/class/iscsi_session/session%s/device", session) < 0) @@ -160,7 +160,7 @@ virStorageBackendISCSIFindPoolSources(const char *srcSpec, .nsources = 0, .sources = NULL }; - VIR_AUTOFREE(char *) portal = NULL; + g_autofree char *portal = NULL; VIR_AUTOPTR(virStoragePoolSource) source = NULL; virCheckFlags(0, NULL); @@ -228,7 +228,7 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int ret = -1; - VIR_AUTOFREE(char *) session = NULL; + g_autofree char *session = NULL; *isActive = false; @@ -320,8 +320,8 @@ static int virStorageBackendISCSIStartPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOFREE(char *) portal = NULL; - VIR_AUTOFREE(char *) session = NULL; + g_autofree char *portal = NULL; + g_autofree char *session = NULL; if (def->source.nhost != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -366,7 +366,7 @@ static int virStorageBackendISCSIRefreshPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOFREE(char *) session = NULL; + g_autofree char *session = NULL; def->allocation = def->capacity = def->available = 0; @@ -385,8 +385,8 @@ static int virStorageBackendISCSIStopPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOFREE(char *) portal = NULL; - VIR_AUTOFREE(char *) session = NULL; + g_autofree char *portal = NULL; + g_autofree char *session = NULL; if ((session = virStorageBackendISCSISession(pool, true)) == NULL) return 0; diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index deb02a7173..9d8f7d9ed2 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -423,7 +423,7 @@ virISCSIDirectUpdateTargets(struct iscsi_context *iscsi, } for (tmp_addr = addr; tmp_addr; tmp_addr = tmp_addr->next) { - VIR_AUTOFREE(char *) target = NULL; + g_autofree char *target = NULL; if (VIR_STRDUP(target, tmp_addr->target_name) < 0) goto cleanup; @@ -490,7 +490,7 @@ virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec, .nsources = 0, .sources = NULL }; - VIR_AUTOFREE(char *) portal = NULL; + g_autofree char *portal = NULL; VIR_AUTOPTR(virStoragePoolSource) source = NULL; virCheckFlags(0, NULL); @@ -560,7 +560,7 @@ virStorageBackendISCSIDirectSetConnection(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); struct iscsi_context *iscsi = NULL; - VIR_AUTOFREE(char *) portal = NULL; + g_autofree char *portal = NULL; if (!(iscsi = virISCSIDirectCreateContext(def->source.initiator.iqn))) goto error; @@ -590,7 +590,7 @@ virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) { struct iscsi_context *iscsi = NULL; int ret = -1; - VIR_AUTOFREE(char *) portal = NULL; + g_autofree char *portal = NULL; if (!(iscsi = virStorageBackendISCSIDirectSetConnection(pool, &portal))) return -1; @@ -626,7 +626,7 @@ virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, struct scsi_task *task = NULL; int lun = 0; int ret = -1; - VIR_AUTOFREE(unsigned char *) data = NULL; + g_autofree unsigned char *data = NULL; if (virStorageBackendISCSIDirectGetLun(vol, &lun) < 0) return ret; diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 6e468b3579..784e238ba7 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -128,9 +128,9 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDefPtr vol, int err, nvars; unsigned long long offset, size, length; virStorageVolSourceExtent extent; - VIR_AUTOFREE(char *) regex = NULL; - VIR_AUTOFREE(regex_t *) reg = NULL; - VIR_AUTOFREE(regmatch_t *) vars = NULL; + g_autofree char *regex = NULL; + g_autofree regex_t *reg = NULL; + g_autofree regmatch_t *vars = NULL; memset(&extent, 0, sizeof(extent)); @@ -208,7 +208,7 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDefPtr vol, for (i = 0; i < nextents; i++) { size_t j; int len; - VIR_AUTOFREE(char *) offset_str = NULL; + g_autofree char *offset_str = NULL; j = (i * 2) + 1; len = vars[j].rm_eo - vars[j].rm_so; @@ -463,8 +463,8 @@ virStorageBackendLogicalFindPoolSourcesFunc(char **const groups, size_t i; virStoragePoolSourceDevicePtr dev; virStoragePoolSource *thisSource; - VIR_AUTOFREE(char *) pvname = NULL; - VIR_AUTOFREE(char *) vgname = NULL; + g_autofree char *pvname = NULL; + g_autofree char *vgname = NULL; if (VIR_STRDUP(pvname, groups[0]) < 0 || VIR_STRDUP(vgname, groups[1]) < 0) diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 4d41ea1107..cbd544b038 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -156,7 +156,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, int is_mpath = 0; uint32_t minor = -1; uint32_t next; - VIR_AUTOFREE(char *) map_device = NULL; + g_autofree char *map_device = NULL; do { is_mpath = virStorageBackendIsMultipath(names->name); diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4f4ade9d15..8b62969219 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -85,7 +85,7 @@ virStoragePoolDefRBDNamespaceParse(xmlXPathContextPtr ctxt, int nnodes; size_t i; int ret = -1; - VIR_AUTOFREE(xmlNodePtr *)nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; nnodes = virXPathNodeSet("./rbd:config_opts/rbd:option", ctxt, &nodes); if (nnodes < 0) @@ -198,7 +198,7 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, const char *osd_op_timeout = "30"; const char *rbd_default_format = "2"; virConnectPtr conn = NULL; - VIR_AUTOFREE(char *) mon_buff = NULL; + g_autofree char *mon_buff = NULL; if (authdef) { VIR_DEBUG("Using cephx authorization, username: %s", authdef->username); @@ -637,7 +637,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) size_t nnames = 0; int rc; size_t max_size = 1024; - VIR_AUTOFREE(char *) namebuf = NULL; + g_autofree char *namebuf = NULL; const char *name; while (true) { @@ -655,7 +655,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) } for (name = namebuf; name < namebuf + max_size;) { - VIR_AUTOFREE(char *) namedup = NULL; + g_autofree char *namedup = NULL; if (STREQ(name, "")) break; @@ -772,7 +772,7 @@ virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, int snap_count, protected; size_t i; rbd_image_t image = NULL; - VIR_AUTOFREE(rbd_snap_info_t *) snaps = NULL; + g_autofree rbd_snap_info_t *snaps = NULL; if ((r = rbd_open(ioctx, vol->name, &image, NULL)) < 0) { virReportSystemError(-r, _("failed to open the RBD image '%s'"), @@ -1042,7 +1042,7 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image, size_t i; int diff; rbd_image_info_t info; - VIR_AUTOFREE(rbd_snap_info_t *) snaps = NULL; + g_autofree rbd_snap_info_t *snaps = NULL; if ((r = rbd_stat(image, &info, sizeof(info))) < 0) { virReportSystemError(-r, _("failed to stat the RBD image %s"), @@ -1189,7 +1189,7 @@ virStorageBackendRBDCloneImage(rados_ioctx_t io, uint64_t stripe_unit; virBuffer snapname = VIR_BUFFER_INITIALIZER; rbd_image_t image = NULL; - VIR_AUTOFREE(char *) snapname_buff = NULL; + g_autofree char *snapname_buff = NULL; if ((r = rbd_open(io, origvol, &image, NULL)) < 0) { virReportSystemError(-r, _("failed to open the RBD image %s"), @@ -1362,7 +1362,7 @@ virStorageBackendRBDVolWipeZero(rbd_image_t image, int r = -1; unsigned long long offset = 0; unsigned long long length; - VIR_AUTOFREE(char *) writebuf = NULL; + g_autofree char *writebuf = NULL; if (VIR_ALLOC_N(writebuf, info->obj_size * stripe_count) < 0) return -1; diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 1c27fc74f6..14bf1352a6 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -56,7 +56,7 @@ static int virStorageBackendSCSITriggerRescan(uint32_t host) { VIR_AUTOCLOSE fd = -1; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; VIR_DEBUG("Triggering rescan of host %d", host); @@ -238,8 +238,8 @@ checkParent(const char *name, unsigned int host_num; bool retval = false; virConnectPtr conn = NULL; - VIR_AUTOFREE(char *) scsi_host_name = NULL; - VIR_AUTOFREE(char *) vhba_parent = NULL; + g_autofree char *scsi_host_name = NULL; + g_autofree char *vhba_parent = NULL; VIR_DEBUG("name=%s, parent_name=%s", name, parent_name); @@ -290,7 +290,7 @@ createVport(virStoragePoolDefPtr def, { virStoragePoolFCRefreshInfoPtr cbdata = NULL; virThread thread; - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *name = NULL; VIR_DEBUG("configFile='%s' parent='%s', wwnn='%s' wwpn='%s'", NULLSTR(configFile), NULLSTR(fchost->parent), @@ -355,8 +355,8 @@ virStorageBackendSCSICheckPool(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); unsigned int host; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *path = NULL; + g_autofree char *name = NULL; *isActive = false; @@ -390,7 +390,7 @@ virStorageBackendSCSIRefreshPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); unsigned int host; - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *name = NULL; def->allocation = def->capacity = def->available = 0; diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 6df90937c2..25183d0d2f 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -137,7 +137,7 @@ static int virStorageBackendSheepdogRefreshAllVol(virStoragePoolObjPtr pool) { size_t i; - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; VIR_AUTOSTRINGLIST lines = NULL; VIR_AUTOSTRINGLIST cells = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; @@ -176,7 +176,7 @@ virStorageBackendSheepdogRefreshAllVol(virStoragePoolObjPtr pool) static int virStorageBackendSheepdogRefreshPool(virStoragePoolObjPtr pool) { - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; cmd = virCommandNewArgList(SHEEPDOGCLI, "node", "info", "-r", NULL); diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index cec21dccbf..ee944c18e1 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -38,9 +38,9 @@ static int virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOFREE(char *) grp_name = NULL; - VIR_AUTOFREE(char *) usr_name = NULL; - VIR_AUTOFREE(char *) mode = NULL; + g_autofree char *grp_name = NULL; + g_autofree char *usr_name = NULL; + g_autofree char *mode = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; int ret; @@ -88,7 +88,7 @@ virStorageBackendVzIsMounted(virStoragePoolObjPtr pool) FILE *mtab; struct mntent ent; char buf[1024]; - VIR_AUTOFREE(char *) cluster = NULL; + g_autofree char *cluster = NULL; if (virAsprintf(&cluster, "vstorage://%s", def->source.name) < 0) return -1; diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 354d65d8c3..5a417119f3 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -52,7 +52,7 @@ static int virStorageBackendZFSVolModeNeeded(void) { int ret = -1, exit_code = -1; - VIR_AUTOFREE(char *) error = NULL; + g_autofree char *error = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; /* 'zfs get' without arguments prints out @@ -85,7 +85,7 @@ virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED, bool *isActive) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOFREE(char *) devpath = NULL; + g_autofree char *devpath = NULL; if (virAsprintf(&devpath, "/dev/zvol/%s", def->source.name) < 0) @@ -179,7 +179,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, size_t i; VIR_AUTOSTRINGLIST lines = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) volumes_list = NULL; + g_autofree char *volumes_list = NULL; /** * $ zfs list -Hp -t volume -o name,volsize -r test diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6516b0943d..af3b04fbf4 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -137,7 +137,7 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); bool active = false; virStorageBackendPtr backend; - VIR_AUTOFREE(char *) stateFile = NULL; + g_autofree char *stateFile = NULL; if ((backend = virStorageBackendForType(def->type)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -215,7 +215,7 @@ storageDriverAutostartCallback(virStoragePoolObjPtr obj, } if (started) { - VIR_AUTOFREE(char *) stateFile = NULL; + g_autofree char *stateFile = NULL; stateFile = virFileBuildPath(driver->stateDir, def->name, ".xml"); if (!stateFile || @@ -256,8 +256,8 @@ storageStateInitialize(bool privileged, virStateInhibitCallback callback G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { - VIR_AUTOFREE(char *) configdir = NULL; - VIR_AUTOFREE(char *) rundir = NULL; + g_autofree char *configdir = NULL; + g_autofree char *rundir = NULL; bool autostart = true; if (VIR_ALLOC(driver) < 0) @@ -739,7 +739,7 @@ storagePoolCreateXML(virConnectPtr conn, virObjectEventPtr event = NULL; unsigned int build_flags = 0; VIR_AUTOPTR(virStoragePoolDef) newDef = NULL; - VIR_AUTOFREE(char *) stateFile = NULL; + g_autofree char *stateFile = NULL; virCheckFlags(VIR_STORAGE_POOL_CREATE_WITH_BUILD | VIR_STORAGE_POOL_CREATE_WITH_BUILD_OVERWRITE | @@ -939,7 +939,7 @@ storagePoolCreate(virStoragePoolPtr pool, virObjectEventPtr event = NULL; int ret = -1; unsigned int build_flags = 0; - VIR_AUTOFREE(char *) stateFile = NULL; + g_autofree char *stateFile = NULL; bool restoreStarting = false; virCheckFlags(VIR_STORAGE_POOL_CREATE_WITH_BUILD | @@ -1091,7 +1091,7 @@ storagePoolDestroy(virStoragePoolPtr pool) virStorageBackendPtr backend; virObjectEventPtr event = NULL; int ret = -1; - VIR_AUTOFREE(char *) stateFile = NULL; + g_autofree char *stateFile = NULL; if (!(obj = storagePoolObjFindByUUID(pool->uuid, pool->name))) goto cleanup; @@ -1162,7 +1162,7 @@ storagePoolDelete(virStoragePoolPtr pool, virStorageBackendPtr backend; virObjectEventPtr event = NULL; int ret = -1; - VIR_AUTOFREE(char *) stateFile = NULL; + g_autofree char *stateFile = NULL; if (!(obj = virStoragePoolObjFromStoragePool(pool))) return -1; @@ -1231,7 +1231,7 @@ storagePoolRefresh(virStoragePoolPtr pool, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; virStorageBackendPtr backend; - VIR_AUTOFREE(char *) stateFile = NULL; + g_autofree char *stateFile = NULL; int ret = -1; virObjectEventPtr event = NULL; @@ -1632,7 +1632,7 @@ storageVolLookupByPathCallback(virStoragePoolObjPtr obj, { struct storageVolLookupData *data = (struct storageVolLookupData *)opaque; virStoragePoolDefPtr def; - VIR_AUTOFREE(char *) stable_path = NULL; + g_autofree char *stable_path = NULL; if (!virStoragePoolObjIsActive(obj)) return false; @@ -1740,7 +1740,7 @@ storagePoolLookupByTargetPath(virConnectPtr conn, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; virStoragePoolPtr pool = NULL; - VIR_AUTOFREE(char *) cleanpath = NULL; + g_autofree char *cleanpath = NULL; cleanpath = virFileSanitizePath(path); if (!cleanpath) @@ -2296,8 +2296,8 @@ static int virStorageBackendPloopRestoreDesc(char *path) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) refresh_tool = NULL; - VIR_AUTOFREE(char *) desc = NULL; + g_autofree char *refresh_tool = NULL; + g_autofree char *desc = NULL; if (virAsprintf(&desc, "%s/DiskDescriptor.xml", path) < 0) return -1; diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_gluster.c index 7c2189d297..babb8fbe94 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -261,7 +261,7 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path, size_t bufsiz = 0; ssize_t ret; struct stat st; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; *linkpath = NULL; @@ -301,7 +301,7 @@ static const char * virStorageFileBackendGlusterGetUniqueIdentifier(virStorageSourcePtr src) { virStorageFileBackendGlusterPrivPtr priv = src->drv->priv; - VIR_AUTOFREE(char *) filePath = NULL; + g_autofree char *filePath = NULL; if (priv->canonpath) return priv->canonpath; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 83e93253e4..6a99387597 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -136,8 +136,8 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, int wbytes = 0; int interval; struct stat st; - VIR_AUTOFREE(char *) zerobuf = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *zerobuf = NULL; + g_autofree char *buf = NULL; VIR_AUTOCLOSE inputfd = -1; if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { @@ -599,7 +599,7 @@ storageBackendCreatePloop(virStoragePoolObjPtr pool G_GNUC_UNUSED, int ret = -1; bool created = false; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) create_tool = NULL; + g_autofree char *create_tool = NULL; virCheckFlags(0, -1); @@ -668,7 +668,7 @@ storagePloopResize(virStorageVolDefPtr vol, unsigned long long capacity) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) resize_tool = NULL; + g_autofree char *resize_tool = NULL; resize_tool = virFindFileInPath("ploop"); if (!resize_tool) { @@ -857,7 +857,7 @@ storageBackendCreateQemuImgSetBacking(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int accessRetCode = -1; - VIR_AUTOFREE(char *) absolutePath = NULL; + g_autofree char *absolutePath = NULL; if (info->format == VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -919,7 +919,7 @@ storageBackendCreateQemuImgSetOptions(virCommandPtr cmd, virStorageEncryptionInfoDefPtr encinfo, struct _virStorageBackendQemuImgInfo *info) { - VIR_AUTOFREE(char *) opts = NULL; + g_autofree char *opts = NULL; if (storageBackendCreateQemuImgOpts(encinfo, &opts, info) < 0) return -1; @@ -941,7 +941,7 @@ storageBackendCreateQemuImgSecretObject(virCommandPtr cmd, const char *secretAlias) { virBuffer buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) commandStr = NULL; + g_autofree char *commandStr = NULL; virBufferAsprintf(&buf, "secret,id=%s,file=", secretAlias); virQEMUBuildBufferEscapeComma(&buf, secretPath); @@ -970,7 +970,7 @@ storageBackendResizeQemuImgImageOpts(virCommandPtr cmd, const char *secretAlias) { virBuffer buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) commandStr = NULL; + g_autofree char *commandStr = NULL; virBufferAsprintf(&buf, "driver=luks,key-secret=%s,file.filename=", secretAlias); @@ -1092,7 +1092,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, virStorageEncryptionPtr enc = vol->target.encryption; virStorageEncryptionPtr inputenc = inputvol ? inputvol->target.encryption : NULL; virStorageEncryptionInfoDefPtr encinfo = NULL; - VIR_AUTOFREE(char *) inputSecretAlias = NULL; + g_autofree char *inputSecretAlias = NULL; virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); @@ -1306,9 +1306,9 @@ storageBackendCreateQemuImg(virStoragePoolObjPtr pool, { int ret = -1; virStorageVolEncryptConvertStep convertStep = VIR_STORAGE_VOL_ENCRYPT_NONE; - VIR_AUTOFREE(char *) create_tool = NULL; - VIR_AUTOFREE(char *) secretPath = NULL; - VIR_AUTOFREE(char *) inputSecretPath = NULL; + g_autofree char *create_tool = NULL; + g_autofree char *secretPath = NULL; + g_autofree char *inputSecretPath = NULL; virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, -1); @@ -1680,8 +1680,8 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, static bool storageBackendIsPloopDir(char *path) { - VIR_AUTOFREE(char *) root = NULL; - VIR_AUTOFREE(char *) desc = NULL; + g_autofree char *root = NULL; + g_autofree char *desc = NULL; if (virAsprintf(&root, "%s/root.hds", path) < 0) return false; @@ -1704,7 +1704,7 @@ static int storageBackendRedoPloopUpdate(virStorageSourcePtr target, struct stat *sb, int *fd, unsigned int flags) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAsprintf(&path, "%s/root.hds", target->path) < 0) return -1; @@ -1738,7 +1738,7 @@ storageBackendUpdateVolTargetInfo(virStorageVolType voltype, int rc; struct stat sb; ssize_t len = VIR_STORAGE_MAX_HEADER; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; VIR_AUTOCLOSE fd = -1; if ((rc = virStorageBackendVolOpen(target->path, &sb, openflags)) < 0) @@ -2262,9 +2262,9 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, const char *type; virStorageEncryptionPtr enc = vol->target.encryption; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) img_tool = NULL; - VIR_AUTOFREE(char *) secretPath = NULL; - VIR_AUTOFREE(char *) secretAlias = NULL; + g_autofree char *img_tool = NULL; + g_autofree char *secretPath = NULL; + g_autofree char *secretAlias = NULL; if (enc && (enc->format == VIR_STORAGE_ENCRYPTION_FORMAT_QCOW || enc->format == VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT) && @@ -2382,7 +2382,7 @@ storageBackendPloopHasSnapshots(char *path) { char *snap_tool = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; snap_tool = virFindFileInPath("ploop"); if (!snap_tool) { @@ -2417,7 +2417,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, char *target_path = vol->target.path; int has_snap = 0; bool sparse = flags & VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM; - VIR_AUTOFREE(char *)path = NULL; + g_autofree char *path = NULL; virCheckFlags(VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM, -1); /* if volume has target format VIR_STORAGE_FILE_PLOOP @@ -2458,7 +2458,7 @@ virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, char *target_path = vol->target.path; int has_snap = 0; bool sparse = flags & VIR_STORAGE_VOL_DOWNLOAD_SPARSE_STREAM; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; virCheckFlags(VIR_STORAGE_VOL_DOWNLOAD_SPARSE_STREAM, -1); if (vol->target.format == VIR_STORAGE_FILE_PLOOP) { @@ -2531,7 +2531,7 @@ storageBackendWipeLocal(const char *path, unsigned long long remaining = 0; off_t size; size_t write_size = 0; - VIR_AUTOFREE(char *) writebuf = NULL; + g_autofree char *writebuf = NULL; if (VIR_ALLOC_N(writebuf, writebuf_length) < 0) return -1; @@ -2673,9 +2673,9 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, unsigned int algorithm) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) target_path = NULL; - VIR_AUTOFREE(char *) disk_desc = NULL; - VIR_AUTOFREE(char *) create_tool = NULL; + g_autofree char *target_path = NULL; + g_autofree char *disk_desc = NULL; + g_autofree char *create_tool = NULL; create_tool = virFindFileInPath("ploop"); if (!create_tool) { @@ -2755,7 +2755,7 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool) mode_t mode; bool needs_create_as_uid; unsigned int dir_create_flags; - VIR_AUTOFREE(char *) parent = NULL; + g_autofree char *parent = NULL; if (VIR_STRDUP(parent, def->target.path) < 0) return -1; @@ -2839,8 +2839,8 @@ virStorageUtilGlusterExtractPoolSources(const char *host, size_t i; int nnodes; int ret = -1; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; - VIR_AUTOFREE(char *) volname = NULL; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree char *volname = NULL; if (!(doc = virXMLParseStringCtxt(xml, _("(gluster_cli_output)"), &ctxt))) goto cleanup; @@ -2914,8 +2914,8 @@ virStorageBackendFindGlusterPoolSources(const char *host, { int rc; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) glusterpath = NULL; - VIR_AUTOFREE(char *) outbuf = NULL; + g_autofree char *glusterpath = NULL; + g_autofree char *outbuf = NULL; if (!(glusterpath = virFindFileInPath("gluster"))) { if (report) { @@ -3182,8 +3182,8 @@ virStorageBackendPARTEDFindLabel(const char *device, char *start, *end; int ret = VIR_STORAGE_PARTED_ERROR; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) output = NULL; - VIR_AUTOFREE(char *) error = NULL; + g_autofree char *output = NULL; + g_autofree char *error = NULL; cmd = virCommandNew(PARTED); virCommandAddArgSet(cmd, args); @@ -3667,7 +3667,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int retval = -1; VIR_AUTOPTR(virStorageVolDef) vol = NULL; - VIR_AUTOFREE(char *) devpath = NULL; + g_autofree char *devpath = NULL; /* Check if the pool is using a stable target path. The call to * virStorageBackendStablePath will fail if the pool target path @@ -3757,7 +3757,7 @@ getNewStyleBlockDevice(const char *lun_path, struct dirent *block_dirent = NULL; int retval = -1; int direrr; - VIR_AUTOFREE(char *) block_path = NULL; + g_autofree char *block_path = NULL; if (virAsprintf(&block_path, "%s/block", lun_path) < 0) goto cleanup; @@ -3836,7 +3836,7 @@ getBlockDevice(uint32_t host, struct dirent *lun_dirent = NULL; int retval = -1; int direrr; - VIR_AUTOFREE(char *) lun_path = NULL; + g_autofree char *lun_path = NULL; *block_device = NULL; @@ -3892,7 +3892,7 @@ getDeviceType(uint32_t host, char typestr[3]; char *gottype, *p; FILE *typefile; - VIR_AUTOFREE(char *) type_path = NULL; + g_autofree char *type_path = NULL; if (virAsprintf(&type_path, "/sys/bus/scsi/devices/%u:%u:%u:%u/type", host, bus, target, lun) < 0) @@ -3953,7 +3953,7 @@ processLU(virStoragePoolObjPtr pool, { int retval = -1; int device_type; - VIR_AUTOFREE(char *) block_device = NULL; + g_autofree char *block_device = NULL; VIR_DEBUG("Processing LU %u:%u:%u:%u", host, bus, target, lun); @@ -4107,7 +4107,7 @@ virStorageBackendFileSystemMountAddOptions(virCommandPtr cmd, virStoragePoolDefPtr def, const char *providedOpts) { - VIR_AUTOFREE(char *) mountOpts = NULL; + g_autofree char *mountOpts = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; if (*default_mount_opts != '\0') @@ -4206,7 +4206,7 @@ virStorageBackendFileSystemMountCmd(const char *cmdstr, bool cifsfs = (def->type == VIR_STORAGE_POOL_NETFS && def->source.format == VIR_STORAGE_POOL_NETFS_CIFS); virCommandPtr cmd = NULL; - VIR_AUTOFREE(char *) nfsVers = NULL; + g_autofree char *nfsVers = NULL; if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer > 0 && virAsprintf(&nfsVers, "nfsvers=%u", def->source.protocolVer) < 0) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 338d459e14..237bcb9c7e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -202,7 +202,7 @@ testDomainDefNamespaceParse(xmlXPathContextPtr ctxt, int tmp, n; size_t i; unsigned int tmpuint; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; if (VIR_ALLOC(nsdata) < 0) return -1; @@ -753,7 +753,7 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type) xmlNodePtr ret = NULL; xmlDocPtr doc = NULL; char *absFile = NULL; - VIR_AUTOFREE(char *) relFile = NULL; + g_autofree char *relFile = NULL; if ((relFile = virXMLPropString(node, "file"))) { absFile = testBuildFilename(file, relFile); @@ -787,7 +787,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) { long l; int ret; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; ret = virXPathLong("string(/node/cpu/nodes[1])", ctxt, &l); if (ret == 0) { @@ -935,7 +935,7 @@ testParseDomains(testDriverPtr privconn, int num, ret = -1; size_t i; virDomainObjPtr obj = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; num = virXPathNodeSet("/node/domain", ctxt, &nodes); if (num < 0) @@ -997,7 +997,7 @@ testParseNetworks(testDriverPtr privconn, int num; size_t i; virNetworkObjPtr obj; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; num = virXPathNodeSet("/node/network", ctxt, &nodes); if (num < 0) @@ -1034,7 +1034,7 @@ testParseInterfaces(testDriverPtr privconn, int num; size_t i; virInterfaceObjPtr obj; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; num = virXPathNodeSet("/node/interface", ctxt, &nodes); if (num < 0) @@ -1073,8 +1073,8 @@ testOpenVolumesForPool(const char *file, virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); size_t i; int num; - VIR_AUTOFREE(char *) vol_xpath = NULL; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree char *vol_xpath = NULL; + g_autofree xmlNodePtr *nodes = NULL; VIR_AUTOPTR(virStorageVolDef) volDef = NULL; /* Find storage volumes */ @@ -1123,7 +1123,7 @@ testParseStorage(testDriverPtr privconn, int num; size_t i; virStoragePoolObjPtr obj; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; num = virXPathNodeSet("/node/pool", ctxt, &nodes); if (num < 0) @@ -1172,7 +1172,7 @@ testParseNodedevs(testDriverPtr privconn, int num; size_t i; virNodeDeviceObjPtr obj; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; num = virXPathNodeSet("/node/device", ctxt, &nodes); if (num < 0) @@ -1207,7 +1207,7 @@ testParseAuthUsers(testDriverPtr privconn, { int num; size_t i; - VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + g_autofree xmlNodePtr *nodes = NULL; num = virXPathNodeSet("/node/auth/user", ctxt, &nodes); if (num < 0) @@ -1218,7 +1218,7 @@ testParseAuthUsers(testDriverPtr privconn, return -1; for (i = 0; i < num; i++) { - VIR_AUTOFREE(char *) username = NULL; + g_autofree char *username = NULL; ctxt->node = nodes[i]; username = virXPathString("string(.)", ctxt); @@ -1382,8 +1382,8 @@ testConnectAuthenticate(virConnectPtr conn, testDriverPtr privconn = conn->privateData; int ret = -1; ssize_t i; - VIR_AUTOFREE(char *) username = NULL; - VIR_AUTOFREE(char *) password = NULL; + g_autofree char *username = NULL; + g_autofree char *password = NULL; virObjectLock(privconn); if (privconn->numAuths == 0) { @@ -2182,7 +2182,7 @@ testDomainSaveImageWrite(testDriverPtr driver, { int len; int fd = -1; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; xml = virDomainDefFormat(def, driver->caps, VIR_DOMAIN_DEF_FORMAT_SECURE); @@ -2260,7 +2260,7 @@ testDomainSaveImageOpen(testDriverPtr driver, int fd = -1; int len; virDomainDefPtr def = NULL; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; if ((fd = open(path, O_RDONLY)) < 0) { virReportSystemError(errno, _("cannot read domain image '%s'"), path); @@ -3095,7 +3095,7 @@ testDomainRenameCallback(virDomainObjPtr privdom, virObjectEventPtr event_new = NULL; virObjectEventPtr event_old = NULL; int ret = -1; - VIR_AUTOFREE(char *) new_dom_name = NULL; + g_autofree char *new_dom_name = NULL; virCheckFlags(0, -1); @@ -3412,7 +3412,7 @@ testDomainGetNumaParameters(virDomainPtr dom, virDomainObjPtr vm = NULL; virDomainDefPtr def = NULL; virDomainNumatuneMemMode mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; - VIR_AUTOFREE(char *) nodeset = NULL; + g_autofree char *nodeset = NULL; int ret = -1; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -7435,7 +7435,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, virNodeDeviceObjPtr obj = NULL, objcopy = NULL; virNodeDeviceDefPtr objdef; virObjectEventPtr event = NULL; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; /* In the real code, we'd call virVHBAManageVport which would take the * wwnn/wwpn from the input XML in order to call the "vport_create" @@ -7514,8 +7514,8 @@ testNodeDeviceCreateXML(virConnectPtr conn, virNodeDevicePtr dev = NULL, ret = NULL; virNodeDeviceObjPtr obj = NULL; virNodeDeviceDefPtr objdef; - VIR_AUTOFREE(char *) wwnn = NULL; - VIR_AUTOFREE(char *) wwpn = NULL; + g_autofree char *wwnn = NULL; + g_autofree char *wwpn = NULL; virCheckFlags(0, NULL); @@ -7568,8 +7568,8 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) virNodeDeviceObjPtr parentobj = NULL; virNodeDeviceDefPtr def; virObjectEventPtr event = NULL; - VIR_AUTOFREE(char *) wwnn = NULL; - VIR_AUTOFREE(char *) wwpn = NULL; + g_autofree char *wwnn = NULL; + g_autofree char *wwpn = NULL; if (!(obj = testNodeDeviceObjFindByName(driver, dev->name))) return -1; diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 3dc0488b26..a102a95abb 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -42,7 +42,7 @@ static int runIO(const char *path, int fd, int oflags) { - VIR_AUTOFREE(void *) base = NULL; /* Location to be freed */ + g_autofree void *base = NULL; /* Location to be freed */ char *buf = NULL; /* Aligned location within base */ size_t buflen = 1024*1024; intptr_t alignMask = 64*1024 - 1; diff --git a/src/util/virarptable.c b/src/util/virarptable.c index 47ac1bb9ab..cc676a0200 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -66,7 +66,7 @@ virArpTableGet(void) { int num = 0; int msglen; - VIR_AUTOFREE(void *) nlData = NULL; + g_autofree void *nlData = NULL; virArpTablePtr table = NULL; struct nlmsghdr* nh; struct rtattr * tb[NDA_MAX+1]; @@ -113,7 +113,7 @@ virArpTableGet(void) continue; if (tb[NDA_DST]) { - VIR_AUTOFREE(char *) ipstr = NULL; + g_autofree char *ipstr = NULL; virSocketAddr virAddr; if (VIR_REALLOC_N(table->t, num + 1) < 0) goto cleanup; diff --git a/src/util/viraudit.c b/src/util/viraudit.c index b54ae1283e..9bf42824f6 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -96,7 +96,7 @@ void virAuditSend(virLogSourcePtr source, virAuditRecordType type G_GNUC_UNUSED, bool success, const char *fmt, ...) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; va_list args; /* Duplicate later checks, to short circuit & avoid printf overhead diff --git a/src/util/virauth.c b/src/util/virauth.c index 9de3996e92..004b2f3a71 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -43,7 +43,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, { size_t i; const char *authenv = getenv("LIBVIRT_AUTH_FILE"); - VIR_AUTOFREE(char *) userdir = NULL; + g_autofree char *userdir = NULL; *path = NULL; @@ -145,7 +145,7 @@ virAuthGetUsernamePath(const char *path, { unsigned int ncred; virConnectCredential cred; - VIR_AUTOFREE(char *) prompt = NULL; + g_autofree char *prompt = NULL; char *ret = NULL; if (virAuthGetCredential(servicename, hostname, "username", path, &ret) < 0) @@ -210,7 +210,7 @@ virAuthGetUsername(virConnectPtr conn, const char *defaultUsername, const char *hostname) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAuthGetConfigFilePath(conn, &path) < 0) return NULL; @@ -229,7 +229,7 @@ virAuthGetPasswordPath(const char *path, { unsigned int ncred; virConnectCredential cred; - VIR_AUTOFREE(char *) prompt = NULL; + g_autofree char *prompt = NULL; char *ret = NULL; if (virAuthGetCredential(servicename, hostname, "password", path, &ret) < 0) @@ -292,7 +292,7 @@ virAuthGetPassword(virConnectPtr conn, const char *username, const char *hostname) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAuthGetConfigFilePath(conn, &path) < 0) return NULL; diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 2c6379680a..9e55852cd4 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -104,8 +104,8 @@ int virAuthConfigLookup(virAuthConfigPtr auth, const char *credname, const char **value) { - VIR_AUTOFREE(char *) authgroup = NULL; - VIR_AUTOFREE(char *) credgroup = NULL; + g_autofree char *authgroup = NULL; + g_autofree char *credgroup = NULL; const char *authcred; *value = NULL; diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 12b33f8bd6..04c8fd7291 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -436,7 +436,7 @@ void virBufferEscapeString(virBufferPtr buf, const char *format, const char *str) { int len; - VIR_AUTOFREE(char *) escaped = NULL; + g_autofree char *escaped = NULL; char *out; const char *cur; const char forbidden_characters[] = { @@ -592,7 +592,7 @@ virBufferEscape(virBufferPtr buf, char escape, const char *toescape, const char *format, const char *str) { int len; - VIR_AUTOFREE(char *) escaped = NULL; + g_autofree char *escaped = NULL; char *out; const char *cur; @@ -689,7 +689,7 @@ void virBufferEscapeShell(virBufferPtr buf, const char *str) { int len; - VIR_AUTOFREE(char *) escaped = NULL; + g_autofree char *escaped = NULL; char *out; const char *cur; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index c6e4cf2dde..e5b1df56e8 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -132,7 +132,7 @@ virCgroupPartitionNeedsEscaping(const char *path) { FILE *fp = NULL; int ret = 0; - VIR_AUTOFREE(char *) line = NULL; + g_autofree char *line = NULL; size_t buflen; /* If it starts with 'cgroup.' or a '_' of any @@ -284,7 +284,7 @@ virCgroupDetectPlacement(virCgroupPtr group, FILE *mapping = NULL; char line[1024]; int ret = -1; - VIR_AUTOFREE(char *) procfile = NULL; + g_autofree char *procfile = NULL; VIR_DEBUG("Detecting placement for pid %lld path %s", (long long) pid, path); @@ -508,7 +508,7 @@ virCgroupSetValueStr(virCgroupPtr group, const char *key, const char *value) { - VIR_AUTOFREE(char *) keypath = NULL; + g_autofree char *keypath = NULL; if (virCgroupPathOfController(group, controller, key, &keypath) < 0) return -1; @@ -523,7 +523,7 @@ virCgroupGetValueStr(virCgroupPtr group, const char *key, char **value) { - VIR_AUTOFREE(char *) keypath = NULL; + g_autofree char *keypath = NULL; if (virCgroupPathOfController(group, controller, key, &keypath) < 0) return -1; @@ -537,7 +537,7 @@ virCgroupGetValueForBlkDev(const char *str, const char *path, char **value) { - VIR_AUTOFREE(char *) prefix = NULL; + g_autofree char *prefix = NULL; char **lines = NULL; int ret = -1; @@ -563,7 +563,7 @@ virCgroupSetValueU64(virCgroupPtr group, const char *key, unsigned long long int value) { - VIR_AUTOFREE(char *) strval = NULL; + g_autofree char *strval = NULL; if (virAsprintf(&strval, "%llu", value) < 0) return -1; @@ -578,7 +578,7 @@ virCgroupSetValueI64(virCgroupPtr group, const char *key, long long int value) { - VIR_AUTOFREE(char *) strval = NULL; + g_autofree char *strval = NULL; if (virAsprintf(&strval, "%lld", value) < 0) return -1; @@ -593,7 +593,7 @@ virCgroupGetValueI64(virCgroupPtr group, const char *key, long long int *value) { - VIR_AUTOFREE(char *) strval = NULL; + g_autofree char *strval = NULL; if (virCgroupGetValueStr(group, controller, key, &strval) < 0) return -1; @@ -615,7 +615,7 @@ virCgroupGetValueU64(virCgroupPtr group, const char *key, unsigned long long int *value) { - VIR_AUTOFREE(char *) strval = NULL; + g_autofree char *strval = NULL; if (virCgroupGetValueStr(group, controller, key, &strval) < 0) return -1; @@ -842,8 +842,8 @@ virCgroupNewPartition(const char *path, virCgroupPtr *group) { int ret = -1; - VIR_AUTOFREE(char *) parentPath = NULL; - VIR_AUTOFREE(char *) newPath = NULL; + g_autofree char *parentPath = NULL; + g_autofree char *newPath = NULL; virCgroupPtr parent = NULL; VIR_DEBUG("path=%s create=%d controllers=%x", path, create, controllers); @@ -920,7 +920,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition, bool create, virCgroupPtr *group) { - VIR_AUTOFREE(char *)grpname = NULL; + g_autofree char *grpname = NULL; if (virAsprintf(&grpname, "%s.libvirt-%s", name, driver) < 0) @@ -970,7 +970,7 @@ virCgroupNewThread(virCgroupPtr domain, bool create, virCgroupPtr *group) { - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *name = NULL; int controllers; switch (nameval) { @@ -1123,7 +1123,7 @@ virCgroupNewMachineSystemd(const char *name, { int rv; virCgroupPtr init; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; size_t i; VIR_DEBUG("Trying to setup machine '%s' via systemd", name); @@ -2061,7 +2061,7 @@ virCgroupGetPercpuVcpuSum(virCgroupPtr group, virCgroupPtr group_vcpu = NULL; while ((i = virBitmapNextSetBit(guestvcpus, i)) >= 0) { - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; char *pos; unsigned long long tmp; ssize_t j; @@ -2127,8 +2127,8 @@ virCgroupGetPercpuStats(virCgroupPtr group, size_t i; int need_cpus, total_cpus; char *pos; - VIR_AUTOFREE(char *) buf = NULL; - VIR_AUTOFREE(unsigned long long *) sum_cpu_time = NULL; + g_autofree char *buf = NULL; + g_autofree unsigned long long *sum_cpu_time = NULL; virTypedParameterPtr ent; int param_idx; unsigned long long cpu_time; @@ -2359,7 +2359,7 @@ virCgroupRemoveRecursively(char *grppath) /* This is best-effort cleanup: we want to log failures with just * VIR_ERROR instead of normal virReportError */ while ((direrr = virDirRead(grpdir, &ent, NULL)) > 0) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (ent->d_type != DT_DIR) continue; @@ -2429,7 +2429,7 @@ virCgroupKillInternal(virCgroupPtr group, { int ret = -1; bool killedAny = false; - VIR_AUTOFREE(char *) keypath = NULL; + g_autofree char *keypath = NULL; bool done = false; FILE *fp = NULL; VIR_DEBUG("group=%p path=%s signum=%d pids=%p", @@ -2532,7 +2532,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, int ret = -1; int rc; bool killedAny = false; - VIR_AUTOFREE(char *) keypath = NULL; + g_autofree char *keypath = NULL; DIR *dp = NULL; virCgroupPtr subgroup = NULL; struct dirent *ent; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index dcf8e3383b..d23045331e 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -92,10 +92,10 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group, const char *machinename) { size_t i; - VIR_AUTOFREE(char *) partname = NULL; - VIR_AUTOFREE(char *) scopename_old = NULL; - VIR_AUTOFREE(char *) scopename_new = NULL; - VIR_AUTOFREE(char *) partmachinename = NULL; + g_autofree char *partname = NULL; + g_autofree char *scopename_old = NULL; + g_autofree char *scopename_new = NULL; + g_autofree char *partmachinename = NULL; if (virAsprintf(&partname, "%s.libvirt-%s", name, drivername) < 0) @@ -228,8 +228,8 @@ virCgroupV1ResolveMountLink(const char *mntDir, const char *typeStr, virCgroupV1ControllerPtr controller) { - VIR_AUTOFREE(char *) linkSrc = NULL; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *linkSrc = NULL; + g_autofree char *tmp = NULL; char *dirName; struct stat sb; @@ -556,7 +556,7 @@ virCgroupV1CpuSetInherit(virCgroupPtr parent, VIR_DEBUG("Setting up inheritance %s -> %s", parent->path, group->path); for (i = 0; i < G_N_ELEMENTS(inherit_values); i++) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; if (virCgroupGetValueStr(parent, VIR_CGROUP_CONTROLLER_CPUSET, @@ -612,7 +612,7 @@ virCgroupV1MakeGroup(virCgroupPtr parent, VIR_DEBUG("Make group %s", group->path); for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; /* We must never mkdir() in systemd's hierarchy */ if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) { @@ -682,7 +682,7 @@ virCgroupV1Remove(virCgroupPtr group) VIR_DEBUG("Removing cgroup %s", group->path); for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - VIR_AUTOFREE(char *) grppath = NULL; + g_autofree char *grppath = NULL; /* Skip over controllers not mounted */ if (!group->legacy[i].mountPoint) @@ -747,7 +747,7 @@ virCgroupV1HasEmptyTasks(virCgroupPtr cgroup, int controller) { int ret = -1; - VIR_AUTOFREE(char *) content = NULL; + g_autofree char *content = NULL; if (!cgroup) return -1; @@ -811,8 +811,8 @@ virCgroupV1BindMount(virCgroupPtr group, const char *mountopts) { size_t i; - VIR_AUTOFREE(char *) opts = NULL; - VIR_AUTOFREE(char *) root = NULL; + g_autofree char *opts = NULL; + g_autofree char *root = NULL; if (!(root = virCgroupV1IdentifyRoot(group))) return -1; @@ -842,7 +842,7 @@ virCgroupV1BindMount(virCgroupPtr group, continue; if (!virFileExists(group->legacy[i].mountPoint)) { - VIR_AUTOFREE(char *) src = NULL; + g_autofree char *src = NULL; if (virAsprintf(&src, "%s%s", oldroot, group->legacy[i].mountPoint) < 0) @@ -897,7 +897,7 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, int direrr; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - VIR_AUTOFREE(char *) base = NULL; + g_autofree char *base = NULL; struct dirent *de; if (!((1 << i) & controllers)) @@ -914,7 +914,7 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, goto cleanup; while ((direrr = virDirRead(dh, &de, base)) > 0) { - VIR_AUTOFREE(char *) entry = NULL; + g_autofree char *entry = NULL; if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0) goto cleanup; @@ -951,8 +951,8 @@ static int virCgroupV1SetBlkioWeight(virCgroupPtr group, unsigned int weight) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *path = NULL; + g_autofree char *value = NULL; if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.bfq.weight", &path) < 0) { @@ -985,8 +985,8 @@ static int virCgroupV1GetBlkioWeight(virCgroupPtr group, unsigned int *weight) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *path = NULL; + g_autofree char *value = NULL; if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.bfq.weight", &path) < 0) { @@ -1030,8 +1030,8 @@ virCgroupV1GetBlkioIoServiced(virCgroupPtr group, long long *requests_write) { long long stats_val; - VIR_AUTOFREE(char *) str1 = NULL; - VIR_AUTOFREE(char *) str2 = NULL; + g_autofree char *str1 = NULL; + g_autofree char *str2 = NULL; char *p1 = NULL; char *p2 = NULL; size_t i; @@ -1124,9 +1124,9 @@ virCgroupV1GetBlkioIoDeviceServiced(virCgroupPtr group, long long *requests_read, long long *requests_write) { - VIR_AUTOFREE(char *) str1 = NULL; - VIR_AUTOFREE(char *) str2 = NULL; - VIR_AUTOFREE(char *) str3 = NULL; + g_autofree char *str1 = NULL; + g_autofree char *str2 = NULL; + g_autofree char *str3 = NULL; char *p1 = NULL; char *p2 = NULL; size_t i; @@ -1210,9 +1210,9 @@ virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group, const char *devPath, unsigned int weight) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; + g_autofree char *path = NULL; if (!(blkstr = virCgroupGetBlockDevString(devPath))) return -1; @@ -1240,9 +1240,9 @@ virCgroupV1GetBlkioDeviceWeight(virCgroupPtr group, const char *devPath, unsigned int *weight) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; + g_autofree char *path = NULL; if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", &path) < 0) { @@ -1279,8 +1279,8 @@ virCgroupV1SetBlkioDeviceReadIops(virCgroupPtr group, const char *path, unsigned int riops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -1300,8 +1300,8 @@ virCgroupV1GetBlkioDeviceReadIops(virCgroupPtr group, const char *path, unsigned int *riops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1331,8 +1331,8 @@ virCgroupV1SetBlkioDeviceWriteIops(virCgroupPtr group, const char *path, unsigned int wiops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -1352,8 +1352,8 @@ virCgroupV1GetBlkioDeviceWriteIops(virCgroupPtr group, const char *path, unsigned int *wiops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1383,8 +1383,8 @@ virCgroupV1SetBlkioDeviceReadBps(virCgroupPtr group, const char *path, unsigned long long rbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -1404,8 +1404,8 @@ virCgroupV1GetBlkioDeviceReadBps(virCgroupPtr group, const char *path, unsigned long long *rbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1435,8 +1435,8 @@ virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group, const char *path, unsigned long long wbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -1456,8 +1456,8 @@ virCgroupV1GetBlkioDeviceWriteBps(virCgroupPtr group, const char *path, unsigned long long *wbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1787,9 +1787,9 @@ virCgroupV1AllowDevice(virCgroupPtr group, int minor, int perms) { - VIR_AUTOFREE(char *) devstr = NULL; - VIR_AUTOFREE(char *) majorstr = NULL; - VIR_AUTOFREE(char *) minorstr = NULL; + g_autofree char *devstr = NULL; + g_autofree char *majorstr = NULL; + g_autofree char *minorstr = NULL; if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) || (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0)) @@ -1820,9 +1820,9 @@ virCgroupV1DenyDevice(virCgroupPtr group, int minor, int perms) { - VIR_AUTOFREE(char *) devstr = NULL; - VIR_AUTOFREE(char *) majorstr = NULL; - VIR_AUTOFREE(char *) minorstr = NULL; + g_autofree char *devstr = NULL; + g_autofree char *majorstr = NULL; + g_autofree char *minorstr = NULL; if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) || (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0)) @@ -1958,7 +1958,7 @@ virCgroupV1GetCpuCfsQuota(virCgroupPtr group, static bool virCgroupV1SupportsCpuBW(virCgroupPtr cgroup) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (!cgroup) return false; @@ -1997,7 +1997,7 @@ virCgroupV1GetCpuacctStat(virCgroupPtr group, unsigned long long *user, unsigned long long *sys) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; char *p; static double scale = -1.0; diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 5d940b0209..403b3b145e 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -66,8 +66,8 @@ virCgroupV2Available(void) return false; while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) { - VIR_AUTOFREE(char *) contFile = NULL; - VIR_AUTOFREE(char *) contStr = NULL; + g_autofree char *contFile = NULL; + g_autofree char *contStr = NULL; if (STRNEQ(entry.mnt_type, "cgroup2")) continue; @@ -100,8 +100,8 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group, const char *drivername, const char *machinename) { - VIR_AUTOFREE(char *) partmachinename = NULL; - VIR_AUTOFREE(char *) scopename = NULL; + g_autofree char *partmachinename = NULL; + g_autofree char *scopename = NULL; char *tmp; if (virAsprintf(&partmachinename, "%s.libvirt-%s", machinename, @@ -255,8 +255,8 @@ virCgroupV2ParseControllersFile(virCgroupPtr group, virCgroupPtr parent) { int rc; - VIR_AUTOFREE(char *) contStr = NULL; - VIR_AUTOFREE(char *) contFile = NULL; + g_autofree char *contStr = NULL; + g_autofree char *contFile = NULL; char **contList = NULL; char **tmp; @@ -379,8 +379,8 @@ virCgroupV2EnableController(virCgroupPtr group, int controller, bool report) { - VIR_AUTOFREE(char *) val = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *val = NULL; + g_autofree char *path = NULL; if (virAsprintf(&val, "+%s", virCgroupV2ControllerTypeToString(controller)) < 0) { @@ -413,7 +413,7 @@ virCgroupV2MakeGroup(virCgroupPtr parent, bool create, unsigned int flags) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; int controller; if (flags & VIR_CGROUP_SYSTEMD) { @@ -490,7 +490,7 @@ virCgroupV2MakeGroup(virCgroupPtr parent, static int virCgroupV2Remove(virCgroupPtr group) { - VIR_AUTOFREE(char *) grppath = NULL; + g_autofree char *grppath = NULL; int controller; /* Don't delete the root group, if we accidentally @@ -525,7 +525,7 @@ virCgroupV2HasEmptyTasks(virCgroupPtr cgroup, int controller) { int ret = -1; - VIR_AUTOFREE(char *) content = NULL; + g_autofree char *content = NULL; ret = virCgroupGetValueStr(cgroup, controller, "cgroup.procs", &content); @@ -556,8 +556,8 @@ virCgroupV2BindMount(virCgroupPtr group, const char *oldroot, const char *mountopts) { - VIR_AUTOFREE(char *) opts = NULL; - VIR_AUTOFREE(char *) src = NULL; + g_autofree char *opts = NULL; + g_autofree char *src = NULL; VIR_DEBUG("Mounting cgroups at '%s'", group->unified.mountPoint); @@ -589,7 +589,7 @@ virCgroupV2SetOwner(virCgroupPtr cgroup, gid_t gid, int controllers G_GNUC_UNUSED) { - VIR_AUTOFREE(char *) base = NULL; + g_autofree char *base = NULL; if (virAsprintf(&base, "%s%s", cgroup->unified.mountPoint, cgroup->unified.placement) < 0) { @@ -613,8 +613,8 @@ static int virCgroupV2SetBlkioWeight(virCgroupPtr group, unsigned int weight) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *path = NULL; + g_autofree char *value = NULL; const char *format = "%u"; if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -649,8 +649,8 @@ static int virCgroupV2GetBlkioWeight(virCgroupPtr group, unsigned int *weight) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *path = NULL; + g_autofree char *value = NULL; char *tmp; if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -701,7 +701,7 @@ virCgroupV2GetBlkioIoServiced(virCgroupPtr group, long long *requests_write) { long long stats_val; - VIR_AUTOFREE(char *) str1 = NULL; + g_autofree char *str1 = NULL; char *p1; size_t i; @@ -765,8 +765,8 @@ virCgroupV2GetBlkioIoDeviceServiced(virCgroupPtr group, long long *requests_read, long long *requests_write) { - VIR_AUTOFREE(char *) str1 = NULL; - VIR_AUTOFREE(char *) str2 = NULL; + g_autofree char *str1 = NULL; + g_autofree char *str2 = NULL; char *p1; size_t i; @@ -825,9 +825,9 @@ virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group, const char *devPath, unsigned int weight) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *path = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(devPath))) return -1; @@ -855,9 +855,9 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group, const char *devPath, unsigned int *weight) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *path = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; char *tmp; if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -895,8 +895,8 @@ virCgroupV2SetBlkioDeviceReadIops(virCgroupPtr group, const char *path, unsigned int riops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -921,8 +921,8 @@ virCgroupV2GetBlkioDeviceReadIops(virCgroupPtr group, const char *path, unsigned int *riops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; const char *name = "riops="; char *tmp; @@ -966,8 +966,8 @@ virCgroupV2SetBlkioDeviceWriteIops(virCgroupPtr group, const char *path, unsigned int wiops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -992,8 +992,8 @@ virCgroupV2GetBlkioDeviceWriteIops(virCgroupPtr group, const char *path, unsigned int *wiops) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; const char *name = "wiops="; char *tmp; @@ -1037,8 +1037,8 @@ virCgroupV2SetBlkioDeviceReadBps(virCgroupPtr group, const char *path, unsigned long long rbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -1063,8 +1063,8 @@ virCgroupV2GetBlkioDeviceReadBps(virCgroupPtr group, const char *path, unsigned long long *rbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; const char *name = "rbps="; char *tmp; @@ -1108,8 +1108,8 @@ virCgroupV2SetBlkioDeviceWriteBps(virCgroupPtr group, const char *path, unsigned long long wbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) blkstr = NULL; + g_autofree char *str = NULL; + g_autofree char *blkstr = NULL; if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; @@ -1134,8 +1134,8 @@ virCgroupV2GetBlkioDeviceWriteBps(virCgroupPtr group, const char *path, unsigned long long *wbps) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *str = NULL; + g_autofree char *value = NULL; const char *name = "wbps="; char *tmp; @@ -1210,7 +1210,7 @@ virCgroupV2GetMemoryStat(virCgroupPtr group, unsigned long long *inactiveFile, unsigned long long *unevictable) { - VIR_AUTOFREE(char *) stat = NULL; + g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; unsigned long long activeAnonVal = 0; @@ -1306,7 +1306,7 @@ static int virCgroupV2GetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; unsigned long long max; if (virCgroupGetValueStr(group, @@ -1366,7 +1366,7 @@ static int virCgroupV2GetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; unsigned long long high; if (virCgroupGetValueStr(group, @@ -1425,7 +1425,7 @@ static int virCgroupV2GetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb) { - VIR_AUTOFREE(char *) value = NULL; + g_autofree char *value = NULL; unsigned long long max; if (virCgroupGetValueStr(group, @@ -1493,8 +1493,8 @@ static int virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period) { - VIR_AUTOFREE(char *) value = NULL; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *value = NULL; + g_autofree char *str = NULL; char *tmp; /* The cfs_period should be greater or equal than 1ms, and less or equal @@ -1531,7 +1531,7 @@ static int virCgroupV2GetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; char *tmp; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, @@ -1585,7 +1585,7 @@ static int virCgroupV2GetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; char *tmp; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, @@ -1611,7 +1611,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group, static bool virCgroupV2SupportsCpuBW(virCgroupPtr cgroup) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virCgroupV2PathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", &path) < 0) { @@ -1627,7 +1627,7 @@ static int virCgroupV2GetCpuacctUsage(virCgroupPtr group, unsigned long long *usage) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; char *tmp; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT, @@ -1659,7 +1659,7 @@ virCgroupV2GetCpuacctStat(virCgroupPtr group, unsigned long long *user, unsigned long long *sys) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; char *tmp; unsigned long long userVal = 0; unsigned long long sysVal = 0; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 763bcb6d12..a62a513b0c 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -547,11 +547,11 @@ virExec(virCommandPtr cmd) int childin = cmd->infd; int childout = -1; int childerr = -1; - VIR_AUTOFREE(char *) binarystr = NULL; + g_autofree char *binarystr = NULL; const char *binary = NULL; int ret; struct sigaction waxon, waxoff; - VIR_AUTOFREE(gid_t *) groups = NULL; + g_autofree gid_t *groups = NULL; int ngroups; if (cmd->args[0][0] != '/') { @@ -2170,7 +2170,7 @@ virCommandProcessIO(virCommandPtr cmd) size_t inlen = 0, outlen = 0, errlen = 0; size_t inoff = 0; int ret = 0; - VIR_AUTOFREE(struct pollfd *) fds = NULL; + g_autofree struct pollfd *fds = NULL; if (dryRunBuffer || dryRunCallback) { VIR_DEBUG("Dry run requested, skipping I/O processing"); @@ -2541,7 +2541,7 @@ int virCommandRunAsync(virCommandPtr cmd, pid_t *pid) { int ret = -1; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; size_t i; bool synchronous = false; int infd[2] = {-1, -1}; @@ -2757,8 +2757,8 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) if (exitstatus && (cmd->rawStatus || WIFEXITED(status))) { *exitstatus = cmd->rawStatus ? status : WEXITSTATUS(status); } else if (status) { - VIR_AUTOFREE(char *) str = virCommandToString(cmd, false); - VIR_AUTOFREE(char *) st = virProcessTranslateStatus(status); + g_autofree char *str = virCommandToString(cmd, false); + g_autofree char *st = virProcessTranslateStatus(status); bool haveErrMsg = cmd->errbuf && *cmd->errbuf && (*cmd->errbuf)[0]; virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2885,7 +2885,7 @@ int virCommandHandshakeWait(virCommandPtr cmd) return -1; } if (c != '1') { - VIR_AUTOFREE(char *) msg = NULL; + g_autofree char *msg = NULL; ssize_t len; if (VIR_ALLOC_N(msg, 1024) < 0) { VIR_FORCE_CLOSE(cmd->handshakeWait[0]); @@ -3021,7 +3021,7 @@ virCommandFree(virCommandPtr cmd) * combination with virCommandRunAsync(): * * VIR_AUTOPTR(virCommand) cmd = virCommandNew*(...); - * VIR_AUTOFREE(char *) buf = NULL; + * g_autofree char *buf = NULL; * * ... * @@ -3133,11 +3133,11 @@ virCommandRunRegex(virCommandPtr cmd, { int err; regex_t *reg; - VIR_AUTOFREE(regmatch_t *) vars = NULL; + g_autofree regmatch_t *vars = NULL; size_t i, j, k; int totgroups = 0, ngroup = 0, maxvars = 0; char **groups; - VIR_AUTOFREE(char *) outbuf = NULL; + g_autofree char *outbuf = NULL; VIR_AUTOSTRINGLIST lines = NULL; int ret = -1; diff --git a/src/util/virerror.c b/src/util/virerror.c index 5d69e4e972..f02d6f3b8a 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1481,8 +1481,8 @@ virLastErrorPrefixMessage(const char *fmt, ...) { int save_errno = errno; virErrorPtr err = virGetLastError(); - VIR_AUTOFREE(char *) fmtmsg = NULL; - VIR_AUTOFREE(char *) newmsg = NULL; + g_autofree char *fmtmsg = NULL; + g_autofree char *newmsg = NULL; va_list args; if (!err) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index b57b300446..6d3b310bc2 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -613,7 +613,7 @@ static void virEventPollCleanupHandles(void) */ int virEventPollRunOnce(void) { - VIR_AUTOFREE(struct pollfd *) fds = NULL; + g_autofree struct pollfd *fds = NULL; int ret, timeout, nfds; virMutexLock(&eventLoop.lock); diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 9fe86e362e..2315b517bd 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -38,7 +38,7 @@ bool virFCIsCapableRport(const char *rport) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virBuildPath(&path, SYSFS_FC_RPORT_PATH, rport) < 0) return false; @@ -51,7 +51,7 @@ virFCReadRportValue(const char *rport, const char *entry, char **result) { - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; char *p = NULL; if (virFileReadValueString(&buf, "%s/%s/%s", diff --git a/src/util/virfile.c b/src/util/virfile.c index 7d6a9011c6..457235d195 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -216,7 +216,7 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) bool output = false; int pipefd[2] = { -1, -1 }; int mode = -1; - VIR_AUTOFREE(char *) iohelper_path = NULL; + g_autofree char *iohelper_path = NULL; if (!flags) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -504,7 +504,7 @@ virFileRewrite(const char *path, virFileRewriteFunc rewrite, const void *opaque) { - VIR_AUTOFREE(char *) newfile = NULL; + g_autofree char *newfile = NULL; int fd = -1; int ret = -1; @@ -772,7 +772,7 @@ int virFileLoopDeviceAssociate(const char *file, int lofd = -1; int fsfd = -1; struct loop_info64 lo; - VIR_AUTOFREE(char *) loname = NULL; + g_autofree char *loname = NULL; int ret = -1; if ((lofd = virFileLoopDeviceOpen(&loname)) < 0) @@ -832,7 +832,7 @@ int virFileLoopDeviceAssociate(const char *file, static int virFileNBDDeviceIsBusy(const char *dev_name) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAsprintf(&path, SYSFS_BLOCK_DIR "/%s/pid", dev_name) < 0) @@ -892,7 +892,7 @@ virFileNBDLoadDriver(void) "administratively prohibited")); return false; } else { - VIR_AUTOFREE(char *) errbuf = NULL; + g_autofree char *errbuf = NULL; if ((errbuf = virKModLoad(NBD_DRIVER, true))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -908,8 +908,8 @@ int virFileNBDDeviceAssociate(const char *file, bool readonly, char **dev) { - VIR_AUTOFREE(char *) nbddev = NULL; - VIR_AUTOFREE(char *) qemunbd = NULL; + g_autofree char *nbddev = NULL; + g_autofree char *qemunbd = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; const char *fmtstr = NULL; @@ -1010,7 +1010,7 @@ int virFileDeleteTree(const char *dir) return -1; while ((direrr = virDirRead(dh, &de, dir)) > 0) { - VIR_AUTOFREE(char *) filepath = NULL; + g_autofree char *filepath = NULL; struct stat sb; if (virAsprintf(&filepath, "%s/%s", @@ -1187,7 +1187,7 @@ static int safezero_slow(int fd, off_t offset, off_t len) { int r; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; unsigned long long remain, bytes; if (lseek(fd, offset, SEEK_SET) < 0) @@ -1546,7 +1546,7 @@ virFileRelLinkPointsTo(const char *directory, const char *checkLink, const char *checkDest) { - VIR_AUTOFREE(char *) candidate = NULL; + g_autofree char *candidate = NULL; if (*checkLink == '/') return virFileLinkPointsTo(checkLink, checkDest); @@ -1905,7 +1905,7 @@ virFileIsExecutable(const char *file) */ int virFileIsMountPoint(const char *file) { - VIR_AUTOFREE(char *) parent = NULL; + g_autofree char *parent = NULL; int ret; struct stat sb1, sb2; @@ -2114,7 +2114,7 @@ virFileAccessibleAs(const char *path, int mode, { pid_t pid = 0; int status, ret = 0; - VIR_AUTOFREE(gid_t *) groups = NULL; + g_autofree gid_t *groups = NULL; int ngroups; if (uid == geteuid() && @@ -2226,7 +2226,7 @@ virFileOpenForked(const char *path, int openflags, mode_t mode, int recvfd_errno = 0; int fd = -1; int pair[2] = { -1, -1 }; - VIR_AUTOFREE(gid_t *) groups = NULL; + g_autofree gid_t *groups = NULL; int ngroups; bool created = false; @@ -2514,7 +2514,7 @@ virFileRemove(const char *path, { pid_t pid; int status = 0, ret = 0; - VIR_AUTOFREE(gid_t *) groups = NULL; + g_autofree gid_t *groups = NULL; int ngroups; if (!virFileRemoveNeedsSetuid(path, uid, gid)) { @@ -2675,7 +2675,7 @@ virDirCreate(const char *path, struct stat st; pid_t pid; int status = 0, ret = 0; - VIR_AUTOFREE(gid_t *) groups = NULL; + g_autofree gid_t *groups = NULL; int ngroups; bool created = false; @@ -2984,7 +2984,7 @@ int virFileChownFiles(const char *name, return -1; while ((direrr = virDirRead(dir, &ent, name)) > 0) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAsprintf(&path, "%s/%s", name, ent->d_name) < 0) goto cleanup; @@ -3068,7 +3068,7 @@ int virFileMakePathWithMode(const char *path, mode_t mode) { - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (VIR_STRDUP(tmp, path) < 0) { errno = ENOMEM; @@ -3083,7 +3083,7 @@ int virFileMakeParentPath(const char *path) { char *p; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; VIR_DEBUG("path=%s", path); @@ -3132,7 +3132,7 @@ virFileOpenTty(int *ttymaster, char **ttyName, int rawmode) * doesn't have to worry about that mess? */ int ret = -1; int slave = -1; - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *name = NULL; /* Unfortunately, we can't use the name argument of openpty, since * there is no guarantee on how large the buffer has to be. @@ -3296,7 +3296,7 @@ virFileAbsPath(const char *path, char **abspath) if (VIR_STRDUP(*abspath, path) < 0) return -1; } else { - VIR_AUTOFREE(char *) buf = getcwd(NULL, 0); + g_autofree char *buf = getcwd(NULL, 0); if (buf == NULL) return -1; @@ -3402,7 +3402,7 @@ virFileRemoveLastComponent(char *path) int virFilePrintf(FILE *fp, const char *msg, ...) { va_list vargs; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; int ret; va_start(vargs, msg); @@ -3534,7 +3534,7 @@ int virFileIsSharedFSType(const char *path, int fstypes) { - VIR_AUTOFREE(char *) dirpath = NULL; + g_autofree char *dirpath = NULL; char *p = NULL; struct statfs sb; int statfs_ret; @@ -3650,7 +3650,7 @@ virFileGetHugepageSize(const char *path, static int virFileGetDefaultHugepageSize(unsigned long long *size) { - VIR_AUTOFREE(char *) meminfo = NULL; + g_autofree char *meminfo = NULL; char *c; char *n; char *unit; @@ -3999,8 +3999,8 @@ virFileCopyACLs(const char *src, int virFileComparePaths(const char *p1, const char *p2) { - VIR_AUTOFREE(char *) res1 = NULL; - VIR_AUTOFREE(char *) res2 = NULL; + g_autofree char *res1 = NULL; + g_autofree char *res2 = NULL; /* Assume p1 and p2 are symlinks, so try to resolve and canonicalize them. * Canonicalization fails for example on file systems names like 'proc' or @@ -4166,8 +4166,8 @@ virFileInData(int fd G_GNUC_UNUSED, int virFileReadValueInt(int *value, const char *format, ...) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *str = NULL; + g_autofree char *path = NULL; va_list ap; va_start(ap, format); @@ -4209,8 +4209,8 @@ virFileReadValueInt(int *value, const char *format, ...) int virFileReadValueUint(unsigned int *value, const char *format, ...) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *str = NULL; + g_autofree char *path = NULL; va_list ap; va_start(ap, format); @@ -4252,8 +4252,8 @@ virFileReadValueUint(unsigned int *value, const char *format, ...) int virFileReadValueScaledInt(unsigned long long *value, const char *format, ...) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *str = NULL; + g_autofree char *path = NULL; char *endp = NULL; va_list ap; @@ -4299,8 +4299,8 @@ virFileReadValueScaledInt(unsigned long long *value, const char *format, ...) int virFileReadValueBitmap(virBitmapPtr *value, const char *format, ...) { - VIR_AUTOFREE(char *) str = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *str = NULL; + g_autofree char *path = NULL; va_list ap; va_start(ap, format); @@ -4341,7 +4341,7 @@ int virFileReadValueString(char **value, const char *format, ...) { int ret; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; va_list ap; va_start(ap, format); diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index fa57e3d620..823d5e15e0 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -100,7 +100,7 @@ static char * virFileCacheGetFileName(virFileCachePtr cache, const char *name) { - VIR_AUTOFREE(char *) namehash = NULL; + g_autofree char *namehash = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, name, &namehash) < 0) @@ -130,7 +130,7 @@ virFileCacheLoad(virFileCachePtr cache, const char *name, void **data) { - VIR_AUTOFREE(char *) file = NULL; + g_autofree char *file = NULL; int ret = -1; void *loadData = NULL; @@ -182,7 +182,7 @@ virFileCacheSave(virFileCachePtr cache, const char *name, void *data) { - VIR_AUTOFREE(char *) file = NULL; + g_autofree char *file = NULL; if (!(file = virFileCacheGetFileName(cache, name))) return -1; @@ -335,7 +335,7 @@ virFileCacheLookupByFunc(virFileCachePtr cache, const void *iterData) { void *data = NULL; - VIR_AUTOFREE(char *) name = NULL; + g_autofree char *name = NULL; virObjectLock(cache); diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 0d4bfae8f8..a38516a1bb 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -504,7 +504,7 @@ void virFirewallRuleAddArgFormat(virFirewallPtr firewall, virFirewallRulePtr rule, const char *fmt, ...) { - VIR_AUTOFREE(char *) arg = NULL; + g_autofree char *arg = NULL; va_list list; VIR_FIREWALL_RULE_RETURN_IF_ERROR(firewall, rule); @@ -668,7 +668,7 @@ virFirewallApplyRuleDirect(virFirewallRulePtr rule, const char *bin = virFirewallLayerCommandTypeToString(rule->layer); VIR_AUTOPTR(virCommand) cmd = NULL; int status; - VIR_AUTOFREE(char *) error = NULL; + g_autofree char *error = NULL; if (!bin) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -692,7 +692,7 @@ virFirewallApplyRuleDirect(virFirewallRulePtr rule, if (ignoreErrors) { VIR_DEBUG("Ignoring error running command"); } else { - VIR_AUTOFREE(char *) args = virCommandToString(cmd, false); + g_autofree char *args = virCommandToString(cmd, false); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to apply firewall rules %s: %s"), NULLSTR(args), NULLSTR(error)); @@ -719,8 +719,8 @@ virFirewallApplyRule(virFirewallPtr firewall, virFirewallRulePtr rule, bool ignoreErrors) { - VIR_AUTOFREE(char *) output = NULL; - VIR_AUTOFREE(char *) str = virFirewallRuleToString(rule); + g_autofree char *output = NULL; + g_autofree char *str = virFirewallRuleToString(rule); VIR_AUTOSTRINGLIST lines = NULL; VIR_INFO("Applying rule '%s'", NULLSTR(str)); diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index 60b75e7e25..c14a6b6e65 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -85,7 +85,7 @@ virFirewallDGetVersion(unsigned long *version) int ret = -1; DBusConnection *sysbus = virDBusGetSystemBus(); DBusMessage *reply = NULL; - VIR_AUTOFREE(char *) versionStr = NULL; + g_autofree char *versionStr = NULL; if (!sysbus) return -1; @@ -132,7 +132,7 @@ virFirewallDGetBackend(void) DBusConnection *sysbus = virDBusGetSystemBus(); DBusMessage *reply = NULL; virError error; - VIR_AUTOFREE(char *) backendStr = NULL; + g_autofree char *backendStr = NULL; int backend = -1; if (!sysbus) diff --git a/src/util/virhook.c b/src/util/virhook.c index 84b3954872..19207c2b25 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -131,7 +131,7 @@ static int virHooksFound = -1; static int virHookCheck(int no, const char *driver) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (driver == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -240,7 +240,7 @@ virHookCall(int driver, char **output) { int ret; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; const char *drvstr; const char *opstr; diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 41fcab7222..984f6bb290 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -179,7 +179,7 @@ virHostdevManagerNew(void) return NULL; } } else { - VIR_AUTOFREE(char *) rundir = NULL; + g_autofree char *rundir = NULL; mode_t old_umask; if (!(rundir = virGetUserRuntimeDirectory())) @@ -306,7 +306,7 @@ virHostdevPCISysfsPath(virDomainHostdevDefPtr hostdev, static int virHostdevIsVirtualFunction(virDomainHostdevDefPtr hostdev) { - VIR_AUTOFREE(char *) sysfs_path = NULL; + g_autofree char *sysfs_path = NULL; if (virHostdevPCISysfsPath(hostdev, &sysfs_path) < 0) return -1; @@ -321,7 +321,7 @@ virHostdevNetDevice(virDomainHostdevDefPtr hostdev, char **linkdev, int *vf) { - VIR_AUTOFREE(char *) sysfs_path = NULL; + g_autofree char *sysfs_path = NULL; if (virHostdevPCISysfsPath(hostdev, &sysfs_path) < 0) return -1; @@ -447,7 +447,7 @@ static int virHostdevSaveNetConfig(virDomainHostdevDefPtr hostdev, const char *stateDir) { - VIR_AUTOFREE(char *) linkdev = NULL; + g_autofree char *linkdev = NULL; int vf = -1; if (!virHostdevIsPCINetDevice(hostdev) || @@ -486,7 +486,7 @@ static int virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev, const unsigned char *uuid) { - VIR_AUTOFREE(char *) linkdev = NULL; + g_autofree char *linkdev = NULL; virNetDevVlanPtr vlan; virNetDevVPortProfilePtr virtPort; int vf = -1; @@ -534,9 +534,9 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev, const char *stateDir, const char *oldStateDir) { - VIR_AUTOFREE(char *) linkdev = NULL; - VIR_AUTOFREE(virMacAddrPtr) MAC = NULL; - VIR_AUTOFREE(virMacAddrPtr) adminMAC = NULL; + g_autofree char *linkdev = NULL; + g_autofree virMacAddrPtr MAC = NULL; + g_autofree virMacAddrPtr adminMAC = NULL; VIR_AUTOPTR(virNetDevVlan) vlan = NULL; virNetDevVPortProfilePtr virtPort; int vf = -1; @@ -804,8 +804,8 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr, mgr->inactivePCIHostdevs) < 0) goto reattachdevs; } else { - VIR_AUTOFREE(char *) driverPath = NULL; - VIR_AUTOFREE(char *) driverName = NULL; + g_autofree char *driverPath = NULL; + g_autofree char *driverName = NULL; int stub; /* Unmanaged devices should already have been marked as diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 8e86bedaab..938e2fa6b3 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -255,7 +255,7 @@ virHostMemGetStats(int cellNum G_GNUC_UNUSED, #ifdef __linux__ { int ret; - VIR_AUTOFREE(char *) meminfo_path = NULL; + g_autofree char *meminfo_path = NULL; FILE *meminfo; int max_node; @@ -312,8 +312,8 @@ virHostMemGetStats(int cellNum G_GNUC_UNUSED, static int virHostMemSetParameterValue(virTypedParameterPtr param) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) strval = NULL; + g_autofree char *path = NULL; + g_autofree char *strval = NULL; int rc = -1; char *field = strchr(param->field, '_'); @@ -341,7 +341,7 @@ virHostMemParametersAreAllSupported(virTypedParameterPtr params, size_t i; for (i = 0; i < nparams; i++) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; virTypedParameterPtr param = ¶ms[i]; char *field = strchr(param->field, '_'); @@ -408,8 +408,8 @@ static int virHostMemGetParameterValue(const char *field, void *value) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *path = NULL; + g_autofree char *buf = NULL; char *tmp = NULL; int rc = -1; diff --git a/src/util/viriptables.c b/src/util/viriptables.c index e1b876d36c..e240b97d72 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -344,7 +344,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netaddr, unsigned int prefix) { virSocketAddr network; - VIR_AUTOFREE(char *) netstr = NULL; + g_autofree char *netstr = NULL; char *ret; if (!(VIR_SOCKET_ADDR_IS_FAMILY(netaddr, AF_INET) || @@ -383,7 +383,7 @@ iptablesForwardAllowOut(virFirewallPtr fw, const char *physdev, int action) { - VIR_AUTOFREE(char *) networkstr = NULL; + g_autofree char *networkstr = NULL; virFirewallLayer layer = VIR_SOCKET_ADDR_FAMILY(netaddr) == AF_INET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; @@ -474,7 +474,7 @@ iptablesForwardAllowRelatedIn(virFirewallPtr fw, { virFirewallLayer layer = VIR_SOCKET_ADDR_FAMILY(netaddr) == AF_INET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; - VIR_AUTOFREE(char *) networkstr = NULL; + g_autofree char *networkstr = NULL; if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) return -1; @@ -565,7 +565,7 @@ iptablesForwardAllowIn(virFirewallPtr fw, { virFirewallLayer layer = VIR_SOCKET_ADDR_FAMILY(netaddr) == AF_INET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; - VIR_AUTOFREE(char *) networkstr = NULL; + g_autofree char *networkstr = NULL; if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) return -1; @@ -813,11 +813,11 @@ iptablesForwardMasquerade(virFirewallPtr fw, const char *protocol, int action) { - VIR_AUTOFREE(char *) networkstr = NULL; - VIR_AUTOFREE(char *) addrStartStr = NULL; - VIR_AUTOFREE(char *) addrEndStr = NULL; - VIR_AUTOFREE(char *) portRangeStr = NULL; - VIR_AUTOFREE(char *) natRangeStr = NULL; + g_autofree char *networkstr = NULL; + g_autofree char *addrStartStr = NULL; + g_autofree char *addrEndStr = NULL; + g_autofree char *portRangeStr = NULL; + g_autofree char *natRangeStr = NULL; virFirewallRulePtr rule; if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) @@ -974,7 +974,7 @@ iptablesForwardDontMasquerade(virFirewallPtr fw, const char *destaddr, int action) { - VIR_AUTOFREE(char *) networkstr = NULL; + g_autofree char *networkstr = NULL; if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) return -1; diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 25b77eead7..f2140b47de 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -88,7 +88,7 @@ virISCSIGetSession(const char *devpath, .devpath = devpath, }; int exitstatus = 0; - VIR_AUTOFREE(char *) error = NULL; + g_autofree char *error = NULL; VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode", "session", NULL); @@ -122,9 +122,9 @@ virStorageBackendIQNFound(const char *initiatoriqn, { int ret = IQN_ERROR; char *line = NULL; - VIR_AUTOFREE(char *) outbuf = NULL; - VIR_AUTOFREE(char *) iface = NULL; - VIR_AUTOFREE(char *) iqn = NULL; + g_autofree char *outbuf = NULL; + g_autofree char *iface = NULL; + g_autofree char *iqn = NULL; VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode", "iface", NULL); @@ -208,8 +208,8 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, char **ifacename) { int exitstatus = -1; - VIR_AUTOFREE(char *) iface_name = NULL; - VIR_AUTOFREE(char *) temp_ifacename = NULL; + g_autofree char *iface_name = NULL; + g_autofree char *temp_ifacename = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; if (virAsprintf(&temp_ifacename, @@ -286,7 +286,7 @@ virISCSIConnection(const char *portal, NULL }; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) ifacename = NULL; + g_autofree char *ifacename = NULL; cmd = virCommandNewArgs(baseargv); virCommandAddArgSet(cmd, extraargv); @@ -369,7 +369,7 @@ virISCSIGetTargets(char **const groups, void *data) { struct virISCSITargetList *list = data; - VIR_AUTOFREE(char *) target = NULL; + g_autofree char *target = NULL; if (VIR_STRDUP(target, groups[1]) < 0) return -1; @@ -471,7 +471,7 @@ virISCSIScanTargets(const char *portal, size_t *ntargets, char ***targets) { - VIR_AUTOFREE(char *) ifacename = NULL; + g_autofree char *ifacename = NULL; if (ntargets) *ntargets = 0; diff --git a/src/util/virjson.c b/src/util/virjson.c index 5e3c00a19c..c876a4a261 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -502,7 +502,7 @@ virJSONValueNewNumber(const char *data) virJSONValuePtr virJSONValueNewNumberInt(int data) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (virAsprintf(&str, "%i", data) < 0) return NULL; return virJSONValueNewNumber(str); @@ -512,7 +512,7 @@ virJSONValueNewNumberInt(int data) virJSONValuePtr virJSONValueNewNumberUint(unsigned int data) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (virAsprintf(&str, "%u", data) < 0) return NULL; return virJSONValueNewNumber(str); @@ -522,7 +522,7 @@ virJSONValueNewNumberUint(unsigned int data) virJSONValuePtr virJSONValueNewNumberLong(long long data) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (virAsprintf(&str, "%lld", data) < 0) return NULL; return virJSONValueNewNumber(str); @@ -532,7 +532,7 @@ virJSONValueNewNumberLong(long long data) virJSONValuePtr virJSONValueNewNumberUlong(unsigned long long data) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (virAsprintf(&str, "%llu", data) < 0) return NULL; return virJSONValueNewNumber(str); @@ -542,7 +542,7 @@ virJSONValueNewNumberUlong(unsigned long long data) virJSONValuePtr virJSONValueNewNumberDouble(double data) { - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (virDoubleToStr(&str, data) < 0) return NULL; return virJSONValueNewNumber(str); @@ -1215,7 +1215,7 @@ virJSONValueGetArrayAsBitmap(const virJSONValue *val, { virJSONValuePtr elem; size_t i; - VIR_AUTOFREE(unsigned long long *) elems = NULL; + g_autofree unsigned long long *elems = NULL; unsigned long long maxelem = 0; *bitmap = NULL; diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 9d0375b911..56758750ae 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -146,8 +146,8 @@ bool virKModIsBlacklisted(const char *module) { size_t i; - VIR_AUTOFREE(char *) drvblklst = NULL; - VIR_AUTOFREE(char *) outbuf = NULL; + g_autofree char *drvblklst = NULL; + g_autofree char *outbuf = NULL; if (virAsprintfQuiet(&drvblklst, "blacklist %s\n", module) < 0) return false; diff --git a/src/util/virlease.c b/src/util/virlease.c index 87e9a3ce88..79fdd0699d 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -48,7 +48,7 @@ virLeaseReadCustomLeaseFile(virJSONValuePtr leases_array_new, const char *ip_to_delete, char **server_duid) { - VIR_AUTOFREE(char *) lease_entries = NULL; + g_autofree char *lease_entries = NULL; VIR_AUTOPTR(virJSONValue) leases_array = NULL; long long expirytime; int custom_lease_file_len = 0; @@ -215,7 +215,7 @@ virLeaseNew(virJSONValuePtr *lease_ret, VIR_AUTOPTR(virJSONValue) lease_new = NULL; const char *exptime_tmp = getenv("DNSMASQ_LEASE_EXPIRES"); long long expirytime = 0; - VIR_AUTOFREE(char *) exptime = NULL; + g_autofree char *exptime = NULL; /* In case hostname is still unknown, use the last known one */ if (!hostname) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 7700ae2ae8..7260799e5d 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -76,8 +76,8 @@ static int virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr dev, char **device_api) { - VIR_AUTOFREE(char *) buf = NULL; - VIR_AUTOFREE(char *) file = NULL; + g_autofree char *buf = NULL; + g_autofree char *file = NULL; char *tmp = NULL; if (virAsprintf(&file, "%s/mdev_type/device_api", dev->path) < 0) @@ -108,7 +108,7 @@ static int virMediatedDeviceCheckModel(virMediatedDevicePtr dev, virMediatedDeviceModelType model) { - VIR_AUTOFREE(char *) dev_api = NULL; + g_autofree char *dev_api = NULL; int actual_model; if (virMediatedDeviceGetSysfsDeviceAPI(dev, &dev_api) < 0) @@ -142,7 +142,7 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) { virMediatedDevicePtr ret = NULL; VIR_AUTOPTR(virMediatedDevice) dev = NULL; - VIR_AUTOFREE(char *) sysfspath = NULL; + g_autofree char *sysfspath = NULL; if (!(sysfspath = virMediatedDeviceGetSysfsPath(uuidstr))) return NULL; @@ -210,9 +210,9 @@ virMediatedDeviceGetPath(virMediatedDevicePtr dev) char * virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) { - VIR_AUTOFREE(char *) result_path = NULL; - VIR_AUTOFREE(char *) iommu_path = NULL; - VIR_AUTOFREE(char *) dev_path = virMediatedDeviceGetSysfsPath(uuidstr); + g_autofree char *result_path = NULL; + g_autofree char *iommu_path = NULL; + g_autofree char *dev_path = virMediatedDeviceGetSysfsPath(uuidstr); char *vfio_path = NULL; if (!dev_path) @@ -241,7 +241,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) int virMediatedDeviceGetIOMMUGroupNum(const char *uuidstr) { - VIR_AUTOFREE(char *) vfio_path = NULL; + g_autofree char *vfio_path = NULL; char *group_num_str = NULL; unsigned int group_num = -1; diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 50e90e2792..edaf1e7c34 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -120,7 +120,7 @@ static int virNetDevBridgeSet(const char *brname, int fd, /* control socket */ struct ifreq *ifr) /* pre-filled bridge name */ { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname) < 0) return -1; @@ -162,14 +162,14 @@ static int virNetDevBridgeGet(const char *brname, unsigned long *value) /* current value */ { struct ifreq ifr; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; VIR_AUTOCLOSE fd = -1; if (virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname) < 0) return -1; if (virFileExists(path)) { - VIR_AUTOFREE(char *) valuestr = NULL; + g_autofree char *valuestr = NULL; if (virFileReadAll(path, INT_BUFSIZE_BOUND(unsigned long), &valuestr) < 0) @@ -219,7 +219,7 @@ virNetDevBridgePortSet(const char *brname, { char valuestr[INT_BUFSIZE_BOUND(value)]; int ret = -1; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; snprintf(valuestr, sizeof(valuestr), "%lu", value); @@ -248,8 +248,8 @@ virNetDevBridgePortGet(const char *brname, const char *paramname, unsigned long *value) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) valuestr = NULL; + g_autofree char *path = NULL; + g_autofree char *valuestr = NULL; if (virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, paramname) < 0) @@ -953,7 +953,7 @@ virNetDevBridgeFDBAddDel(const virMacAddr *mac, const char *ifname, unsigned int recvbuflen; struct ndmsg ndm = { .ndm_family = PF_BRIDGE, .ndm_state = NUD_NOARP }; VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; if (virNetDevGetIndex(ifname, &ndm.ndm_ifindex) < 0) return -1; diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index dea3de6514..bc31581f77 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -168,10 +168,10 @@ virNetDevIPAddrAdd(const char *ifname, unsigned int recvbuflen; VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; VIR_AUTOPTR(virSocketAddr) broadcast = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; - VIR_AUTOFREE(char *) ipStr = NULL; - VIR_AUTOFREE(char *) peerStr = NULL; - VIR_AUTOFREE(char *) bcastStr = NULL; + g_autofree struct nlmsghdr *resp = NULL; + g_autofree char *ipStr = NULL; + g_autofree char *peerStr = NULL; + g_autofree char *bcastStr = NULL; ipStr = virSocketAddrFormat(addr); if (peer && VIR_SOCKET_ADDR_VALID(peer)) @@ -240,7 +240,7 @@ virNetDevIPAddrDel(const char *ifname, { unsigned int recvbuflen; VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifname, addr, prefix, @@ -290,9 +290,9 @@ virNetDevIPRouteAdd(const char *ifname, virSocketAddr defaultAddr; virSocketAddrPtr actualAddr; VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; - VIR_AUTOFREE(char *) toStr = NULL; - VIR_AUTOFREE(char *) viaStr = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree char *toStr = NULL; + g_autofree char *viaStr = NULL; + g_autofree struct nlmsghdr *resp = NULL; actualAddr = addr; @@ -450,7 +450,7 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) /* Periodically query netlink until DAD finishes on all known addresses. */ while (dad && time(NULL) < max_time) { - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, NETLINK_ROUTE, 0) < 0) @@ -482,8 +482,8 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) static int virNetDevIPGetAcceptRA(const char *ifname) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *path = NULL; + g_autofree char *buf = NULL; char *suffix; int accept_ra = -1; @@ -534,7 +534,7 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp, struct rtattr *rta_attr; int accept_ra = -1; int ifindex = -1; - VIR_AUTOFREE(char *) ifname = NULL; + g_autofree char *ifname = NULL; /* Ignore messages other than route ones */ if (resp->nlmsg_type != RTM_NEWROUTE) @@ -689,9 +689,9 @@ virNetDevIPAddrAdd(const char *ifname, { virSocketAddr broadcast; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) addrstr = NULL; - VIR_AUTOFREE(char *) bcaststr = NULL; - VIR_AUTOFREE(char *) peerstr = NULL; + g_autofree char *addrstr = NULL; + g_autofree char *bcaststr = NULL; + g_autofree char *peerstr = NULL; if (!(addrstr = virSocketAddrFormat(addr))) return -1; @@ -744,7 +744,7 @@ virNetDevIPAddrDel(const char *ifname, unsigned int prefix) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) addrstr = NULL; + g_autofree char *addrstr = NULL; if (!(addrstr = virSocketAddrFormat(addr))) return -1; @@ -779,8 +779,8 @@ virNetDevIPRouteAdd(const char *ifname, unsigned int metric) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) addrstr = NULL; - VIR_AUTOFREE(char *) gatewaystr = NULL; + g_autofree char *addrstr = NULL; + g_autofree char *gatewaystr = NULL; if (!(addrstr = virSocketAddrFormat(addr))) return -1; @@ -1072,7 +1072,7 @@ virNetDevIPInfoAddToDev(const char *ifname, { size_t i; int prefix; - VIR_AUTOFREE(char *) ipStr = NULL; + g_autofree char *ipStr = NULL; /* add all IP addresses */ for (i = 0; i < ipInfo->nips; i++) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 1ee503afb6..0e02824acc 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -289,7 +289,7 @@ bool virNetDevMacVLanIsMacvtap(const char *ifname) { int ifindex; - VIR_AUTOFREE(char *) tapname = NULL; + g_autofree char *tapname = NULL; if (virNetDevGetIndex(ifname, &ifindex) < 0) return false; @@ -388,7 +388,7 @@ virNetDevMacVLanTapOpen(const char *ifname, int ret = -1; int ifindex; size_t i = 0; - VIR_AUTOFREE(char *) tapname = NULL; + g_autofree char *tapname = NULL; if (virNetDevGetIndex(ifname, &ifindex) < 0) return -1; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 3066ef9cde..a3c0da85a0 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -142,10 +142,10 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, char ifuuidstr[VIR_UUID_STRING_BUFLEN]; char vmuuidstr[VIR_UUID_STRING_BUFLEN]; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) attachedmac_ex_id = NULL; - VIR_AUTOFREE(char *) ifaceid_ex_id = NULL; - VIR_AUTOFREE(char *) profile_ex_id = NULL; - VIR_AUTOFREE(char *) vmid_ex_id = NULL; + g_autofree char *attachedmac_ex_id = NULL; + g_autofree char *ifaceid_ex_id = NULL; + g_autofree char *profile_ex_id = NULL; + g_autofree char *vmid_ex_id = NULL; virMacAddrFormat(macaddr, macaddrstr); virUUIDFormat(ovsport->interfaceID, ifuuidstr); @@ -387,7 +387,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; cmd = virCommandNew(OVSVSCTL); virNetDevOpenvswitchAddTimeout(cmd); diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index c2d7040938..b4637a91f9 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -393,7 +393,7 @@ int virNetDevTapCreate(char **ifname, if (strstr(*ifname, "%d") != NULL) { size_t i; for (i = 0; i <= IF_MAXUNIT; i++) { - VIR_AUTOFREE(char *) newname = NULL; + g_autofree char *newname = NULL; if (virAsprintf(&newname, *ifname, i) < 0) goto cleanup; @@ -415,7 +415,7 @@ int virNetDevTapCreate(char **ifname, } if (tapfd) { - VIR_AUTOFREE(char *) dev_path = NULL; + g_autofree char *dev_path = NULL; if (virAsprintf(&dev_path, "/dev/%s", ifr.ifr_name) < 0) goto cleanup; @@ -580,7 +580,7 @@ virNetDevTapReattachBridge(const char *tapname, unsigned int *actualMTU) { bool useOVS = false; - VIR_AUTOFREE(char *) master = NULL; + g_autofree char *master = NULL; if (virNetDevGetMaster(tapname, &master) < 0) return -1; diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 431dc0bff5..36a1e89c9e 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -42,7 +42,7 @@ virMutex virNetDevVethCreateMutex = VIR_MUTEX_INITIALIZER; static int virNetDevVethExists(int devNum) { int ret; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAsprintf(&path, SYSFS_NET_DIR "vnet%d/", devNum) < 0) return -1; @@ -118,8 +118,8 @@ int virNetDevVethCreate(char** veth1, char** veth2) #define MAX_VETH_RETRIES 10 for (i = 0; i < MAX_VETH_RETRIES; i++) { - VIR_AUTOFREE(char *) veth1auto = NULL; - VIR_AUTOFREE(char *) veth2auto = NULL; + g_autofree char *veth1auto = NULL; + g_autofree char *veth2auto = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; int status; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index f07eb2f2e2..901e04845c 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -296,7 +296,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, .nl_groups = 0, }; struct pollfd fds[1]; - VIR_AUTOFREE(struct nlmsghdr *) temp_resp = NULL; + g_autofree struct nlmsghdr *temp_resp = NULL; VIR_AUTOPTR(virNetlinkHandle) nlhandle = NULL; int len = 0; @@ -345,7 +345,7 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg, return -1; while (!end) { - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; len = nl_recv(nlhandle, &nladdr, (unsigned char **)&resp, NULL); VIR_WARNINGS_NO_CAST_ALIGN @@ -397,7 +397,7 @@ virNetlinkDumpLink(const char *ifname, int ifindex, }; unsigned int recvbuflen; VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; if (ifname && ifindex <= 0 && virNetDevGetIndex(ifname, &ifindex) < 0) return -1; @@ -508,7 +508,7 @@ virNetlinkNewLink(const char *ifname, unsigned int buflen; struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; *error = 0; @@ -614,7 +614,7 @@ virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback) struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; unsigned int recvbuflen; VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; nl_msg = nlmsg_alloc_simple(RTM_DELLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); @@ -698,7 +698,7 @@ virNetlinkGetNeighbor(void **nlData, uint32_t src_pid, uint32_t dst_pid) }; unsigned int recvbuflen; VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + g_autofree struct nlmsghdr *resp = NULL; nl_msg = nlmsg_alloc_simple(RTM_GETNEIGH, NLM_F_DUMP | NLM_F_REQUEST); if (!nl_msg) { @@ -848,7 +848,7 @@ virNetlinkEventCallback(int watch, size_t i; int length; bool handled = false; - VIR_AUTOFREE(struct nlmsghdr *) msg = NULL; + g_autofree struct nlmsghdr *msg = NULL; length = nl_recv(srv->netlinknh, &peer, (unsigned char **)&msg, &creds); diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 9ce3566ecf..c58d429fdb 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -240,7 +240,7 @@ static int virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) binary = NULL; + g_autofree char *binary = NULL; int status; *supported = false; diff --git a/src/util/virnuma.c b/src/util/virnuma.c index f5704e7722..37a5fc894b 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -257,8 +257,8 @@ virNumaGetNodeCPUs(int node, int max_n_cpus = virNumaGetMaxCPUs(); int mask_n_bytes = max_n_cpus / 8; size_t i; - VIR_AUTOFREE(unsigned long *) mask = NULL; - VIR_AUTOFREE(unsigned long *) allonesmask = NULL; + g_autofree unsigned long *mask = NULL; + g_autofree unsigned long *allonesmask = NULL; VIR_AUTOPTR(virBitmap) cpumap = NULL; *cpus = NULL; @@ -612,8 +612,8 @@ virNumaGetHugePageInfo(int node, unsigned long long *page_free) { char *end; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *path = NULL; + g_autofree char *buf = NULL; if (page_avail) { if (virNumaGetHugePageInfoPath(&path, node, @@ -762,10 +762,10 @@ virNumaGetPages(int node, bool exchange; long system_page_size; unsigned long long huge_page_sum = 0; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(unsigned int *) tmp_size = NULL; - VIR_AUTOFREE(unsigned long long *) tmp_avail = NULL; - VIR_AUTOFREE(unsigned long long *) tmp_free = NULL; + g_autofree char *path = NULL; + g_autofree unsigned int *tmp_size = NULL; + g_autofree unsigned long long *tmp_avail = NULL; + g_autofree unsigned long long *tmp_free = NULL; /* sysconf() returns page size in bytes, * but we are storing the page size in kibibytes. */ @@ -881,8 +881,8 @@ virNumaSetPagePoolSize(int node, { char *end; unsigned long long nr_count; - VIR_AUTOFREE(char *) nr_path = NULL; - VIR_AUTOFREE(char *) nr_buf = NULL; + g_autofree char *nr_path = NULL; + g_autofree char *nr_buf = NULL; if (page_size == virGetSystemPageSizeKB()) { /* Special case as kernel handles system pages diff --git a/src/util/virpci.c b/src/util/virpci.c index 169501e731..ed053ed9f5 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -239,7 +239,7 @@ int virPCIDeviceGetDriverPathAndName(virPCIDevicePtr dev, char **path, char **name) { int ret = -1; - VIR_AUTOFREE(char *) drvlink = NULL; + g_autofree char *drvlink = NULL; *path = *name = NULL; /* drvlink = "/sys/bus/pci/dddd:bb:ss.ff/driver" */ @@ -378,8 +378,8 @@ virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned int pos) static int virPCIDeviceReadClass(virPCIDevicePtr dev, uint16_t *device_class) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) id_str = NULL; + g_autofree char *path = NULL; + g_autofree char *id_str = NULL; unsigned int value; if (!(path = virPCIFile(dev->name, "class"))) @@ -569,7 +569,7 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevicePtr dev, int cfgfd) { uint32_t caps; uint8_t pos; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; int found; /* The PCIe Function Level Reset capability allows @@ -919,8 +919,8 @@ virPCIDeviceReset(virPCIDevicePtr dev, virPCIDeviceList *activeDevs, virPCIDeviceList *inactiveDevs) { - VIR_AUTOFREE(char *) drvPath = NULL; - VIR_AUTOFREE(char *) drvName = NULL; + g_autofree char *drvPath = NULL; + g_autofree char *drvName = NULL; int ret = -1; int fd = -1; int hdrType = -1; @@ -1002,7 +1002,7 @@ static int virPCIProbeStubDriver(virPCIStubDriver driver) { const char *drvname = NULL; - VIR_AUTOFREE(char *) drvpath = NULL; + g_autofree char *drvpath = NULL; bool probed = false; if (driver == VIR_PCI_STUB_DRIVER_NONE || @@ -1019,7 +1019,7 @@ virPCIProbeStubDriver(virPCIStubDriver driver) return 0; if (!probed) { - VIR_AUTOFREE(char *) errbuf = NULL; + g_autofree char *errbuf = NULL; probed = true; if ((errbuf = virKModLoad(drvname, true))) { VIR_WARN("failed to load driver %s: %s", drvname, errbuf); @@ -1050,9 +1050,9 @@ virPCIProbeStubDriver(virPCIStubDriver driver) int virPCIDeviceUnbind(virPCIDevicePtr dev) { - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) drvpath = NULL; - VIR_AUTOFREE(char *) driver = NULL; + g_autofree char *path = NULL; + g_autofree char *drvpath = NULL; + g_autofree char *driver = NULL; if (virPCIDeviceGetDriverPathAndName(dev, &drvpath, &driver) < 0) return -1; @@ -1116,7 +1116,7 @@ static int virPCIDeviceBindWithDriverOverride(virPCIDevicePtr dev, const char *driverName) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (!(path = virPCIFile(dev->name, "driver_override"))) return -1; @@ -1150,8 +1150,8 @@ static int virPCIDeviceBindToStub(virPCIDevicePtr dev) { const char *stubDriverName; - VIR_AUTOFREE(char *) stubDriverPath = NULL; - VIR_AUTOFREE(char *) driverLink = NULL; + g_autofree char *stubDriverPath = NULL; + g_autofree char *driverLink = NULL; /* Check the device is configured to use one of the known stub drivers */ if (dev->stubDriver == VIR_PCI_STUB_DRIVER_NONE) { @@ -1263,7 +1263,7 @@ virPCIDeviceReattach(virPCIDevicePtr dev, static char * virPCIDeviceReadID(virPCIDevicePtr dev, const char *id_name) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; char *id_str; if (!(path = virPCIFile(dev->name, id_name))) @@ -1371,8 +1371,8 @@ virPCIDeviceNew(unsigned int domain, unsigned int function) { VIR_AUTOPTR(virPCIDevice) dev = NULL; - VIR_AUTOFREE(char *) vendor = NULL; - VIR_AUTOFREE(char *) product = NULL; + g_autofree char *vendor = NULL; + g_autofree char *product = NULL; if (VIR_ALLOC(dev) < 0) return NULL; @@ -1736,7 +1736,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, virPCIDeviceFileActor actor, void *opaque) { - VIR_AUTOFREE(char *) pcidir = NULL; + g_autofree char *pcidir = NULL; DIR *dir = NULL; int ret = -1; struct dirent *ent; @@ -1751,7 +1751,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, goto cleanup; while ((direrr = virDirRead(dir, &ent, pcidir)) > 0) { - VIR_AUTOFREE(char *) file = NULL; + g_autofree char *file = NULL; /* Device assignment requires: * $PCIDIR/config, $PCIDIR/resource, $PCIDIR/resourceNNN, * $PCIDIR/rom, $PCIDIR/reset, $PCIDIR/vendor, $PCIDIR/device @@ -1789,7 +1789,7 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddressPtr orig, virPCIDeviceAddressActor actor, void *opaque) { - VIR_AUTOFREE(char *) groupPath = NULL; + g_autofree char *groupPath = NULL; DIR *groupDir = NULL; int ret = -1; struct dirent *ent; @@ -1939,9 +1939,9 @@ virPCIDeviceAddressGetIOMMUGroupAddresses(virPCIDeviceAddressPtr devAddr, int virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddressPtr addr) { - VIR_AUTOFREE(char *) devName = NULL; - VIR_AUTOFREE(char *) devPath = NULL; - VIR_AUTOFREE(char *) groupPath = NULL; + g_autofree char *devName = NULL; + g_autofree char *devPath = NULL; + g_autofree char *groupPath = NULL; const char *groupNumStr; unsigned int groupNum; @@ -1980,8 +1980,8 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddressPtr addr) char * virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev) { - VIR_AUTOFREE(char *) devPath = NULL; - VIR_AUTOFREE(char *) groupPath = NULL; + g_autofree char *devPath = NULL; + g_autofree char *groupPath = NULL; char *groupDev = NULL; if (!(devPath = virPCIFile(dev->name, "iommu_group"))) @@ -2213,7 +2213,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) { virPCIDeviceAddressPtr bdf = NULL; char *config_address = NULL; - VIR_AUTOFREE(char *) device_path = NULL; + g_autofree char *device_path = NULL; if (!virFileExists(device_link)) { VIR_DEBUG("'%s' does not exist", device_link); @@ -2261,7 +2261,7 @@ int virPCIGetPhysicalFunction(const char *vf_sysfs_path, virPCIDeviceAddressPtr *pf) { - VIR_AUTOFREE(char *) device_link = NULL; + g_autofree char *device_link = NULL; *pf = NULL; @@ -2291,8 +2291,8 @@ virPCIGetVirtualFunctions(const char *sysfs_path, { int ret = -1; size_t i; - VIR_AUTOFREE(char *) totalvfs_file = NULL; - VIR_AUTOFREE(char *) totalvfs_str = NULL; + g_autofree char *totalvfs_file = NULL; + g_autofree char *totalvfs_str = NULL; virPCIDeviceAddressPtr config_addr = NULL; *virtual_functions = NULL; @@ -2315,7 +2315,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, } do { - VIR_AUTOFREE(char *) device_link = NULL; + g_autofree char *device_link = NULL; /* look for virtfn%d links until one isn't found */ if (virAsprintf(&device_link, "%s/virtfn%zu", sysfs_path, *num_virtual_functions) < 0) goto error; @@ -2357,7 +2357,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, int virPCIIsVirtualFunction(const char *vf_sysfs_device_link) { - VIR_AUTOFREE(char *) vf_sysfs_physfn_link = NULL; + g_autofree char *vf_sysfs_physfn_link = NULL; if (virAsprintf(&vf_sysfs_physfn_link, "%s/physfn", vf_sysfs_device_link) < 0) @@ -2455,9 +2455,9 @@ virPCIGetNetName(const char *device_link_sysfs_path, char *physPortID, char **netname) { - VIR_AUTOFREE(char *) pcidev_sysfs_net_path = NULL; - VIR_AUTOFREE(char *) firstEntryName = NULL; - VIR_AUTOFREE(char *) thisPhysPortID = NULL; + g_autofree char *pcidev_sysfs_net_path = NULL; + g_autofree char *firstEntryName = NULL; + g_autofree char *thisPhysPortID = NULL; int ret = -1; DIR *dir = NULL; struct dirent *entry = NULL; @@ -2545,9 +2545,9 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, int *vf_index) { virPCIDeviceAddressPtr pf_config_address = NULL; - VIR_AUTOFREE(char *) pf_sysfs_device_path = NULL; - VIR_AUTOFREE(char *) vfname = NULL; - VIR_AUTOFREE(char *) vfPhysPortID = NULL; + g_autofree char *pf_sysfs_device_path = NULL; + g_autofree char *vfname = NULL; + g_autofree char *vfPhysPortID = NULL; int ret = -1; if (virPCIGetPhysicalFunction(vf_sysfs_device_path, &pf_config_address) < 0) @@ -2615,7 +2615,7 @@ virPCIGetMdevTypes(const char *sysfspath, int dirret = -1; DIR *dir = NULL; struct dirent *entry; - VIR_AUTOFREE(char *) types_path = NULL; + g_autofree char *types_path = NULL; VIR_AUTOPTR(virMediatedDeviceType) mdev_type = NULL; virMediatedDeviceTypePtr *mdev_types = NULL; size_t ntypes = 0; @@ -2633,7 +2633,7 @@ virPCIGetMdevTypes(const char *sysfspath, } while ((dirret = virDirRead(dir, &entry, types_path)) > 0) { - VIR_AUTOFREE(char *) tmppath = NULL; + g_autofree char *tmppath = NULL; /* append the type id to the path and read the attributes from there */ if (virAsprintf(&tmppath, "%s/%s", types_path, entry->d_name) < 0) goto cleanup; diff --git a/src/util/virperf.c b/src/util/virperf.c index e334d415e4..fe2c3f8864 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -177,7 +177,7 @@ virPerfRdtAttrInit(void) { char *tmp = NULL; unsigned int attr_type = 0; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; if (virFileReadAllQuiet("/sys/devices/intel_cqm/type", 10, &buf) < 0) return -1; @@ -221,7 +221,7 @@ virPerfEventEnable(virPerfPtr perf, } if (type == VIR_PERF_EVENT_CMT) { - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", 10, &buf) < 0) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 9c2206c618..f7849d91a6 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -97,7 +97,7 @@ int virPidFileWrite(const char *dir, const char *name, pid_t pid) { - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *pidfile = NULL; if (name == NULL || dir == NULL) return -EINVAL; @@ -159,7 +159,7 @@ int virPidFileRead(const char *dir, const char *name, pid_t *pid) { - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *pidfile = NULL; *pid = 0; @@ -204,10 +204,10 @@ int virPidFileReadPathIfAlive(const char *path, const char deletedText[] = " (deleted)"; size_t deletedTextLen = strlen(deletedText); pid_t retPid; - VIR_AUTOFREE(char *) procPath = NULL; - VIR_AUTOFREE(char *) procLink = NULL; - VIR_AUTOFREE(char *) resolvedBinPath = NULL; - VIR_AUTOFREE(char *) resolvedProcLink = NULL; + g_autofree char *procPath = NULL; + g_autofree char *procLink = NULL; + g_autofree char *resolvedBinPath = NULL; + g_autofree char *resolvedProcLink = NULL; /* only set this at the very end on success */ *pid = -1; @@ -300,7 +300,7 @@ int virPidFileReadIfAlive(const char *dir, pid_t *pid, const char *binpath) { - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *pidfile = NULL; if (name == NULL || dir == NULL) return -EINVAL; @@ -326,7 +326,7 @@ int virPidFileDeletePath(const char *pidfile) int virPidFileDelete(const char *dir, const char *name) { - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *pidfile = NULL; if (name == NULL || dir == NULL) return -EINVAL; @@ -426,7 +426,7 @@ int virPidFileAcquire(const char *dir, bool waitForLock, pid_t pid) { - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *pidfile = NULL; if (name == NULL || dir == NULL) return -EINVAL; @@ -465,7 +465,7 @@ int virPidFileRelease(const char *dir, const char *name, int fd) { - VIR_AUTOFREE(char *) pidfile = NULL; + g_autofree char *pidfile = NULL; if (name == NULL || dir == NULL) return -EINVAL; @@ -483,7 +483,7 @@ virPidFileConstructPath(bool privileged, const char *progname, char **pidfile) { - VIR_AUTOFREE(char *) rundir = NULL; + g_autofree char *rundir = NULL; if (privileged) { /* diff --git a/src/util/virprocess.c b/src/util/virprocess.c index e8d4ba08b4..b5fda05e0c 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -158,7 +158,7 @@ virProcessAbort(pid_t pid) int saved_errno; int ret; int status; - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (pid <= 0) return; @@ -237,7 +237,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) { int ret; int status; - VIR_AUTOFREE(char *) st = NULL; + g_autofree char *st = NULL; if (pid <= 0) { if (pid != -1) @@ -581,7 +581,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) DIR *dir = NULL; int value; struct dirent *ent; - VIR_AUTOFREE(char *) taskPath = NULL; + g_autofree char *taskPath = NULL; *npids = 0; *pids = NULL; @@ -630,7 +630,7 @@ int virProcessGetNamespaces(pid_t pid, for (i = 0; i < G_N_ELEMENTS(ns); i++) { int fd; - VIR_AUTOFREE(char *) nsfile = NULL; + g_autofree char *nsfile = NULL; if (virAsprintf(&nsfile, "/proc/%llu/ns/%s", (long long) pid, @@ -950,8 +950,8 @@ int virProcessGetStartTime(pid_t pid, { char *tmp; int len; - VIR_AUTOFREE(char *) filename = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *filename = NULL; + g_autofree char *buf = NULL; VIR_AUTOSTRINGLIST tokens = NULL; if (virAsprintf(&filename, "/proc/%llu/stat", (long long) pid) < 0) @@ -1052,7 +1052,7 @@ static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, virProcessNamespaceHelperData *data = opaque; int fd = -1; int ret = -1; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; if (virAsprintf(&path, "/proc/%lld/ns/mnt", (long long) data->pid) < 0) goto cleanup; @@ -1157,7 +1157,7 @@ virProcessRunInFork(virProcessForkCallback cb, _exit(ret < 0 ? EXIT_CANCELED : ret); } else { int status; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; VIR_FORCE_CLOSE(errfd[1]); ignore_value(virFileReadHeaderFD(errfd[0], 1024, &buf)); @@ -1237,7 +1237,7 @@ virProcessNamespaceAvailable(unsigned int ns) int cpid; char *childStack; int stacksize = getpagesize() * 4; - VIR_AUTOFREE(char *)stack = NULL; + g_autofree char *stack = NULL; if (ns & VIR_PROCESS_NAMESPACE_MNT) flags |= CLONE_NEWNS; diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 115109cb09..2fccfc24ff 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -87,7 +87,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, for (i = 0; i < virJSONValueArraySize(array); i++) { member = virJSONValueArrayGet((virJSONValuePtr) array, i); - VIR_AUTOFREE(char *) prefix = NULL; + g_autofree char *prefix = NULL; if (virAsprintf(&prefix, "%s.%zu", key, i) < 0) return 0; @@ -111,7 +111,7 @@ virQEMUBuildCommandLineJSONIterate(const char *key, struct virQEMUCommandLineJSONIteratorData *data = opaque; if (data->prefix) { - VIR_AUTOFREE(char *) tmpkey = NULL; + g_autofree char *tmpkey = NULL; if (virAsprintf(&tmpkey, "%s.%s", data->prefix, key) < 0) return -1; diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 90b77e6959..9b50c09221 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2539,7 +2539,7 @@ int virResctrlMonitorDeterminePath(virResctrlMonitorPtr monitor, const char *machinename) { - VIR_AUTOFREE(char *) parentpath = NULL; + g_autofree char *parentpath = NULL; if (!monitor) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 6e167067e4..d2c68644fa 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -109,7 +109,7 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix, { DIR *dir = NULL; struct dirent *entry; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; char *sg = NULL; unsigned int adapter_id; const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES; @@ -148,7 +148,7 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, { DIR *dir = NULL; struct dirent *entry; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; char *name = NULL; unsigned int adapter_id; const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES; @@ -185,11 +185,11 @@ virSCSIDeviceNew(const char *sysfs_prefix, { VIR_AUTOPTR(virSCSIDevice) dev = NULL; virSCSIDevicePtr ret = NULL; - VIR_AUTOFREE(char *) sg = NULL; - VIR_AUTOFREE(char *) vendor_path = NULL; - VIR_AUTOFREE(char *) model_path = NULL; - VIR_AUTOFREE(char *) vendor = NULL; - VIR_AUTOFREE(char *) model = NULL; + g_autofree char *sg = NULL; + g_autofree char *vendor_path = NULL; + g_autofree char *model_path = NULL; + g_autofree char *vendor = NULL; + g_autofree char *model = NULL; const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES; if (VIR_ALLOC(dev) < 0) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 77fadb008e..91e2a8d558 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -499,7 +499,7 @@ virSocketAddrFormatFull(const virSocketAddr *addr, } if (withService) { - VIR_AUTOFREE(char *) ipv6_host = NULL; + g_autofree char *ipv6_host = NULL; /* sasl_new_client demands the socket address to be in an odd format: * a.b.c.d;port or e:f:g:h:i:j:k:l;port, so use square brackets for * IPv6 only if no separator is passed to the function @@ -841,9 +841,9 @@ virSocketAddrGetRange(virSocketAddrPtr start, virSocketAddrPtr end, int ret = 0; size_t i; virSocketAddr netmask; - VIR_AUTOFREE(char *) startStr = NULL; - VIR_AUTOFREE(char *) endStr = NULL; - VIR_AUTOFREE(char *) netStr = NULL; + g_autofree char *startStr = NULL; + g_autofree char *endStr = NULL; + g_autofree char *netStr = NULL; if (start == NULL || end == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 6c2693fec9..5726e62e68 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -506,7 +506,7 @@ qcow2GetExtensions(const char *buf, switch (magic) { case QCOW2_HDR_EXTENSION_BACKING_FORMAT: { - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (!backingFormat) break; @@ -602,7 +602,7 @@ vmdk4GetBackingStore(char **res, char *start, *end; size_t len; int ret = BACKING_STORE_ERROR; - VIR_AUTOFREE(char *) desc = NULL; + g_autofree char *desc = NULL; if (VIR_ALLOC_N(desc, VIR_STORAGE_MAX_HEADER) < 0) goto cleanup; @@ -1095,7 +1095,7 @@ virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid) struct stat sb; ssize_t len = VIR_STORAGE_MAX_HEADER; VIR_AUTOCLOSE fd = -1; - VIR_AUTOFREE(char *) header = NULL; + g_autofree char *header = NULL; if ((fd = virFileOpenAs(path, O_RDONLY, 0, uid, gid, 0)) < 0) { virReportSystemError(-fd, _("Failed to open file '%s'"), path); @@ -1218,7 +1218,7 @@ virStorageFileGetMetadataFromFD(const char *path, ssize_t len = VIR_STORAGE_MAX_HEADER; struct stat sb; int dummy; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; if (!backingFormat) @@ -1509,7 +1509,7 @@ virStorageFileGetNPIVKey(const char *path, int status; const char *serial; const char *port; - VIR_AUTOFREE(char *) outbuf = NULL; + g_autofree char *outbuf = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; cmd = virCommandNewArgList("/lib/udev/scsi_id", @@ -1606,7 +1606,7 @@ virStorageFileParseChainIndex(const char *diskTarget, unsigned int *chainIndex) { unsigned int idx = 0; - VIR_AUTOFREE(char *) target = NULL; + g_autofree char *target = NULL; *chainIndex = 0; @@ -1880,7 +1880,7 @@ virStorageAuthDefParse(xmlNodePtr node, virStorageAuthDefPtr ret = NULL; xmlNodePtr secretnode = NULL; VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; - VIR_AUTOFREE(char *) authtype = NULL; + g_autofree char *authtype = NULL; ctxt->node = node; @@ -1970,10 +1970,10 @@ virStoragePRDefParseXML(xmlXPathContextPtr ctxt) { virStoragePRDefPtr prd; virStoragePRDefPtr ret = NULL; - VIR_AUTOFREE(char *) managed = NULL; - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) mode = NULL; + g_autofree char *managed = NULL; + g_autofree char *type = NULL; + g_autofree char *path = NULL; + g_autofree char *mode = NULL; if (VIR_ALLOC(prd) < 0) return NULL; @@ -2628,7 +2628,7 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, const char *rel) { virStorageSourcePtr ret = NULL; - VIR_AUTOFREE(char *) dirname = NULL; + g_autofree char *dirname = NULL; VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; if (!(def = virStorageSourceNew())) @@ -2828,7 +2828,7 @@ virStorageSourceParseRBDColonString(const char *rbdstr, virStorageSourcePtr src) { char *p, *e, *next; - VIR_AUTOFREE(char *) options = NULL; + g_autofree char *options = NULL; VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; /* optionally skip the "rbd:" prefix if provided */ @@ -3004,7 +3004,7 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src, const char *path) { const char *p; - VIR_AUTOFREE(char *) protocol = NULL; + g_autofree char *protocol = NULL; if (!(p = strchr(path, ':'))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3619,7 +3619,7 @@ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src, virJSONValuePtr file; const char *drvname; size_t i; - VIR_AUTOFREE(char *) str = NULL; + g_autofree char *str = NULL; if (!(deflattened = virJSONValueObjectDeflatten(json))) return -1; @@ -4064,8 +4064,8 @@ virStorageFileCanonicalizePath(const char *path, size_t j = 0; int rc; char *ret = NULL; - VIR_AUTOFREE(char *) linkpath = NULL; - VIR_AUTOFREE(char *) currentpath = NULL; + g_autofree char *linkpath = NULL; + g_autofree char *currentpath = NULL; if (path[0] == '/') { beginSlash = true; @@ -4236,8 +4236,8 @@ virStorageFileGetRelativeBackingPath(virStorageSourcePtr top, char **relpath) { virStorageSourcePtr next; - VIR_AUTOFREE(char *) tmp = NULL; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *tmp = NULL; + g_autofree char *path = NULL; *relpath = NULL; @@ -4942,7 +4942,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, ssize_t headerLen; int backingFormat; int rv; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; VIR_AUTOUNREF(virStorageSourcePtr) backingStore = NULL; VIR_DEBUG("path=%s format=%d uid=%u gid=%u", @@ -5120,7 +5120,7 @@ virStorageFileGetBackingStoreStr(virStorageSourcePtr src, { ssize_t headerLen; int rv; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; VIR_AUTOUNREF(virStorageSourcePtr) tmp = NULL; *backing = NULL; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 26056bf503..9d5e36ba7b 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -173,7 +173,7 @@ virTPMExecGetCaps(virCommandPtr cmd, { int exitstatus; virBitmapPtr bitmap; - VIR_AUTOFREE(char *) outbuf = NULL; + g_autofree char *outbuf = NULL; VIR_AUTOPTR(virJSONValue) json = NULL; virJSONValuePtr featureList; virJSONValuePtr item; @@ -291,7 +291,7 @@ virTPMEmulatorInit(void) virMutexLock(&swtpm_tools_lock); for (i = 0; i < G_N_ELEMENTS(prgs); i++) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; bool findit = *prgs[i].path == NULL; struct stat statbuf; char *tmp; diff --git a/src/util/virusb.c b/src/util/virusb.c index d1a414af41..9ff16a769c 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -86,8 +86,8 @@ static int virUSBSysReadFile(const char *f_name, const char *d_name, int base, unsigned int *value) { int tmp; - VIR_AUTOFREE(char *) buf = NULL; - VIR_AUTOFREE(char *) filename = NULL; + g_autofree char *buf = NULL; + g_autofree char *filename = NULL; char *ignore = NULL; tmp = virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); diff --git a/src/util/virutil.c b/src/util/virutil.c index 940c6d70e1..742acd8b9b 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1482,7 +1482,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, void virWaitForDevices(void) { VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) udev = NULL; + g_autofree char *udev = NULL; int exitstatus; if (!(udev = virFindFileInPath(UDEVADM))) diff --git a/tests/cputest.c b/tests/cputest.c index e3937c6fd6..ab68c3b4af 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -656,8 +656,8 @@ static int cpuTestCompareSignature(const struct data *data, virCPUDataPtr hostData) { - VIR_AUTOFREE(char *) result = NULL; - VIR_AUTOFREE(char *) sigStr = NULL; + g_autofree char *result = NULL; + g_autofree char *sigStr = NULL; unsigned long signature; unsigned int family; unsigned int model; diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 579eb2ec60..e49eef6162 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -144,8 +144,8 @@ static int mymain(void) { int ret = 0; - VIR_AUTOFREE(char *)basefile = NULL; - VIR_AUTOFREE(char *)baseargs = NULL; + g_autofree char *basefile = NULL; + g_autofree char *baseargs = NULL; # define DO_TEST(name) \ do { \ diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 2056eeb2e9..e8c892fdd6 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -51,9 +51,9 @@ testBackingXMLjsonXML(const void *args) g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) backendprops = NULL; VIR_AUTOPTR(virJSONValue) wrapper = NULL; - VIR_AUTOFREE(char *) propsstr = NULL; - VIR_AUTOFREE(char *) protocolwrapper = NULL; - VIR_AUTOFREE(char *) actualxml = NULL; + g_autofree char *propsstr = NULL; + g_autofree char *protocolwrapper = NULL; + g_autofree char *actualxml = NULL; VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc = NULL; VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc = NULL; @@ -366,7 +366,7 @@ testQemuImageCreateLoadDiskXML(const char *name, VIR_AUTOPTR(xmlDoc) doc = NULL; VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; xmlNodePtr node; - VIR_AUTOFREE(char *) xmlpath = NULL; + g_autofree char *xmlpath = NULL; virStorageSourcePtr ret = NULL; if (virAsprintf(&xmlpath, "%s%s.xml", @@ -403,10 +403,10 @@ testQemuImageCreate(const void *opaque) VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) actualbuf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) jsonprotocol = NULL; - VIR_AUTOFREE(char *) jsonformat = NULL; - VIR_AUTOFREE(char *) actual = NULL; - VIR_AUTOFREE(char *) jsonpath = NULL; + g_autofree char *jsonprotocol = NULL; + g_autofree char *jsonformat = NULL; + g_autofree char *actual = NULL; + g_autofree char *jsonpath = NULL; if (!(src = testQemuImageCreateLoadDiskXML(data->name, data->driver->xmlopt))) return -1; @@ -438,7 +438,7 @@ testQemuImageCreate(const void *opaque) if (testQEMUSchemaValidate(formatprops, data->schemaroot, data->schema, &debug) < 0) { - VIR_AUTOFREE(char *) debugmsg = virBufferContentAndReset(&debug); + g_autofree char *debugmsg = virBufferContentAndReset(&debug); VIR_TEST_VERBOSE("blockdev-create format json does not conform to QAPI schema"); VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s", jsonformat, NULLSTR(debugmsg)); @@ -453,7 +453,7 @@ testQemuImageCreate(const void *opaque) if (testQEMUSchemaValidate(protocolprops, data->schemaroot, data->schema, &debug) < 0) { - VIR_AUTOFREE(char *) debugmsg = virBufferContentAndReset(&debug); + g_autofree char *debugmsg = virBufferContentAndReset(&debug); VIR_TEST_VERBOSE("blockdev-create protocol json does not conform to QAPI schema"); VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s", jsonprotocol, NULLSTR(debugmsg)); @@ -483,8 +483,8 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) { struct testQemuDiskXMLToJSONData *data = (void *) opaque; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) jsonpath = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *jsonpath = NULL; + g_autofree char *actual = NULL; size_t i; if (data->fail) @@ -495,7 +495,7 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) return -1; for (i = 0; i < data->npropssrc; i++) { - VIR_AUTOFREE(char *) jsonstr = NULL; + g_autofree char *jsonstr = NULL; if (!(jsonstr = virJSONValueToString(data->propssrc[i], true))) return -1; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 1a785d8e39..a9a1e75587 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -183,8 +183,8 @@ doCapsTest(const char *base, void *opaque) { testQemuDataPtr data = (testQemuDataPtr) opaque; - VIR_AUTOFREE(char *) title = NULL; - VIR_AUTOFREE(char *) copyTitle = NULL; + g_autofree char *title = NULL; + g_autofree char *copyTitle = NULL; if (virAsprintf(&title, "%s (%s)", base, archName) < 0 || virAsprintf(©Title, "copy %s (%s)", base, archName) < 0) { diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index e36ba06eeb..f5aecaa391 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -100,7 +100,7 @@ testGetCaps(char *capsData, const testQemuData *data) virQEMUCapsPtr qemuCaps = NULL; virCapsPtr caps = NULL; virArch arch = virArchFromString(data->archName); - VIR_AUTOFREE(char *) binary = NULL; + g_autofree char *binary = NULL; if (virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName) < 0) goto error; @@ -179,7 +179,7 @@ doCapsTest(const char *base, void *opaque) { testQemuDataPtr data = (testQemuDataPtr) opaque; - VIR_AUTOFREE(char *) title = NULL; + g_autofree char *title = NULL; if (virAsprintf(&title, "%s (%s)", base, archName) < 0) return -1; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index 9dabe92ab9..72d1eeaea5 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -38,9 +38,9 @@ testCompareXMLToXMLFiles(const char *inxml, { unsigned int parseflags = 0; unsigned int formatflags = VIR_DOMAIN_CHECKPOINT_FORMAT_SECURE; - VIR_AUTOFREE(char *) inXmlData = NULL; - VIR_AUTOFREE(char *) outXmlData = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *inXmlData = NULL; + g_autofree char *outXmlData = NULL; + g_autofree char *actual = NULL; VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; if (flags & TEST_REDEFINE) diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index e4d867c1b2..ca396b36b1 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -17,12 +17,12 @@ static int testParseFormatFW(const void *opaque) { const char *filename = opaque; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; VIR_AUTOPTR(qemuFirmware) fw = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; VIR_AUTOPTR(virJSONValue) json = NULL; - VIR_AUTOFREE(char *) expected = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *expected = NULL; + g_autofree char *actual = NULL; if (virAsprintf(&path, "%s/qemufirmwaredata/%s", abs_srcdir, filename) < 0) @@ -57,7 +57,7 @@ testParseFormatFW(const void *opaque) static int testFWPrecedence(const void *opaque G_GNUC_UNUSED) { - VIR_AUTOFREE(char *) fakehome = NULL; + g_autofree char *fakehome = NULL; VIR_AUTOSTRINGLIST fwList = NULL; size_t nfwList; size_t i; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 1248db59f2..b989e3897f 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2949,10 +2949,10 @@ testQueryJobs(const void *opaque) { const struct testQueryJobsData *data = opaque; qemuMonitorTestPtr test = qemuMonitorTestNewSimple(data->xmlopt); - VIR_AUTOFREE(char *) filenameJSON = NULL; - VIR_AUTOFREE(char *) fileJSON = NULL; - VIR_AUTOFREE(char *) filenameResult = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *filenameJSON = NULL; + g_autofree char *fileJSON = NULL; + g_autofree char *filenameResult = NULL; + g_autofree char *actual = NULL; qemuMonitorJobInfoPtr *jobs = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; size_t njobs = 0; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 52e4619f38..cc196263f3 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -123,8 +123,8 @@ qemuMonitorTestAddErrorResponse(qemuMonitorTestPtr test, const char *usermsg) { virBuffer buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) escapemsg = NULL; - VIR_AUTOFREE(char *) jsonmsg = NULL; + g_autofree char *escapemsg = NULL; + g_autofree char *jsonmsg = NULL; char *tmp; if (!usermsg) @@ -159,7 +159,7 @@ static int qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test, const char *command) { - VIR_AUTOFREE(char *) msg = NULL; + g_autofree char *msg = NULL; if (virAsprintf(&msg, "unexpected command: '%s'", command) < 0) return -1; @@ -173,7 +173,7 @@ qemuMonitorTestAddInvalidCommandResponse(qemuMonitorTestPtr test, const char *expectedcommand, const char *actualcommand) { - VIR_AUTOFREE(char *) msg = NULL; + g_autofree char *msg = NULL; if (virAsprintf(&msg, "expected command '%s' got '%s'", expectedcommand, actualcommand) < 0) @@ -187,8 +187,8 @@ int G_GNUC_PRINTF(2, 3) qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) { va_list msgargs; - VIR_AUTOFREE(char *) msg = NULL; - VIR_AUTOFREE(char *) jsonmsg = NULL; + g_autofree char *msg = NULL; + g_autofree char *jsonmsg = NULL; int ret = -1; va_start(msgargs, errmsg); @@ -514,7 +514,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test, g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; virJSONValuePtr schemaroot; VIR_AUTOPTR(virJSONValue) emptyargs = NULL; - VIR_AUTOFREE(char *) schemapath = NULL; + g_autofree char *schemapath = NULL; if (!test->qapischema) return 0; @@ -622,8 +622,8 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test, const char *cmdstr) { struct qemuMonitorTestHandlerData *data = item->opaque; - VIR_AUTOFREE(char *) reformatted = NULL; - VIR_AUTOFREE(char *) errmsg = NULL; + g_autofree char *reformatted = NULL; + g_autofree char *errmsg = NULL; VIR_AUTOPTR(virJSONValue) json = NULL; virJSONValuePtr cmdargs; const char *cmdname; diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 9efc15c105..83719a28f2 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -41,9 +41,9 @@ prepareObjects(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv; VIR_AUTOUNREF(virDomainObjPtr) vm = NULL; - VIR_AUTOFREE(char *) filename = NULL; - VIR_AUTOFREE(char *) domxml = NULL; - VIR_AUTOFREE(char *) latestCapsFile = NULL; + g_autofree char *filename = NULL; + g_autofree char *domxml = NULL; + g_autofree char *latestCapsFile = NULL; if (virAsprintf(&filename, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlname) < 0) return -1; diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index b5a7d9bbd2..b25f7f65b0 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -17,12 +17,12 @@ static int testParseFormatVU(const void *opaque) { const char *filename = opaque; - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; VIR_AUTOPTR(qemuVhostUser) vu = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; VIR_AUTOPTR(virJSONValue) json = NULL; - VIR_AUTOFREE(char *) expected = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *expected = NULL; + g_autofree char *actual = NULL; if (virAsprintf(&path, "%s/qemuvhostuserdata/%s", abs_srcdir, filename) < 0) @@ -57,7 +57,7 @@ testParseFormatVU(const void *opaque) static int testVUPrecedence(const void *opaque G_GNUC_UNUSED) { - VIR_AUTOFREE(char *) fakehome = NULL; + g_autofree char *fakehome = NULL; VIR_AUTOSTRINGLIST vuList = NULL; size_t nvuList; size_t i; diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 1806f9725f..ae038a78ea 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -57,7 +57,7 @@ test_node_info_parser(const void *opaque) { const struct testNodeInfoParserData *data = opaque; collie_test test = data->data; - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; VIR_AUTOPTR(virStoragePoolDef) pool = NULL; if (!(pool = virStoragePoolDefParseFile(data->poolxml))) @@ -85,7 +85,7 @@ test_vdi_list_parser(const void *opaque) { const struct testVDIListParserData *data = opaque; collie_test test = data->data; - VIR_AUTOFREE(char *) output = NULL; + g_autofree char *output = NULL; VIR_AUTOPTR(virStoragePoolDef) pool = NULL; VIR_AUTOPTR(virStorageVolDef) vol = NULL; @@ -117,8 +117,8 @@ static int mymain(void) { int ret = 0; - VIR_AUTOFREE(char *) poolxml = NULL; - VIR_AUTOFREE(char *) volxml = NULL; + g_autofree char *poolxml = NULL; + g_autofree char *volxml = NULL; collie_test node_info_tests[] = { {"", -1, 0, 0}, diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c index 518a5fdfe7..185372e939 100644 --- a/tests/storagepoolcapstest.c +++ b/tests/storagepoolcapstest.c @@ -55,8 +55,8 @@ test_virStoragePoolCapsFormat(const void *opaque) (struct test_virStoragePoolCapsFormatData *) opaque; virCapsPtr driverCaps = data->driverCaps; VIR_AUTOUNREF(virStoragePoolCapsPtr) poolCaps = NULL; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) poolCapsXML = NULL; + g_autofree char *path = NULL; + g_autofree char *poolCapsXML = NULL; if (!(poolCaps = virStoragePoolCapsNew(driverCaps))) diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c index 8e09149906..766588c369 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -26,8 +26,8 @@ testCompareXMLToArgvFiles(bool shouldFail, virStoragePoolDefPtr def = NULL; virStoragePoolObjPtr pool = NULL; const char *defTypeStr; - VIR_AUTOFREE(char *) actualCmdline = NULL; - VIR_AUTOFREE(char *) src = NULL; + g_autofree char *actualCmdline = NULL; + g_autofree char *src = NULL; VIR_AUTOPTR(virCommand) cmd = NULL; if (!(def = virStoragePoolDefParseFile(poolxml))) @@ -105,8 +105,8 @@ static int testCompareXMLToArgvHelper(const void *data) { const struct testInfo *info = data; - VIR_AUTOFREE(char *) poolxml = NULL; - VIR_AUTOFREE(char *) cmdline = NULL; + g_autofree char *poolxml = NULL; + g_autofree char *cmdline = NULL; if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, info->pool) < 0) diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 96dd04faec..4fb37c976a 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -18,7 +18,7 @@ static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml) { - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *actual = NULL; VIR_AUTOPTR(virStoragePoolDef) dev = NULL; if (!(dev = virStoragePoolDefParseFile(inxml))) @@ -36,8 +36,8 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml) static int testCompareXMLToXMLHelper(const void *data) { - VIR_AUTOFREE(char *) inxml = NULL; - VIR_AUTOFREE(char *) outxml = NULL; + g_autofree char *inxml = NULL; + g_autofree char *outxml = NULL; if (virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, (const char*)data) < 0 || diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 20d986b524..955620eb47 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -46,7 +46,7 @@ testCompareXMLToArgvFiles(bool shouldFail, int ret = -1; virStoragePoolDefPtr def = NULL; virStoragePoolObjPtr obj = NULL; - VIR_AUTOFREE(char *) actualCmdline = NULL; + g_autofree char *actualCmdline = NULL; VIR_AUTOPTR(virStorageVolDef) vol = NULL; VIR_AUTOPTR(virStorageVolDef) inputvol = NULL; VIR_AUTOPTR(virStoragePoolDef) inputpool = NULL; @@ -108,7 +108,7 @@ testCompareXMLToArgvFiles(bool shouldFail, goto cleanup; } else { char *createCmdline = actualCmdline; - VIR_AUTOFREE(char *) cvtCmdline = NULL; + g_autofree char *cvtCmdline = NULL; int rc; if (!(cvtCmdline = virCommandToString(cmd, false))) @@ -156,11 +156,11 @@ static int testCompareXMLToArgvHelper(const void *data) { const struct testInfo *info = data; - VIR_AUTOFREE(char *) poolxml = NULL; - VIR_AUTOFREE(char *) inputpoolxml = NULL; - VIR_AUTOFREE(char *) volxml = NULL; - VIR_AUTOFREE(char *) inputvolxml = NULL; - VIR_AUTOFREE(char *) cmdline = NULL; + g_autofree char *poolxml = NULL; + g_autofree char *inputpoolxml = NULL; + g_autofree char *volxml = NULL; + g_autofree char *inputvolxml = NULL; + g_autofree char *cmdline = NULL; if (info->inputvol && virAsprintf(&inputvolxml, "%s/storagevolxml2xmlin/%s.xml", diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 7c5d8e7e38..2d15480c96 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -17,7 +17,7 @@ static int testCompareXMLToXMLFiles(const char *poolxml, const char *inxml, const char *outxml, unsigned int flags) { - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *actual = NULL; VIR_AUTOPTR(virStoragePoolDef) pool = NULL; VIR_AUTOPTR(virStorageVolDef) dev = NULL; @@ -46,9 +46,9 @@ static int testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info = data; - VIR_AUTOFREE(char *) poolxml = NULL; - VIR_AUTOFREE(char *) inxml = NULL; - VIR_AUTOFREE(char *) outxml = NULL; + g_autofree char *poolxml = NULL; + g_autofree char *inxml = NULL; + g_autofree char *outxml = NULL; if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, info->pool) < 0 || diff --git a/tests/testutils.c b/tests/testutils.c index 8997274621..287567ab73 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -688,8 +688,8 @@ int virTestCompareToULL(unsigned long long expect, unsigned long long actual) { - VIR_AUTOFREE(char *) expectStr = NULL; - VIR_AUTOFREE(char *) actualStr = NULL; + g_autofree char *expectStr = NULL; + g_autofree char *actualStr = NULL; if (virAsprintf(&expectStr, "%llu", expect) < 0) return -1; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 68a0b15cd0..6eda8daafe 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -965,7 +965,7 @@ testQemuInfoSetArgs(struct testQemuInfo *info, int gic = GIC_NONE; char *capsarch = NULL; char *capsver = NULL; - VIR_AUTOFREE(char *) capsfile = NULL; + g_autofree char *capsfile = NULL; int flag; int ret = -1; diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 3d3f319f2c..b6032f88fd 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -145,7 +145,7 @@ virMockStatRedirect(const char *path, char **newpath) FILE *fopen(const char *path, const char *mode) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; PATH_OVERRIDE(newpath, path); @@ -154,7 +154,7 @@ FILE *fopen(const char *path, const char *mode) int access(const char *path, int mode) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; PATH_OVERRIDE(newpath, path); @@ -168,7 +168,7 @@ int _open(const char *path, int flags, ...) int open(const char *path, int flags, ...) # endif { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; va_list ap; mode_t mode = 0; @@ -188,7 +188,7 @@ int open(const char *path, int flags, ...) DIR *opendir(const char *path) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; PATH_OVERRIDE(newpath, path); @@ -197,7 +197,7 @@ DIR *opendir(const char *path) int execv(const char *path, char *const argv[]) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; PATH_OVERRIDE(newpath, path); @@ -206,7 +206,7 @@ int execv(const char *path, char *const argv[]) int execve(const char *path, char *const argv[], char *const envp[]) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; PATH_OVERRIDE(newpath, path); diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 2cf2a6decf..8e21d3eae4 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -499,7 +499,7 @@ static int mymain(void) { int ret = 0; - VIR_AUTOFREE(char *) fakerootdir = NULL; + g_autofree char *fakerootdir = NULL; if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { fprintf(stderr, "Out of memory\n"); diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 2fe0ea1fb6..13717ad522 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -21,10 +21,10 @@ testJSONFromFile(const void *data) { const struct testInfo *info = data; VIR_AUTOPTR(virJSONValue) injson = NULL; - VIR_AUTOFREE(char *) infile = NULL; - VIR_AUTOFREE(char *) indata = NULL; - VIR_AUTOFREE(char *) outfile = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *infile = NULL; + g_autofree char *indata = NULL; + g_autofree char *outfile = NULL; + g_autofree char *actual = NULL; if (virAsprintf(&infile, "%s/virjsondata/parse-%s-in.json", abs_srcdir, info->name) < 0 || @@ -68,7 +68,7 @@ testJSONFromString(const void *data) const struct testInfo *info = data; VIR_AUTOPTR(virJSONValue) json = NULL; const char *expectstr = info->expect ? info->expect : info->doc; - VIR_AUTOFREE(char *) formatted = NULL; + g_autofree char *formatted = NULL; json = virJSONValueFromString(info->doc); @@ -109,10 +109,10 @@ testJSONAddRemove(const void *data) const struct testInfo *info = data; VIR_AUTOPTR(virJSONValue) json = NULL; VIR_AUTOPTR(virJSONValue) name = NULL; - VIR_AUTOFREE(char *) infile = NULL; - VIR_AUTOFREE(char *) indata = NULL; - VIR_AUTOFREE(char *) outfile = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *infile = NULL; + g_autofree char *indata = NULL; + g_autofree char *outfile = NULL; + g_autofree char *actual = NULL; if (virAsprintf(&infile, "%s/virjsondata/add-remove-%s-in.json", abs_srcdir, info->name) < 0 || @@ -180,7 +180,7 @@ testJSONLookup(const void *data) const struct testInfo *info = data; VIR_AUTOPTR(virJSONValue) json = NULL; virJSONValuePtr value = NULL; - VIR_AUTOFREE(char *) result = NULL; + g_autofree char *result = NULL; int rc; int number; const char *str; @@ -281,8 +281,8 @@ testJSONCopy(const void *data) const struct testInfo *info = data; VIR_AUTOPTR(virJSONValue) json = NULL; VIR_AUTOPTR(virJSONValue) jsonCopy = NULL; - VIR_AUTOFREE(char *) result = NULL; - VIR_AUTOFREE(char *) resultCopy = NULL; + g_autofree char *result = NULL; + g_autofree char *resultCopy = NULL; json = virJSONValueFromString(info->doc); if (!json) { @@ -345,10 +345,10 @@ testJSONDeflatten(const void *data) const struct testInfo *info = data; VIR_AUTOPTR(virJSONValue) injson = NULL; VIR_AUTOPTR(virJSONValue) deflattened = NULL; - VIR_AUTOFREE(char *) infile = NULL; - VIR_AUTOFREE(char *) indata = NULL; - VIR_AUTOFREE(char *) outfile = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *infile = NULL; + g_autofree char *indata = NULL; + g_autofree char *outfile = NULL; + g_autofree char *actual = NULL; if (virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", abs_srcdir, info->name) < 0 || @@ -390,8 +390,8 @@ testJSONEscapeObj(const void *data G_GNUC_UNUSED) VIR_AUTOPTR(virJSONValue) json = NULL; VIR_AUTOPTR(virJSONValue) nestjson = NULL; VIR_AUTOPTR(virJSONValue) parsejson = NULL; - VIR_AUTOFREE(char *) neststr = NULL; - VIR_AUTOFREE(char *) result = NULL; + g_autofree char *neststr = NULL; + g_autofree char *result = NULL; const char *parsednestedstr; if (virJSONValueObjectCreate(&nestjson, diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index 0e13ce60b7..ba26e7bd45 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -199,7 +199,7 @@ int _stat(const char *path, struct stat *sb) int stat(const char *path, struct stat *sb) # endif { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); @@ -216,7 +216,7 @@ int stat(const char *path, struct stat *sb) #ifdef MOCK_STAT64 int stat64(const char *path, struct stat64 *sb) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); @@ -234,7 +234,7 @@ int stat64(const char *path, struct stat64 *sb) int __xstat(int ver, const char *path, struct stat *sb) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); @@ -252,7 +252,7 @@ __xstat(int ver, const char *path, struct stat *sb) int __xstat64(int ver, const char *path, struct stat64 *sb) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); @@ -275,7 +275,7 @@ int lstat(const char *path, struct stat *sb) # endif { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); @@ -293,7 +293,7 @@ lstat(const char *path, struct stat *sb) int lstat64(const char *path, struct stat64 *sb) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); @@ -311,7 +311,7 @@ lstat64(const char *path, struct stat64 *sb) int __lxstat(int ver, const char *path, struct stat *sb) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); @@ -329,7 +329,7 @@ __lxstat(int ver, const char *path, struct stat *sb) int __lxstat64(int ver, const char *path, struct stat64 *sb) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; virMockStatInit(); diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitchtest.c index f01e77cbba..3beb4af149 100644 --- a/tests/virnetdevopenvswitchtest.c +++ b/tests/virnetdevopenvswitchtest.c @@ -34,8 +34,8 @@ static int testInterfaceParseStats(const void *opaque) { const InterfaceParseStatsData *data = opaque; - VIR_AUTOFREE(char *) filename = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *filename = NULL; + g_autofree char *buf = NULL; virDomainInterfaceStatsStruct actual; if (virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s", diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 8f860bb917..ba4256e2fb 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -182,7 +182,7 @@ make_file(const char *path, ssize_t len) { int fd = -1; - VIR_AUTOFREE(char *) filepath = NULL; + g_autofree char *filepath = NULL; if (value && len == -1) len = strlen(value); @@ -202,7 +202,7 @@ static void make_dir(const char *path, const char *name) { - VIR_AUTOFREE(char *) dirpath = NULL; + g_autofree char *dirpath = NULL; if (virAsprintfQuiet(&dirpath, "%s/%s", path, name) < 0) ABORT_OOM(); @@ -216,7 +216,7 @@ make_symlink(const char *path, const char *name, const char *target) { - VIR_AUTOFREE(char *) filepath = NULL; + g_autofree char *filepath = NULL; if (virAsprintfQuiet(&filepath, "%s/%s", path, name) < 0) ABORT_OOM(); @@ -233,7 +233,7 @@ pci_read_file(const char *path, { int ret = -1; int fd = -1; - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; if (virAsprintfQuiet(&newpath, "%s/%s", fakerootdir, path) < 0) { errno = ENOMEM; @@ -394,7 +394,7 @@ pci_device_get_path(const struct pciDevice *dev, { char *ret = NULL; const char *prefix = ""; - VIR_AUTOFREE(char *) devid = NULL; + g_autofree char *devid = NULL; if (faked) prefix = fakerootdir; @@ -424,7 +424,7 @@ pci_device_create_iommu(const struct pciDevice *dev, const char *devid) { struct pciIommuGroup *iommuGroup; - VIR_AUTOFREE(char *) iommuPath = NULL; + g_autofree char *iommuPath = NULL; char tmp[256]; size_t i; @@ -467,12 +467,12 @@ static void pci_device_new_from_stub(const struct pciDevice *data) { struct pciDevice *dev; - VIR_AUTOFREE(char *) devpath = NULL; - VIR_AUTOFREE(char *) devsympath = NULL; - VIR_AUTOFREE(char *) id = NULL; - VIR_AUTOFREE(char *) devid = NULL; + g_autofree char *devpath = NULL; + g_autofree char *devsympath = NULL; + g_autofree char *id = NULL; + g_autofree char *devid = NULL; char *c; - VIR_AUTOFREE(char *) configSrc = NULL; + g_autofree char *configSrc = NULL; char tmp[256]; struct stat sb; bool configSrcExists = false; @@ -516,7 +516,7 @@ pci_device_new_from_stub(const struct pciDevice *data) * file, and parallel VPATH builds must not stomp on the * original; besides, 'make distcheck' requires the original * to be read-only */ - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; ssize_t len; if ((len = virFileReadAll(configSrc, 4096, &buf)) < 0) @@ -624,7 +624,7 @@ pci_device_autobind(struct pciDevice *dev) static int pci_vfio_release_iommu(struct pciDevice *device) { - VIR_AUTOFREE(char *) vfiopath = NULL; + g_autofree char *vfiopath = NULL; size_t i = 0; for (i = 0; i < npciIommuGroups; i++) { @@ -658,7 +658,7 @@ pci_vfio_release_iommu(struct pciDevice *device) static int pci_vfio_lock_iommu(struct pciDevice *device) { - VIR_AUTOFREE(char *) vfiopath = NULL; + g_autofree char *vfiopath = NULL; int ret = -1; size_t i = 0; int fd = -1; @@ -722,7 +722,7 @@ pci_driver_new(const char *name, ...) struct pciDriver *driver; va_list args; int vendor, device; - VIR_AUTOFREE(char *) driverpath = NULL; + g_autofree char *driverpath = NULL; if (VIR_ALLOC_QUIET(driver) < 0 || VIR_STRDUP_QUIET(driver->name, name) < 0 || @@ -793,7 +793,7 @@ pci_driver_find_by_path(const char *path) static struct pciDriver * pci_driver_find_by_driver_override(struct pciDevice *dev) { - VIR_AUTOFREE(char *) path = NULL; + g_autofree char *path = NULL; char tmp[32]; size_t i; @@ -817,9 +817,9 @@ static int pci_driver_bind(struct pciDriver *driver, struct pciDevice *dev) { - VIR_AUTOFREE(char *) devid = NULL; - VIR_AUTOFREE(char *) devpath = NULL; - VIR_AUTOFREE(char *) driverpath = NULL; + g_autofree char *devid = NULL; + g_autofree char *devpath = NULL; + g_autofree char *driverpath = NULL; if (dev->driver) { /* Device already bound */ @@ -862,9 +862,9 @@ static int pci_driver_unbind(struct pciDriver *driver, struct pciDevice *dev) { - VIR_AUTOFREE(char *) devid = NULL; - VIR_AUTOFREE(char *) devpath = NULL; - VIR_AUTOFREE(char *) driverpath = NULL; + g_autofree char *devid = NULL; + g_autofree char *devpath = NULL; + g_autofree char *driverpath = NULL; if (dev->driver != driver) { /* Device not bound to the @driver */ @@ -985,7 +985,7 @@ init_syms(void) static void init_env(void) { - VIR_AUTOFREE(char *) tmp = NULL; + g_autofree char *tmp = NULL; if (!(fakerootdir = getenv("LIBVIRT_FAKE_ROOT_DIR"))) ABORT("Missing LIBVIRT_FAKE_ROOT_DIR env variable\n"); @@ -1064,7 +1064,7 @@ init_env(void) int access(const char *path, int mode) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; init_syms(); @@ -1089,7 +1089,7 @@ int open(const char *path, int flags, ...) { int ret; - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; init_syms(); @@ -1128,7 +1128,7 @@ __open_2(const char *path, int flags); int __open_2(const char *path, int flags) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; int ret; init_syms(); @@ -1153,7 +1153,7 @@ __open_2(const char *path, int flags) DIR * opendir(const char *path) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; init_syms(); @@ -1174,7 +1174,7 @@ close(int fd) char * virFileCanonicalizePath(const char *path) { - VIR_AUTOFREE(char *) newpath = NULL; + g_autofree char *newpath = NULL; init_syms(); diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index af435189f1..c3a2cc10c8 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -118,7 +118,7 @@ testPrepImages(void) int ret = EXIT_FAILURE; bool compat = false; VIR_AUTOPTR(virCommand) cmd = NULL; - VIR_AUTOFREE(char *) buf = NULL; + g_autofree char *buf = NULL; qemuimg = virFindFileInPath("qemu-img"); if (!qemuimg) @@ -279,7 +279,7 @@ testStorageChain(const void *args) virStorageSourcePtr elt; size_t i = 0; VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; - VIR_AUTOFREE(char *) broken = NULL; + g_autofree char *broken = NULL; meta = testStorageFileGetMetadata(data->start, data->format, -1, -1); if (!meta) { @@ -315,8 +315,8 @@ testStorageChain(const void *args) elt = meta; while (virStorageSourceIsBacking(elt)) { - VIR_AUTOFREE(char *) expect = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *expect = NULL; + g_autofree char *actual = NULL; if (i == data->nfiles) { fprintf(stderr, "probed chain was too long\n"); @@ -495,7 +495,7 @@ static int testPathCanonicalize(const void *args) { const struct testPathCanonicalizeData *data = args; - VIR_AUTOFREE(char *) canon = NULL; + g_autofree char *canon = NULL; canon = virStorageFileCanonicalizePath(data->path, testPathCanonicalizeReadlink, @@ -579,7 +579,7 @@ static int testPathRelative(const void *args) { const struct testPathRelativeBacking *data = args; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *actual = NULL; if (virStorageFileGetRelativeBackingPath(data->top, data->base, @@ -611,7 +611,7 @@ testBackingParse(const void *args) { const struct testBackingParseData *data = args; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) xml = NULL; + g_autofree char *xml = NULL; VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; int rc; int erc = data->rv; diff --git a/tests/virstorageutiltest.c b/tests/virstorageutiltest.c index 94d8b9b091..d4ab818f5f 100644 --- a/tests/virstorageutiltest.c +++ b/tests/virstorageutiltest.c @@ -46,8 +46,8 @@ testGlusterExtractPoolSources(const void *opaque) }; size_t i; int ret = -1; - VIR_AUTOFREE(char *) srcxmldata = NULL; - VIR_AUTOFREE(char *) actual = NULL; + g_autofree char *srcxmldata = NULL; + g_autofree char *actual = NULL; if (virTestLoadFile(data->srcxml, &srcxmldata) < 0) goto cleanup; diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 8f5c711097..68ccd73056 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -85,7 +85,7 @@ virshDomainInterfaceCompleter(vshControl *ctl, VIR_AUTOPTR(xmlDoc) xmldoc = NULL; VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; int ninterfaces; - VIR_AUTOFREE(xmlNodePtr *) interfaces = NULL; + g_autofree xmlNodePtr *interfaces = NULL; size_t i; unsigned int domainXMLFlags = 0; char **ret = NULL; @@ -135,7 +135,7 @@ virshDomainDiskTargetCompleter(vshControl *ctl, virshControlPtr priv = ctl->privData; VIR_AUTOPTR(xmlDoc) xmldoc = NULL; VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; - VIR_AUTOFREE(xmlNodePtr *) disks = NULL; + g_autofree xmlNodePtr *disks = NULL; int ndisks; size_t i; VIR_AUTOSTRINGLIST tmp = NULL; @@ -204,9 +204,9 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, virMacAddr macaddr; char macstr[VIR_MAC_STRING_BUFLEN] = ""; int ninterfaces; - VIR_AUTOFREE(xmlNodePtr *) interfaces = NULL; - VIR_AUTOFREE(char *) xpath = NULL; - VIR_AUTOFREE(char *) state = NULL; + g_autofree xmlNodePtr *interfaces = NULL; + g_autofree char *xpath = NULL; + g_autofree char *state = NULL; VIR_AUTOSTRINGLIST tmp = NULL; virCheckFlags(0, NULL); @@ -263,7 +263,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl, VIR_AUTOPTR(xmlDoc) xmldoc = NULL; VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; int naliases; - VIR_AUTOFREE(xmlNodePtr *) aliases = NULL; + g_autofree xmlNodePtr *aliases = NULL; size_t i; unsigned int domainXMLFlags = 0; char **ret = NULL; diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 839c8cc420..5a54c0a3a0 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -30,8 +30,8 @@ static char * virshPagesizeNodeToString(xmlNodePtr node) { - VIR_AUTOFREE(char *) pagesize = NULL; - VIR_AUTOFREE(char *) unit = NULL; + g_autofree char *pagesize = NULL; + g_autofree char *unit = NULL; unsigned long long byteval = 0; const char *suffix = NULL; double size = 0; @@ -57,13 +57,13 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; virshControlPtr priv = ctl->privData; unsigned int npages = 0; - VIR_AUTOFREE(xmlNodePtr *) pages = NULL; + g_autofree xmlNodePtr *pages = NULL; VIR_AUTOPTR(xmlDoc) doc = NULL; size_t i = 0; const char *cellnum = NULL; bool cellno = vshCommandOptBool(cmd, "cellno"); - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) cap_xml = NULL; + g_autofree char *path = NULL; + g_autofree char *cap_xml = NULL; char **ret = NULL; VIR_AUTOSTRINGLIST tmp = NULL; @@ -113,10 +113,10 @@ virshCellnoCompleter(vshControl *ctl, VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; virshControlPtr priv = ctl->privData; unsigned int ncells = 0; - VIR_AUTOFREE(xmlNodePtr *) cells = NULL; + g_autofree xmlNodePtr *cells = NULL; VIR_AUTOPTR(xmlDoc) doc = NULL; size_t i = 0; - VIR_AUTOFREE(char *) cap_xml = NULL; + g_autofree char *cap_xml = NULL; char **ret = NULL; VIR_AUTOSTRINGLIST tmp = NULL; diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 1fa66b4081..b7d347b389 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -88,7 +88,7 @@ virshCommaStringListComplete(const char *input, const char **options) { const size_t optionsLen = virStringListLength(options); - VIR_AUTOFREE(char *) inputCopy = NULL; + g_autofree char *inputCopy = NULL; VIR_AUTOSTRINGLIST inputList = NULL; VIR_AUTOSTRINGLIST ret = NULL; size_t nret = 0; diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 92dcbd1eb7..b2bb85cd96 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -731,11 +731,11 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd) goto cleanup; for (i = 0; i < ninterfaces; i++) { - VIR_AUTOFREE(char *) type = NULL; - VIR_AUTOFREE(char *) source = NULL; - VIR_AUTOFREE(char *) target = NULL; - VIR_AUTOFREE(char *) model = NULL; - VIR_AUTOFREE(char *) mac = NULL; + g_autofree char *type = NULL; + g_autofree char *source = NULL; + g_autofree char *target = NULL; + g_autofree char *model = NULL; + g_autofree char *mac = NULL; ctxt->node = interfaces[i]; type = virXPathString("string(./@type)", ctxt); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a83c47a162..e8097bb165 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6960,8 +6960,8 @@ virshVcpuPinQuery(vshControl *ctl, goto cleanup; for (i = 0; i < ncpus; i++) { - VIR_AUTOFREE(char *) pinInfo = NULL; - VIR_AUTOFREE(char *) vcpuStr = NULL; + g_autofree char *pinInfo = NULL; + g_autofree char *vcpuStr = NULL; if (got_vcpu && i != vcpu) continue; @@ -7583,8 +7583,8 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) goto cleanup; for (i = 0; i < niothreads; i++) { - VIR_AUTOFREE(char *) pinInfo = NULL; - VIR_AUTOFREE(char *) iothreadIdStr = NULL; + g_autofree char *pinInfo = NULL; + g_autofree char *iothreadIdStr = NULL; if (virAsprintf(&iothreadIdStr, "%u", info[i]->iothread_id) < 0) goto cleanup; @@ -9507,8 +9507,8 @@ static bool cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) { VIR_AUTOPTR(virshDomain) dom = NULL; - VIR_AUTOFREE(char *) monitor_cmd = NULL; - VIR_AUTOFREE(char *) result = NULL; + g_autofree char *monitor_cmd = NULL; + g_autofree char *result = NULL; unsigned int flags = 0; const vshCmdOpt *opt = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -13999,7 +13999,7 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < ninfos; i++) { virBuffer targetsBuff = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) targets = NULL; + g_autofree char *targets = NULL; for (j = 0; j < info[i]->ndevAlias; j++) virBufferAsprintf(&targetsBuff, "%s,", info[i]->devAlias[j]); diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 3589d84116..64b733adcc 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1434,7 +1434,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < nleases; i++) { const char *typestr = NULL; - VIR_AUTOFREE(char *) cidr_format = NULL; + g_autofree char *cidr_format = NULL; virNetworkDHCPLeasePtr lease = leases[i]; time_t expirytime_tmp = lease->expirytime; struct tm ts; diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index b01186f339..bb25840943 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -2130,7 +2130,7 @@ cmdPoolCapabilities(vshControl *ctl, { const unsigned int flags = 0; /* No flags so far */ virshControlPtr priv = ctl->privData; - VIR_AUTOFREE(char *) caps = NULL; + g_autofree char *caps = NULL; caps = virConnectGetStoragePoolCapabilities(priv->conn, flags); if (!caps) { diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index f0446c83ae..66369a25dc 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -521,7 +521,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) const char *usageStr = virSecretUsageTypeToString(usageType); char uuid[VIR_UUID_STRING_BUFLEN]; virBuffer buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOFREE(char *) usage = NULL; + g_autofree char *usage = NULL; if (virSecretGetUUIDString(sec, uuid) < 0) { vshError(ctl, "%s", _("Failed to get uuid of secret")); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index c0cc0999cb..e2ed272a04 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -396,7 +396,7 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) goto cleanup; for (i = 0; i < nsrvs; i++) { - VIR_AUTOFREE(char *) idStr = NULL; + g_autofree char *idStr = NULL; if (virAsprintf(&idStr, "%zu", i) < 0) goto cleanup; @@ -650,8 +650,8 @@ cmdSrvClientsList(vshControl *ctl, const vshCmd *cmd) goto cleanup; for (i = 0; i < nclts; i++) { - VIR_AUTOFREE(char *) timestr = NULL; - VIR_AUTOFREE(char *) idStr = NULL; + g_autofree char *timestr = NULL; + g_autofree char *idStr = NULL; virAdmClientPtr client = clts[i]; id = virAdmClientGetID(client); transport = virAdmClientGetTransport(client); -- 2.19.2
Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOPTR aliases to g_autoptr. Replace all uses of VIR_DEFINE_AUTOPTR_FUNC with G_DEFINE_AUTOPTR_CLEANUP_FUNC in preparation for replacing the rest. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/conf/domain_capabilities.h | 2 +- src/conf/domain_conf.h | 2 +- src/conf/secret_conf.h | 2 +- src/conf/storage_conf.h | 6 +++--- src/conf/virnetworkportdef.h | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_block.h | 4 ++-- src/qemu/qemu_dbus.h | 2 +- src/qemu/qemu_firmware.c | 6 +++--- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_migration_params.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_slirp.h | 2 +- src/qemu/qemu_vhost_user.c | 2 +- src/qemu/qemu_vhost_user.h | 2 +- src/util/virauthconfig.h | 2 +- src/util/virbitmap.h | 2 +- src/util/vircommand.h | 2 +- src/util/virconf.h | 2 +- src/util/virerror.h | 2 +- src/util/virfile.h | 2 +- src/util/virfirewall.h | 2 +- src/util/virfirmware.h | 2 +- src/util/virhash.h | 2 +- src/util/virjson.h | 2 +- src/util/virmacaddr.h | 2 +- src/util/virmdev.h | 4 ++-- src/util/virnetdev.c | 2 +- src/util/virnetdev.h | 2 +- src/util/virnetdevip.h | 4 ++-- src/util/virnetdevvlan.h | 2 +- src/util/virnetlink.c | 2 +- src/util/virnetlink.h | 2 +- src/util/virpci.h | 6 +++--- src/util/virperf.h | 2 +- src/util/virscsi.c | 2 +- src/util/virscsi.h | 2 +- src/util/virscsivhost.h | 2 +- src/util/virsocketaddr.h | 2 +- src/util/virstoragefile.h | 2 +- src/util/virsystemd.h | 2 +- src/util/virtypedparam.h | 2 +- src/util/viruri.h | 2 +- src/util/virusb.h | 2 +- src/util/virxml.h | 4 ++-- tests/qemumonitortestutils.h | 2 +- tools/virsh-util.h | 2 +- 47 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 3a92194602..b5c322fd90 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -236,4 +236,4 @@ int virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, void virSEVCapabilitiesFree(virSEVCapability *capabilities); -VIR_DEFINE_AUTOPTR_FUNC(virSEVCapability, virSEVCapabilitiesFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSEVCapability, virSEVCapabilitiesFree); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e2edca149a..edac6250e4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2913,7 +2913,7 @@ bool virDomainDefHasDeviceAddress(virDomainDefPtr def, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; void virDomainDefFree(virDomainDefPtr vm); -VIR_DEFINE_AUTOPTR_FUNC(virDomainDef, virDomainDefFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainDef, virDomainDefFree); virDomainChrSourceDefPtr virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt); diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index 7cfcfc8a60..ac94751ef3 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -35,7 +35,7 @@ struct _virSecretDef { }; void virSecretDefFree(virSecretDefPtr def); -VIR_DEFINE_AUTOPTR_FUNC(virSecretDef, virSecretDefFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSecretDef, virSecretDefFree); virSecretDefPtr virSecretDefParseString(const char *xml); virSecretDefPtr virSecretDefParseFile(const char *filename); diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 1f62803a9d..b172e82ccb 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -478,6 +478,6 @@ VIR_ENUM_DECL(virStoragePartedFs); VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART | \ VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE) -VIR_DEFINE_AUTOPTR_FUNC(virStoragePoolSource, virStoragePoolSourceFree); -VIR_DEFINE_AUTOPTR_FUNC(virStoragePoolDef, virStoragePoolDefFree); -VIR_DEFINE_AUTOPTR_FUNC(virStorageVolDef, virStorageVolDefFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStoragePoolSource, virStoragePoolSourceFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStoragePoolDef, virStoragePoolDefFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageVolDef, virStorageVolDefFree); diff --git a/src/conf/virnetworkportdef.h b/src/conf/virnetworkportdef.h index 796e269fe0..f5ba337fc9 100644 --- a/src/conf/virnetworkportdef.h +++ b/src/conf/virnetworkportdef.h @@ -82,7 +82,7 @@ struct _virNetworkPortDef { void virNetworkPortDefFree(virNetworkPortDefPtr port); -VIR_DEFINE_AUTOPTR_FUNC(virNetworkPortDef, virNetworkPortDefFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPortDef, virNetworkPortDefFree); virNetworkPortDefPtr virNetworkPortDefParseNode(xmlDocPtr xml, diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 17e2ccc98f..9a13351d2f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -87,7 +87,7 @@ qemuBlockNodeNameBackingChainDataFree(qemuBlockNodeNameBackingChainDataPtr data) VIR_FREE(data); } -VIR_DEFINE_AUTOPTR_FUNC(qemuBlockNodeNameBackingChainData, +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNodeNameBackingChainData, qemuBlockNodeNameBackingChainDataFree); diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 87525af160..be39c9b472 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -104,7 +104,7 @@ struct qemuBlockStorageSourceAttachData { void qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data); -VIR_DEFINE_AUTOPTR_FUNC(qemuBlockStorageSourceAttachData, +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockStorageSourceAttachData, qemuBlockStorageSourceAttachDataFree); qemuBlockStorageSourceAttachDataPtr @@ -156,7 +156,7 @@ qemuBlockStorageSourceChainDetach(qemuMonitorPtr mon, qemuBlockStorageSourceChainDataPtr data); -VIR_DEFINE_AUTOPTR_FUNC(qemuBlockStorageSourceChainData, +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockStorageSourceChainData, qemuBlockStorageSourceChainDataFree); int diff --git a/src/qemu/qemu_dbus.h b/src/qemu/qemu_dbus.h index 48ea71f7aa..ccbeb83709 100644 --- a/src/qemu/qemu_dbus.h +++ b/src/qemu/qemu_dbus.h @@ -39,4 +39,4 @@ int qemuDBusVMStateAdd(virQEMUDriverPtr driver, virDomainObjPtr vm, void qemuDBusVMStateRemove(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *id, bool hot); -VIR_DEFINE_AUTOPTR_FUNC(qemuDBusVMState, qemuDBusVMStateFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuDBusVMState, qemuDBusVMStateFree); diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index d043b46e6c..10644a0e28 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -186,7 +186,7 @@ qemuFirmwareOSInterfaceFree(qemuFirmwareOSInterface *interfaces) } -VIR_DEFINE_AUTOPTR_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFree); static void @@ -251,7 +251,7 @@ qemuFirmwareTargetFree(qemuFirmwareTargetPtr target) } -VIR_DEFINE_AUTOPTR_FUNC(qemuFirmwareTarget, qemuFirmwareTargetFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareTarget, qemuFirmwareTargetFree); static void @@ -261,7 +261,7 @@ qemuFirmwareFeatureFree(qemuFirmwareFeature *features) } -VIR_DEFINE_AUTOPTR_FUNC(qemuFirmwareFeature, qemuFirmwareFeatureFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareFeature, qemuFirmwareFeatureFree); void diff --git a/src/qemu/qemu_firmware.h b/src/qemu/qemu_firmware.h index 28e8322ec9..10b8eb822b 100644 --- a/src/qemu/qemu_firmware.h +++ b/src/qemu/qemu_firmware.h @@ -32,7 +32,7 @@ typedef qemuFirmware *qemuFirmwarePtr; void qemuFirmwareFree(qemuFirmwarePtr fw); -VIR_DEFINE_AUTOPTR_FUNC(qemuFirmware, qemuFirmwareFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmware, qemuFirmwareFree); qemuFirmwarePtr qemuFirmwareParse(const char *path); diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 6f5080e6a7..e8380e6fb1 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -93,7 +93,7 @@ qemuMigrationParamsNew(void); void qemuMigrationParamsFree(qemuMigrationParamsPtr migParams); -VIR_DEFINE_AUTOPTR_FUNC(qemuMigrationParams, qemuMigrationParamsFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMigrationParams, qemuMigrationParamsFree); int qemuMigrationParamsApply(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 536ba7893b..11048dc76a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1343,7 +1343,7 @@ int qemuMonitorGetCurrentMachineInfo(qemuMonitorPtr mon, qemuMonitorCurrentMachineInfoPtr info); void qemuMonitorJobInfoFree(qemuMonitorJobInfoPtr job); -VIR_DEFINE_AUTOPTR_FUNC(qemuMonitorJobInfo, qemuMonitorJobInfoFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorJobInfo, qemuMonitorJobInfoFree); int qemuMonitorGetJobInfo(qemuMonitorPtr mon, qemuMonitorJobInfoPtr **jobs, diff --git a/src/qemu/qemu_slirp.h b/src/qemu/qemu_slirp.h index cda1ed7777..5e80e79b15 100644 --- a/src/qemu/qemu_slirp.h +++ b/src/qemu/qemu_slirp.h @@ -77,4 +77,4 @@ void qemuSlirpStop(qemuSlirpPtr slirp, int qemuSlirpGetFD(qemuSlirpPtr slirp); -VIR_DEFINE_AUTOPTR_FUNC(qemuSlirp, qemuSlirpFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuSlirp, qemuSlirpFree); diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index d1dbc3bd5c..8a653fc101 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -116,7 +116,7 @@ qemuVhostUserGPUFeatureFree(qemuVhostUserGPUFeature *features) } -VIR_DEFINE_AUTOPTR_FUNC(qemuVhostUserGPUFeature, qemuVhostUserGPUFeatureFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuVhostUserGPUFeature, qemuVhostUserGPUFeatureFree); void diff --git a/src/qemu/qemu_vhost_user.h b/src/qemu/qemu_vhost_user.h index 76701dd1fa..6bb5f5807c 100644 --- a/src/qemu/qemu_vhost_user.h +++ b/src/qemu/qemu_vhost_user.h @@ -31,7 +31,7 @@ typedef qemuVhostUser *qemuVhostUserPtr; void qemuVhostUserFree(qemuVhostUserPtr fw); -VIR_DEFINE_AUTOPTR_FUNC(qemuVhostUser, qemuVhostUserFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuVhostUser, qemuVhostUserFree); qemuVhostUserPtr qemuVhostUserParse(const char *path); diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h index 3de5e36030..44bef7e2be 100644 --- a/src/util/virauthconfig.h +++ b/src/util/virauthconfig.h @@ -40,4 +40,4 @@ int virAuthConfigLookup(virAuthConfigPtr auth, const char *credname, const char **value); -VIR_DEFINE_AUTOPTR_FUNC(virAuthConfig, virAuthConfigFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virAuthConfig, virAuthConfigFree); diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 8d700c88c5..e0c5541c13 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -157,4 +157,4 @@ void virBitmapSubtract(virBitmapPtr a, virBitmapPtr b) void virBitmapShrink(virBitmapPtr map, size_t b); -VIR_DEFINE_AUTOPTR_FUNC(virBitmap, virBitmapFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virBitmap, virBitmapFree); diff --git a/src/util/vircommand.h b/src/util/vircommand.h index ed04eb4bd3..2f39dec1b3 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -219,4 +219,4 @@ int virCommandRunNul(virCommandPtr cmd, virCommandRunNulFunc func, void *data); -VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCommand, virCommandFree); diff --git a/src/util/virconf.h b/src/util/virconf.h index 4c0c633aad..304b325985 100644 --- a/src/util/virconf.h +++ b/src/util/virconf.h @@ -81,7 +81,7 @@ virConfPtr virConfReadFile(const char *filename, unsigned int flags); virConfPtr virConfReadString(const char *memory, unsigned int flags); int virConfFree(virConfPtr conf); -VIR_DEFINE_AUTOPTR_FUNC(virConf, virConfFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virConf, virConfFree); void virConfFreeValue(virConfValuePtr val); virConfValuePtr virConfGetValue(virConfPtr conf, const char *setting); diff --git a/src/util/virerror.h b/src/util/virerror.h index e3a08982b3..7e5ed29ae2 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -209,4 +209,4 @@ void virErrorRestore(virErrorPtr *savederr); void virLastErrorPrefixMessage(const char *fmt, ...) G_GNUC_PRINTF(1, 2); -VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virError, virFreeError); diff --git a/src/util/virfile.h b/src/util/virfile.h index a60b2bef9a..b8256a96b3 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -378,7 +378,7 @@ int virFileInData(int fd, int *inData, long long *length); -VIR_DEFINE_AUTOPTR_FUNC(virFileWrapperFd, virFileWrapperFdFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFileWrapperFd, virFileWrapperFdFree); int virFileGetXAttr(const char *path, const char *name, diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index 56e78a0672..bcc1437b9a 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -114,4 +114,4 @@ int virFirewallApply(virFirewallPtr firewall); void virFirewallSetLockOverride(bool avoid); -VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFirewall, virFirewallFree); diff --git a/src/util/virfirmware.h b/src/util/virfirmware.h index 30bcd21fa4..20bb850500 100644 --- a/src/util/virfirmware.h +++ b/src/util/virfirmware.h @@ -34,7 +34,7 @@ struct _virFirmware { void virFirmwareFree(virFirmwarePtr firmware); -VIR_DEFINE_AUTOPTR_FUNC(virFirmware, virFirmwareFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFirmware, virFirmwareFree); void virFirmwareFreeList(virFirmwarePtr *firmwares, size_t nfirmwares); diff --git a/src/util/virhash.h b/src/util/virhash.h index ed3774e693..5bb59376af 100644 --- a/src/util/virhash.h +++ b/src/util/virhash.h @@ -195,4 +195,4 @@ void *virHashSearch(const virHashTable *table, virHashSearcher iter, /* Convenience for when VIR_FREE(value) is sufficient as a data freer. */ void virHashValueFree(void *value, const void *name); -VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virHashTable, virHashFree); diff --git a/src/util/virjson.h b/src/util/virjson.h index b1d0d0e741..1ce7b75e3b 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -163,4 +163,4 @@ char *virJSONStringReformat(const char *jsonstr, bool pretty); virJSONValuePtr virJSONValueObjectDeflatten(virJSONValuePtr json); -VIR_DEFINE_AUTOPTR_FUNC(virJSONValue, virJSONValueFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virJSONValue, virJSONValueFree); diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 843893d759..2fda2b0239 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -63,4 +63,4 @@ bool virMacAddrIsMulticast(const virMacAddr *addr); bool virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]); void virMacAddrFree(virMacAddrPtr addr); -VIR_DEFINE_AUTOPTR_FUNC(virMacAddr, virMacAddrFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMacAddr, virMacAddrFree); diff --git a/src/util/virmdev.h b/src/util/virmdev.h index 7f442b571f..2f73b1a530 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -140,5 +140,5 @@ int virMediatedDeviceTypeReadAttrs(const char *sysfspath, virMediatedDeviceTypePtr *type); -VIR_DEFINE_AUTOPTR_FUNC(virMediatedDevice, virMediatedDeviceFree); -VIR_DEFINE_AUTOPTR_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMediatedDevice, virMediatedDeviceFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree); diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 894ae86a16..e23061dd4c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -122,7 +122,7 @@ virNetDevMcastEntryFree(virNetDevMcastEntryPtr entry) VIR_FREE(entry); } -VIR_DEFINE_AUTOPTR_FUNC(virNetDevMcastEntry, virNetDevMcastEntryFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevMcastEntry, virNetDevMcastEntryFree); typedef struct _virNetDevMcastList virNetDevMcastList; typedef virNetDevMcastList *virNetDevMcastListPtr; diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 854fddfe77..ea3779bb98 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -311,4 +311,4 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, int virNetDevRunEthernetScript(const char *ifname, const char *script) G_GNUC_NO_INLINE; -VIR_DEFINE_AUTOPTR_FUNC(virNetDevRxFilter, virNetDevRxFilterFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevRxFilter, virNetDevRxFilterFree); diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 7af94a49d7..59d2d4a044 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -94,5 +94,5 @@ void virNetDevIPInfoClear(virNetDevIPInfoPtr ip); int virNetDevIPInfoAddToDev(const char *ifname, virNetDevIPInfo const *ipInfo); -VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPAddr, virNetDevIPAddrFree); -VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPRoute, virNetDevIPRouteFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevIPAddr, virNetDevIPAddrFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevIPRoute, virNetDevIPRouteFree); diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 87d361a1cf..0e4fd03dcb 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -48,4 +48,4 @@ void virNetDevVlanFree(virNetDevVlanPtr vlan); int virNetDevVlanEqual(const virNetDevVlan *a, const virNetDevVlan *b); int virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlan *src); -VIR_DEFINE_AUTOPTR_FUNC(virNetDevVlan, virNetDevVlanFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevVlan, virNetDevVlanFree); diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 901e04845c..34c3f28087 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -64,7 +64,7 @@ typedef struct nl_handle virNetlinkHandle; typedef struct nl_sock virNetlinkHandle; # endif -VIR_DEFINE_AUTOPTR_FUNC(virNetlinkHandle, virNetlinkFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetlinkHandle, virNetlinkFree); typedef struct _virNetlinkEventSrvPrivate virNetlinkEventSrvPrivate; typedef virNetlinkEventSrvPrivate *virNetlinkEventSrvPrivatePtr; diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index a7e455769d..5cb6060b3b 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -36,7 +36,7 @@ # endif typedef struct nl_msg virNetlinkMsg; -VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetlinkMsg, nlmsg_free); #else diff --git a/src/util/virpci.h b/src/util/virpci.h index 017545424d..4ffe5db2d6 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -274,6 +274,6 @@ ssize_t virPCIGetMdevTypes(const char *sysfspath, void virPCIDeviceAddressFree(virPCIDeviceAddressPtr address); -VIR_DEFINE_AUTOPTR_FUNC(virPCIDevice, virPCIDeviceFree); -VIR_DEFINE_AUTOPTR_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree); -VIR_DEFINE_AUTOPTR_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIDevice, virPCIDeviceFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree); diff --git a/src/util/virperf.h b/src/util/virperf.h index 27d04b3ea4..df990109b1 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -82,4 +82,4 @@ int virPerfReadEvent(virPerfPtr perf, virPerfEventType type, uint64_t *value); -VIR_DEFINE_AUTOPTR_FUNC(virPerf, virPerfFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPerf, virPerfFree); diff --git a/src/util/virscsi.c b/src/util/virscsi.c index d2c68644fa..5cae15afd2 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -249,7 +249,7 @@ virSCSIDeviceUsedByInfoFree(virUsedByInfoPtr used_by) VIR_FREE(used_by->domname); VIR_FREE(used_by); } -VIR_DEFINE_AUTOPTR_FUNC(virUsedByInfo, virSCSIDeviceUsedByInfoFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virUsedByInfo, virSCSIDeviceUsedByInfoFree); void virSCSIDeviceFree(virSCSIDevicePtr dev) diff --git a/src/util/virscsi.h b/src/util/virscsi.h index cfd6ac7356..3a92366efc 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -95,4 +95,4 @@ void virSCSIDeviceListDel(virSCSIDeviceListPtr list, virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); -VIR_DEFINE_AUTOPTR_FUNC(virSCSIDevice, virSCSIDeviceFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSCSIDevice, virSCSIDeviceFree); diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index 52f5d2c33f..d3185b14bc 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -63,4 +63,4 @@ void virSCSIVHostDeviceGetUsedBy(virSCSIVHostDevicePtr dev, void virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev); int virSCSIVHostOpenVhostSCSI(int *vhostfd) G_GNUC_NO_INLINE; -VIR_DEFINE_AUTOPTR_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree); diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index bb97e6e3a0..6cdf7b7c4f 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -163,4 +163,4 @@ int virSocketAddrPTRDomain(const virSocketAddr *addr, void virSocketAddrFree(virSocketAddrPtr addr); -VIR_DEFINE_AUTOPTR_FUNC(virSocketAddr, virSocketAddrFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSocketAddr, virSocketAddrFree); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index cfee047e6f..545e60ba00 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -552,4 +552,4 @@ void virStorageFileReportBrokenChain(int errcode, virStorageSourcePtr src, virStorageSourcePtr parent); -VIR_DEFINE_AUTOPTR_FUNC(virStorageAuthDef, virStorageAuthDefFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageAuthDef, virStorageAuthDefFree); diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 2c0a0d8dc0..fcdf6d17fe 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -84,4 +84,4 @@ void virSystemdActivationClaimFDs(virSystemdActivationPtr act, void virSystemdActivationFree(virSystemdActivationPtr act); -VIR_DEFINE_AUTOPTR_FUNC(virSystemdActivation, virSystemdActivationFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSystemdActivation, virSystemdActivationFree); diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index b35f1f93ef..42a4da466e 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -140,7 +140,7 @@ struct _virTypedParamList { }; void virTypedParamListFree(virTypedParamListPtr list); -VIR_DEFINE_AUTOPTR_FUNC(virTypedParamList, virTypedParamListFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virTypedParamList, virTypedParamListFree); size_t virTypedParamListStealParams(virTypedParamListPtr list, virTypedParameterPtr *params); diff --git a/src/util/viruri.h b/src/util/viruri.h index e988582bbe..f91debefe9 100644 --- a/src/util/viruri.h +++ b/src/util/viruri.h @@ -60,7 +60,7 @@ char *virURIFormat(virURIPtr uri) char *virURIFormatParams(virURIPtr uri); void virURIFree(virURIPtr uri); -VIR_DEFINE_AUTOPTR_FUNC(virURI, virURIFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virURI, virURIFree); int virURIResolveAlias(virConfPtr conf, const char *alias, char **uri); #define VIR_URI_SERVER(uri) ((uri) && (uri)->server ? (uri)->server : "localhost") diff --git a/src/util/virusb.h b/src/util/virusb.h index 33ddb6c84e..7ff1d55c9e 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -98,4 +98,4 @@ void virUSBDeviceListDel(virUSBDeviceListPtr list, virUSBDevicePtr virUSBDeviceListFind(virUSBDeviceListPtr list, virUSBDevicePtr dev); -VIR_DEFINE_AUTOPTR_FUNC(virUSBDevice, virUSBDeviceFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virUSBDevice, virUSBDeviceFree); diff --git a/src/util/virxml.h b/src/util/virxml.h index 8813e31f75..283c592b2c 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -247,8 +247,8 @@ G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virXPathContextNodeSave, virXPathContextNodeRes .node = _ctxt->node}; \ ignore_value(&_ctxt ## CtxtSave) -VIR_DEFINE_AUTOPTR_FUNC(xmlDoc, xmlFreeDoc); -VIR_DEFINE_AUTOPTR_FUNC(xmlXPathContext, xmlXPathFreeContext); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlDoc, xmlFreeDoc); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlXPathContext, xmlXPathFreeContext); typedef int (*virXMLNamespaceParse)(xmlXPathContextPtr ctxt, void **nsdata); typedef void (*virXMLNamespaceFree)(void *nsdata); diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 2333fceed0..f6d7f3623c 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -101,4 +101,4 @@ qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test); qemuAgentPtr qemuMonitorTestGetAgent(qemuMonitorTestPtr test); virDomainObjPtr qemuMonitorTestGetDomainObj(qemuMonitorTestPtr test); -VIR_DEFINE_AUTOPTR_FUNC(qemuMonitorTest, qemuMonitorTestFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorTest, qemuMonitorTestFree); diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 955d34dcfc..2b0447268e 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -43,7 +43,7 @@ typedef virDomain virshDomain; void virshDomainFree(virDomainPtr dom); -VIR_DEFINE_AUTOPTR_FUNC(virshDomain, virshDomainFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virshDomain, virshDomainFree); void virshDomainCheckpointFree(virDomainCheckpointPtr chk); -- 2.19.2
Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOPTR aliases to g_autoptr. Replace all of its use by the GLib macro version. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/bhyve/bhyve_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/domain_conf.c | 40 ++++---- src/conf/interface_conf.c | 2 +- src/conf/network_conf.c | 6 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/conf/secret_conf.c | 4 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 16 ++-- src/conf/virnetworkobj.c | 2 +- src/conf/virnetworkportdef.c | 2 +- src/conf/virstorageobj.c | 4 +- src/esx/esx_storage_backend_vmfs.c | 4 +- src/libvirt-admin.c | 2 +- src/libvirt.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 4 +- src/libxl/xen_xl.c | 2 +- src/libxl/xen_xm.c | 2 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/logging/log_daemon.c | 2 +- src/logging/log_daemon_config.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_native.c | 2 +- src/network/bridge_driver.c | 2 +- src/phyp/phyp_driver.c | 4 +- src/qemu/qemu_agent.c | 16 ++-- src/qemu/qemu_block.c | 102 ++++++++++----------- src/qemu/qemu_blockjob.c | 4 +- src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_checkpoint.c | 4 +- src/qemu/qemu_command.c | 46 +++++----- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_dbus.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 12 +-- src/qemu/qemu_firmware.c | 32 +++---- src/qemu/qemu_hotplug.c | 12 +-- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_interop_config.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor_json.c | 64 ++++++------- src/qemu/qemu_process.c | 4 +- src/qemu/qemu_qapi.c | 4 +- src/qemu/qemu_slirp.c | 10 +- src/qemu/qemu_vhost_user.c | 12 +-- src/qemu/qemu_vhost_user_gpu.c | 2 +- src/remote/remote_daemon.c | 2 +- src/remote/remote_daemon_config.c | 4 +- src/security/security_selinux.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend_disk.c | 10 +- src/storage/storage_backend_fs.c | 10 +- src/storage/storage_backend_gluster.c | 4 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_iscsi_direct.c | 4 +- src/storage/storage_backend_logical.c | 22 ++--- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/storage/storage_backend_sheepdog.c | 14 +-- src/storage/storage_backend_vstorage.c | 4 +- src/storage/storage_backend_zfs.c | 14 +-- src/storage/storage_driver.c | 10 +- src/storage/storage_util.c | 22 ++--- src/test/test_driver.c | 12 +-- src/util/virauth.c | 2 +- src/util/virbitmap.c | 2 +- src/util/vircommand.c | 6 +- src/util/virfile.c | 2 +- src/util/virfirewall.c | 6 +- src/util/virhook.c | 2 +- src/util/virhostdev.c | 30 +++--- src/util/viriscsi.c | 16 ++-- src/util/virjson.c | 4 +- src/util/virkmod.c | 4 +- src/util/virlease.c | 4 +- src/util/virmdev.c | 4 +- src/util/virnetdev.c | 2 +- src/util/virnetdevbridge.c | 2 +- src/util/virnetdevip.c | 18 ++-- src/util/virnetdevmacvlan.c | 6 +- src/util/virnetdevopenvswitch.c | 16 ++-- src/util/virnetdevveth.c | 4 +- src/util/virnetlink.c | 12 +-- src/util/virnodesuspend.c | 2 +- src/util/virnuma.c | 8 +- src/util/virpci.c | 18 ++-- src/util/virqemu.c | 2 +- src/util/virscsi.c | 6 +- src/util/virscsivhost.c | 2 +- src/util/virstoragefile.c | 18 ++-- src/util/virtpm.c | 4 +- src/util/virusb.c | 2 +- src/util/virutil.c | 2 +- src/vbox/vbox_storage.c | 2 +- src/vmx/vmx.c | 2 +- tests/qemublocktest.c | 18 ++-- tests/qemufirmwaretest.c | 4 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 80 ++++++++-------- tests/qemumonitortestutils.c | 6 +- tests/qemuvhostusertest.c | 4 +- tests/storagebackendsheepdogtest.c | 6 +- tests/storagepoolxml2argvtest.c | 2 +- tests/storagepoolxml2xmltest.c | 2 +- tests/storagevolxml2argvtest.c | 8 +- tests/storagevolxml2xmltest.c | 4 +- tests/virbitmaptest.c | 6 +- tests/virconftest.c | 12 +-- tests/virjsontest.c | 32 +++---- tests/virnetworkportxml2xmltest.c | 2 +- tests/virstoragetest.c | 4 +- tests/virsystemdtest.c | 2 +- tests/xlconfigtest.c | 4 +- tests/xmconfigtest.c | 4 +- tools/virsh-completer-domain.c | 16 ++-- tools/virsh-completer-host.c | 8 +- tools/virsh-domain.c | 6 +- tools/virt-login-shell-helper.c | 2 +- 123 files changed, 527 insertions(+), 527 deletions(-) diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c index 946be4a811..617b25eb8f 100644 --- a/src/bhyve/bhyve_conf.c +++ b/src/bhyve/bhyve_conf.c @@ -70,7 +70,7 @@ int virBhyveLoadDriverConfig(virBhyveDriverConfigPtr cfg, const char *filename) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; if (access(filename, R_OK) == -1) { VIR_INFO("Could not read bhyve config file %s", filename); diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 9b407dca78..376a627ee4 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -209,7 +209,7 @@ virDomainCheckpointDefParseNode(xmlDocPtr xml, void *parseOpaque, unsigned int flags) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; g_autofree char *schema = NULL; if (!virXMLNodeNameEqual(root, "domaincheckpoint")) { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 139dccefff..a0690e23f7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2000,7 +2000,7 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def, { int maxvcpus = virDomainDefGetVcpusMax(def); size_t i; - VIR_AUTOPTR(virBitmap) allcpumap = NULL; + g_autoptr(virBitmap) allcpumap = NULL; if (hostcpus < 0) return -1; @@ -3188,7 +3188,7 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def, size_t i; ssize_t nxt = -1; virDomainIOThreadIDDefPtr iothrid = NULL; - VIR_AUTOPTR(virBitmap) thrmap = NULL; + g_autoptr(virBitmap) thrmap = NULL; /* Same value (either 0 or some number), then we have none to fill in or * the iothreadid array was filled from the XML @@ -7974,7 +7974,7 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr sourcenode, int auth_secret_usage = -1; xmlNodePtr cur; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &def->u.iscsi; - VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; + g_autoptr(virStorageAuthDef) authdef = NULL; /* For the purposes of command line creation, this needs to look * like a disk storage source */ @@ -9954,7 +9954,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_XPATH_NODE_AUTORESTORE(ctxt); bool source = false; virStorageEncryptionPtr encryption = NULL; - VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; + g_autoptr(virStorageAuthDef) authdef = NULL; g_autofree char *tmp = NULL; g_autofree char *snapshot = NULL; g_autofree char *rawio = NULL; @@ -16392,9 +16392,9 @@ virDomainDeviceDefParse(const char *xmlStr, void *parseOpaque, unsigned int flags) { - VIR_AUTOPTR(xmlDoc) xml = NULL; + g_autoptr(xmlDoc) xml = NULL; xmlNodePtr node; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; g_autofree virDomainDeviceDefPtr dev = NULL; char *netprefix; @@ -16570,8 +16570,8 @@ virDomainDiskDefParse(const char *xmlStr, virDomainXMLOptionPtr xmlopt, unsigned int flags) { - VIR_AUTOPTR(xmlDoc) xml = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) xml = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; virSecurityLabelDefPtr *seclabels = NULL; size_t nseclabels = 0; @@ -18321,7 +18321,7 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node, virDomainIOThreadIDDefPtr iothrid; unsigned int iothreadid; g_autofree char *tmp = NULL; - VIR_AUTOPTR(virBitmap) cpumask = NULL; + g_autoptr(virBitmap) cpumask = NULL; if (!(tmp = virXMLPropString(node, "iothread"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -18386,7 +18386,7 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node) { virBitmapPtr ret = NULL; g_autofree char *tmp = NULL; - VIR_AUTOPTR(virBitmap) def = NULL; + g_autoptr(virBitmap) def = NULL; if (!(tmp = virXMLPropString(node, "cpuset"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -18790,7 +18790,7 @@ virDomainThreadSchedParseHelper(xmlNodePtr node, virDomainThreadSchedParamPtr sched = NULL; virProcessSchedPolicy policy = 0; int priority = 0; - VIR_AUTOPTR(virBitmap) map = NULL; + g_autoptr(virBitmap) map = NULL; if (!(map = virDomainSchedulerParse(node, name, &policy, &priority))) return -1; @@ -19524,7 +19524,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def, ssize_t i = 0; int n; int ret = -1; - VIR_AUTOPTR(virBitmap) vcpus = NULL; + g_autoptr(virBitmap) vcpus = NULL; g_autofree xmlNodePtr *nodes = NULL; VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; @@ -19722,7 +19722,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, { VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainResctrlDefPtr resctrl = NULL; - VIR_AUTOPTR(virBitmap) vcpus = NULL; + g_autoptr(virBitmap) vcpus = NULL; g_autofree xmlNodePtr *nodes = NULL; VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; ssize_t i = 0; @@ -21662,8 +21662,8 @@ virDomainDefParseNode(xmlDocPtr xml, void *parseOpaque, unsigned int flags) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; - VIR_AUTOPTR(virDomainDef) def = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; + g_autoptr(virDomainDef) def = NULL; if (!(ctxt = virXMLXPathContextNew(xml))) return NULL; @@ -21692,7 +21692,7 @@ virDomainObjParseNode(xmlDocPtr xml, virDomainXMLOptionPtr xmlopt, unsigned int flags) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!virXMLNodeNameEqual(root, "domstatus")) { virReportError(VIR_ERR_XML_ERROR, @@ -30634,7 +30634,7 @@ virNetworkPortDefPtr virDomainNetDefToNetworkPort(virDomainDefPtr dom, virDomainNetDefPtr iface) { - VIR_AUTOPTR(virNetworkPortDef) port = NULL; + g_autoptr(virNetworkPortDef) port = NULL; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -30793,7 +30793,7 @@ virDomainNetDefActualToNetworkPort(virDomainDefPtr dom, virDomainNetDefPtr iface) { virDomainActualNetDefPtr actual; - VIR_AUTOPTR(virNetworkPortDef) port = NULL; + g_autoptr(virNetworkPortDef) port = NULL; if (!iface->data.network.actual) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -30937,7 +30937,7 @@ virDomainNetCreatePort(virConnectPtr conn, { virErrorPtr save_err; VIR_AUTOUNREF(virNetworkPtr) net = NULL; - VIR_AUTOPTR(virNetworkPortDef) portdef = NULL; + g_autoptr(virNetworkPortDef) portdef = NULL; VIR_AUTOUNREF(virNetworkPortPtr) port = NULL; g_autofree char *portxml = NULL; @@ -31342,7 +31342,7 @@ int virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def) { virStorageVolInfo info; - VIR_AUTOPTR(virStoragePoolDef) pooldef = NULL; + g_autoptr(virStoragePoolDef) pooldef = NULL; g_autofree char *poolxml = NULL; VIR_AUTOUNREF(virConnectPtr) conn = NULL; VIR_AUTOUNREF(virStoragePoolPtr) pool = NULL; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 2b65a235ea..69ac049eaa 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -819,7 +819,7 @@ virInterfaceDefPtr virInterfaceDefParseNode(xmlDocPtr xml, xmlNodePtr root) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!virXMLNodeNameEqual(root, "interface")) { virReportError(VIR_ERR_XML_ERROR, diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 75ec5ccc27..7f8e43b25c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2114,7 +2114,7 @@ virNetworkDefParseNode(xmlDocPtr xml, xmlNodePtr root, virNetworkXMLOptionPtr xmlopt) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!virXMLNodeNameEqual(root, "network")) { virReportError(VIR_ERR_XML_ERROR, @@ -3635,8 +3635,8 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, const char *xml, unsigned int flags) /* virNetworkUpdateFlags */ { - VIR_AUTOPTR(xmlDoc) doc = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) doc = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!(doc = virXMLParseStringCtxt(xml, _("network_update_xml"), &ctxt))) return -1; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 3aba04c54c..d33f6736ab 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2052,7 +2052,7 @@ virNodeDeviceDefParseNode(xmlDocPtr xml, int create, const char *virt_type) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!virXMLNodeNameEqual(root, "device")) { virReportError(VIR_ERR_XML_ERROR, diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index aba12cd698..0f025637ee 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2746,7 +2746,7 @@ virNWFilterDefPtr virNWFilterDefParseNode(xmlDocPtr xml, xmlNodePtr root) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (STRNEQ((const char *)root->name, "filter")) { virReportError(VIR_ERR_XML_ERROR, diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index cb2aeea172..6ee9315933 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -131,8 +131,8 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, static virSecretDefPtr secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; - VIR_AUTOPTR(virSecretDef) def = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; + g_autoptr(virSecretDef) def = NULL; g_autofree char *prop = NULL; g_autofree char *uuidstr = NULL; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 184dec5e77..9628a8df62 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -429,7 +429,7 @@ virDomainSnapshotDefParseNode(xmlDocPtr xml, bool *current, unsigned int flags) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!virXMLNodeNameEqual(root, "domainsnapshot")) { virReportError(VIR_ERR_XML_ERROR, "%s", _("domainsnapshot")); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index b0bb9d2b8e..4c7e7b3f4d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -534,7 +534,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, size_t i; virStoragePoolOptionsPtr options; int n; - VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; + g_autoptr(virStorageAuthDef) authdef = NULL; g_autofree char *port = NULL; g_autofree char *ver = NULL; g_autofree xmlNodePtr *nodeset = NULL; @@ -695,10 +695,10 @@ virStoragePoolSourcePtr virStoragePoolDefParseSourceString(const char *srcSpec, int pool_type) { - VIR_AUTOPTR(xmlDoc) doc = NULL; + g_autoptr(xmlDoc) doc = NULL; xmlNodePtr node = NULL; - VIR_AUTOPTR(xmlXPathContext) xpath_ctxt = NULL; - VIR_AUTOPTR(virStoragePoolSource) def = NULL; + g_autoptr(xmlXPathContext) xpath_ctxt = NULL; + g_autoptr(virStoragePoolSource) def = NULL; if (!(doc = virXMLParseStringCtxt(srcSpec, _("(storage_source_specification)"), @@ -849,7 +849,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) virStoragePoolOptionsPtr options; virStoragePoolDefPtr ret = NULL; xmlNodePtr source_node; - VIR_AUTOPTR(virStoragePoolDef) def = NULL; + g_autoptr(virStoragePoolDef) def = NULL; g_autofree char *type = NULL; g_autofree char *uuid = NULL; g_autofree char *target_path = NULL; @@ -1007,7 +1007,7 @@ virStoragePoolDefPtr virStoragePoolDefParseNode(xmlDocPtr xml, xmlNodePtr root) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!virXMLNodeNameEqual(root, "pool")) { virReportError(VIR_ERR_XML_ERROR, @@ -1278,7 +1278,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, xmlNodePtr node; size_t i; int n; - VIR_AUTOPTR(virStorageVolDef) def = NULL; + g_autoptr(virStorageVolDef) def = NULL; g_autofree char *type = NULL; g_autofree char *allocation = NULL; g_autofree char *capacity = NULL; @@ -1444,7 +1444,7 @@ virStorageVolDefParseNode(virStoragePoolDefPtr pool, xmlNodePtr root, unsigned int flags) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; if (!virXMLNodeNameEqual(root, "volume")) { virReportError(VIR_ERR_XML_ERROR, diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 94e598ddea..560839ea7d 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1887,7 +1887,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, int ret = -1; int rc; char uuidstr[VIR_UUID_STRING_BUFLEN]; - VIR_AUTOPTR(virNetworkPortDef) portdef = NULL; + g_autoptr(virNetworkPortDef) portdef = NULL; if (!(dir = virNetworkObjGetPortStatusDir(net, stateDir))) goto cleanup; diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 43140198f8..32834e41d4 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -75,7 +75,7 @@ virNetworkPortDefFree(virNetworkPortDefPtr def) static virNetworkPortDefPtr virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) { - VIR_AUTOPTR(virNetworkPortDef) def = NULL; + g_autoptr(virNetworkPortDef) def = NULL; g_autofree char *uuid = NULL; xmlNodePtr virtPortNode; xmlNodePtr vlanNode; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 664dc12776..b9717b2fa2 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1624,7 +1624,7 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools, const char *autostartLink) { virStoragePoolObjPtr obj; - VIR_AUTOPTR(virStoragePoolDef) def = NULL; + g_autoptr(virStoragePoolDef) def = NULL; if (!(def = virStoragePoolDefParseFile(path))) return NULL; @@ -1671,7 +1671,7 @@ virStoragePoolObjLoadState(virStoragePoolObjListPtr pools, xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr node = NULL; - VIR_AUTOPTR(virStoragePoolDef) def = NULL; + g_autoptr(virStoragePoolDef) def = NULL; if (!(stateFile = virFileBuildPath(stateDir, name, ".xml"))) return NULL; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index c56f887c25..a69e097a52 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -851,7 +851,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, char *taskInfoErrorMessage = NULL; char *uuid_string = NULL; char *key = NULL; - VIR_AUTOPTR(virStorageVolDef) def = NULL; + g_autoptr(virStorageVolDef) def = NULL; virCheckFlags(0, NULL); @@ -1067,7 +1067,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, char *taskInfoErrorMessage = NULL; char *uuid_string = NULL; char *key = NULL; - VIR_AUTOPTR(virStorageVolDef) def = NULL; + g_autoptr(virStorageVolDef) def = NULL; virCheckFlags(0, NULL); diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index adb783395a..93c73615e3 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -222,7 +222,7 @@ virAdmConnectOpen(const char *name, unsigned int flags) char *sock_path = NULL; char *alias = NULL; virAdmConnectPtr conn = NULL; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; char *uristr = NULL; if (virAdmInitialize() < 0) diff --git a/src/libvirt.c b/src/libvirt.c index a5113b9206..812cb9efde 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -856,7 +856,7 @@ virConnectOpenInternal(const char *name, size_t i; int res; virConnectPtr ret; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; char *uristr = NULL; ret = virGetConnect(); diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 74246e7b3a..bbf0f8d8c1 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1868,7 +1868,7 @@ libxlDriverConfigGet(libxlDriverPrivatePtr driver) int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, const char *filename) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; /* defaults for keepalive messages */ cfg->keepAliveInterval = 5; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 59398a0a4d..631cfc9a49 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2681,7 +2681,7 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, libxlDriverPrivatePtr driver = conn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainDefPtr def = NULL; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; char *xml = NULL; virCheckFlags(0, NULL); @@ -2731,7 +2731,7 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, const char * nativeFormat, libxlDriverPrivatePtr driver = conn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainDefPtr def = NULL; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; int len = MAX_CONFIG_SIZE; char *ret = NULL; diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 65c7a6c2d8..8ae0dbbbd5 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -2205,7 +2205,7 @@ xenFormatXLDomainChannels(virConfPtr conf, virDomainDefPtr def) virConfPtr xenFormatXL(virDomainDefPtr def, virConnectPtr conn) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; if (!(conf = virConfNew())) return NULL; diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 086e438cbc..65882b7c0b 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -599,7 +599,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; if (!(conf = virConfNew())) return NULL; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index baffaa6de9..0894ee8e93 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1283,7 +1283,7 @@ int main(int argc, char **argv) { * (but still need to add @lockProgram into @srv). rv == 0 means that no * saved state is present, therefore initialize from scratch here. */ if (rv == 0) { - VIR_AUTOPTR(virSystemdActivation) act = NULL; + g_autoptr(virSystemdActivation) act = NULL; virSystemdActivationMap actmap[] = { { .name = "virtlockd.socket", .family = AF_UNIX, .path = sock_file }, { .name = "virtlockd-admin.socket", .family = AF_UNIX, .path = admin_sock_file }, diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index f77d6c9017..a506423e5e 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -114,7 +114,7 @@ virLockDaemonConfigLoadFile(virLockDaemonConfigPtr data, const char *filename, bool allow_missing) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; if (allow_missing && access(filename, R_OK) == -1 && diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index b29a1da48f..47b49add66 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -81,7 +81,7 @@ static virLockManagerLockDaemonDriverPtr driver; static int virLockManagerLockDaemonLoadConfig(const char *configFile) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; if (access(configFile, R_OK) == -1) { if (errno != ENOENT) { diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 5a5d130f3a..9cedf39578 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -119,7 +119,7 @@ static int virLockManagerSanlockLoadConfig(virLockManagerSanlockDriverPtr driver, const char *configFile) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; int ret = -1; char *user = NULL; char *group = NULL; diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index c667e31185..851695b109 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -1056,7 +1056,7 @@ int main(int argc, char **argv) { * scratch if rv == 0 */ if (rv == 0) { - VIR_AUTOPTR(virSystemdActivation) act = NULL; + g_autoptr(virSystemdActivation) act = NULL; virSystemdActivationMap actmap[] = { { .name = "virtlogd.socket", .family = AF_UNIX, .path = sock_file }, { .name = "virtlogd-admin.socket", .family = AF_UNIX, .path = admin_sock_file }, diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c index 9895babc2f..c339da1808 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -120,7 +120,7 @@ virLogDaemonConfigLoadFile(virLogDaemonConfigPtr data, const char *filename, bool allow_missing) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; if (allow_missing && access(filename, R_OK) == -1 && diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 9d1653f437..4d8314045e 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -252,7 +252,7 @@ int virLXCLoadDriverConfig(virLXCDriverConfigPtr cfg, const char *filename) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; /* Avoid error from non-existent or unreadable file. */ if (access(filename, R_OK) == -1) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 7a3d1cc00e..8ae3c7b006 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1079,7 +1079,7 @@ lxcParseConfigString(const char *config, virDomainXMLOptionPtr xmlopt) { virDomainDefPtr vmdef = NULL; - VIR_AUTOPTR(virConf) properties = NULL; + g_autoptr(virConf) properties = NULL; g_autofree char *value = NULL; if (!(properties = virConfReadString(config, VIR_CONF_FLAG_LXC_FORMAT))) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b3b4e8ab2c..901896d775 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -5566,7 +5566,7 @@ networkPortCreateXML(virNetworkPtr net, virNetworkDriverStatePtr driver = networkGetDriver(); virNetworkObjPtr obj; virNetworkDefPtr def; - VIR_AUTOPTR(virNetworkPortDef) portdef = NULL; + g_autoptr(virNetworkPortDef) portdef = NULL; virNetworkPortPtr ret = NULL; int rc; diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 2b4dd7c9bb..de9f197dae 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1965,8 +1965,8 @@ phypStorageVolCreateXML(virStoragePoolPtr pool, virStorageVolPtr vol = NULL; virStorageVolPtr dup_vol = NULL; char *key = NULL; - VIR_AUTOPTR(virStorageVolDef) voldef = NULL; - VIR_AUTOPTR(virStoragePoolDef) spdef = NULL; + g_autoptr(virStorageVolDef) voldef = NULL; + g_autoptr(virStoragePoolDef) spdef = NULL; if (VIR_ALLOC(spdef) < 0) return NULL; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9e4b4d802e..ccd076d540 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2043,8 +2043,8 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, { size_t i; int ret = -1; - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; virJSONValuePtr data; size_t ndata = 0; qemuAgentFSInfoPtr *info_ret = NULL; @@ -2550,8 +2550,8 @@ qemuAgentGetUsers(qemuAgentPtr mon, int *nparams, int *maxparams) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; virJSONValuePtr data = NULL; size_t ndata; size_t i; @@ -2642,8 +2642,8 @@ qemuAgentGetOSInfo(qemuAgentPtr mon, int *nparams, int *maxparams) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; virJSONValuePtr data = NULL; if (!(cmd = qemuAgentMakeCommand("guest-get-osinfo", NULL))) @@ -2696,8 +2696,8 @@ qemuAgentGetTimezone(qemuAgentPtr mon, int *nparams, int *maxparams) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; virJSONValuePtr data = NULL; const char *name; int offset; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 9a13351d2f..46584f2f1b 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -130,7 +130,7 @@ qemuBlockNodeNameGetBackingChainBacking(virJSONValuePtr next, virHashTablePtr nodenamestable, qemuBlockNodeNameBackingChainDataPtr *nodenamedata) { - VIR_AUTOPTR(qemuBlockNodeNameBackingChainData) data = NULL; + g_autoptr(qemuBlockNodeNameBackingChainData) data = NULL; qemuBlockNodeNameBackingChainDataPtr backingdata = NULL; virJSONValuePtr backing = virJSONValueObjectGetObject(next, "backing"); virJSONValuePtr parent = virJSONValueObjectGetObject(next, "parent"); @@ -198,7 +198,7 @@ qemuBlockNodeNameGetBackingChainDisk(size_t pos G_GNUC_UNUSED, { struct qemuBlockNodeNameGetBackingChainData *data = opaque; const char *device = virJSONValueObjectGetString(item, "device"); - VIR_AUTOPTR(qemuBlockNodeNameBackingChainData) devicedata = NULL; + g_autoptr(qemuBlockNodeNameBackingChainData) devicedata = NULL; if (qemuBlockNodeNameGetBackingChainBacking(item, data->nodenamestable, &devicedata) < 0) @@ -231,8 +231,8 @@ qemuBlockNodeNameGetBackingChain(virJSONValuePtr namednodes, virJSONValuePtr blockstats) { struct qemuBlockNodeNameGetBackingChainData data; - VIR_AUTOPTR(virHashTable) namednodestable = NULL; - VIR_AUTOPTR(virHashTable) disks = NULL; + g_autoptr(virHashTable) namednodestable = NULL; + g_autoptr(virHashTable) disks = NULL; memset(&data, 0, sizeof(data)); @@ -327,9 +327,9 @@ qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOPTR(virHashTable) disktable = NULL; - VIR_AUTOPTR(virJSONValue) data = NULL; - VIR_AUTOPTR(virJSONValue) blockstats = NULL; + g_autoptr(virHashTable) disktable = NULL; + g_autoptr(virJSONValue) data = NULL; + g_autoptr(virJSONValue) blockstats = NULL; virDomainDiskDefPtr disk; size_t i; @@ -371,7 +371,7 @@ qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, virHashTablePtr qemuBlockGetNodeData(virJSONValuePtr data) { - VIR_AUTOPTR(virHashTable) nodedata = NULL; + g_autoptr(virHashTable) nodedata = NULL; if (!(nodedata = virHashCreate(50, virJSONValueHashFree))) return NULL; @@ -408,7 +408,7 @@ qemuBlockStorageSourceSupportsConcurrentAccess(virStorageSourcePtr src) virURIPtr qemuBlockStorageSourceGetURI(virStorageSourcePtr src) { - VIR_AUTOPTR(virURI) uri = NULL; + g_autoptr(virURI) uri = NULL; if (src->nhosts != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -470,7 +470,7 @@ static virJSONValuePtr qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, bool legacy) { - VIR_AUTOPTR(virJSONValue) server = NULL; + g_autoptr(virJSONValue) server = NULL; const char *transport; const char *field; g_autofree char *port = NULL; @@ -530,8 +530,8 @@ static virJSONValuePtr qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSourcePtr src, bool legacy) { - VIR_AUTOPTR(virJSONValue) servers = NULL; - VIR_AUTOPTR(virJSONValue) server = NULL; + g_autoptr(virJSONValue) servers = NULL; + g_autoptr(virJSONValue) server = NULL; virStorageNetHostDefPtr host; size_t i; @@ -597,8 +597,8 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) static virJSONValuePtr qemuBlockStorageSourceBuildHostsJSONInetSocketAddress(virStorageSourcePtr src) { - VIR_AUTOPTR(virJSONValue) servers = NULL; - VIR_AUTOPTR(virJSONValue) server = NULL; + g_autoptr(virJSONValue) servers = NULL; + g_autoptr(virJSONValue) server = NULL; virStorageNetHostDefPtr host; size_t i; @@ -626,8 +626,8 @@ qemuBlockStorageSourceGetGlusterProps(virStorageSourcePtr src, bool legacy, bool onlytarget) { - VIR_AUTOPTR(virJSONValue) servers = NULL; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) servers = NULL; + g_autoptr(virJSONValue) props = NULL; if (!(servers = qemuBlockStorageSourceBuildHostsJSONSocketAddress(src, legacy))) return NULL; @@ -657,7 +657,7 @@ static virJSONValuePtr qemuBlockStorageSourceGetVxHSProps(virStorageSourcePtr src, bool onlytarget) { - VIR_AUTOPTR(virJSONValue) server = NULL; + g_autoptr(virJSONValue) server = NULL; const char *tlsAlias = src->tlsAlias; virJSONValuePtr ret = NULL; @@ -696,7 +696,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src, const char *passwordalias = NULL; const char *username = NULL; virJSONValuePtr ret = NULL; - VIR_AUTOPTR(virURI) uri = NULL; + g_autoptr(virURI) uri = NULL; g_autofree char *uristr = NULL; /** @@ -804,7 +804,7 @@ static virJSONValuePtr qemuBlockStorageSourceGetNBDProps(virStorageSourcePtr src, bool onlytarget) { - VIR_AUTOPTR(virJSONValue) serverprops = NULL; + g_autoptr(virJSONValue) serverprops = NULL; const char *tlsAlias = src->tlsAlias; virJSONValuePtr ret = NULL; @@ -838,11 +838,11 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src, bool onlytarget) { qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - VIR_AUTOPTR(virJSONValue) servers = NULL; + g_autoptr(virJSONValue) servers = NULL; virJSONValuePtr ret = NULL; const char *username = NULL; - VIR_AUTOPTR(virJSONValue) authmodes = NULL; - VIR_AUTOPTR(virJSONValue) mode = NULL; + g_autoptr(virJSONValue) authmodes = NULL; + g_autoptr(virJSONValue) mode = NULL; const char *keysecret = NULL; if (src->nhosts > 0 && @@ -888,7 +888,7 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src, static virJSONValuePtr qemuBlockStorageSourceGetSheepdogProps(virStorageSourcePtr src) { - VIR_AUTOPTR(virJSONValue) serverprops = NULL; + g_autoptr(virJSONValue) serverprops = NULL; virJSONValuePtr ret = NULL; if (src->nhosts != 1) { @@ -916,7 +916,7 @@ qemuBlockStorageSourceGetSheepdogProps(virStorageSourcePtr src) static virJSONValuePtr qemuBlockStorageSourceGetSshProps(virStorageSourcePtr src) { - VIR_AUTOPTR(virJSONValue) serverprops = NULL; + g_autoptr(virJSONValue) serverprops = NULL; virJSONValuePtr ret = NULL; const char *username = NULL; @@ -973,7 +973,7 @@ static virJSONValuePtr qemuBlockStorageSourceGetVvfatProps(virStorageSourcePtr src, bool onlytarget) { - VIR_AUTOPTR(virJSONValue) ret = NULL; + g_autoptr(virJSONValue) ret = NULL; /* libvirt currently does not handle the following attributes: * '*fat-type': 'int' @@ -997,7 +997,7 @@ static int qemuBlockStorageSourceGetBlockdevGetCacheProps(virStorageSourcePtr src, virJSONValuePtr props) { - VIR_AUTOPTR(virJSONValue) cacheobj = NULL; + g_autoptr(virJSONValue) cacheobj = NULL; bool direct = false; bool noflush = false; @@ -1038,7 +1038,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src, bool autoreadonly) { int actualType = virStorageSourceGetActualType(src); - VIR_AUTOPTR(virJSONValue) fileprops = NULL; + g_autoptr(virJSONValue) fileprops = NULL; const char *driver = NULL; virTristateBool aro = VIR_TRISTATE_BOOL_ABSENT; virTristateBool ro = VIR_TRISTATE_BOOL_ABSENT; @@ -1244,7 +1244,7 @@ qemuBlockStorageSourceGetFormatQcowGenericProps(virStorageSourcePtr src, const char *format, virJSONValuePtr props) { - VIR_AUTOPTR(virJSONValue) encprops = NULL; + g_autoptr(virJSONValue) encprops = NULL; if (qemuBlockStorageSourceGetCryptoProps(src, &encprops) < 0) return -1; @@ -1289,7 +1289,7 @@ qemuBlockStorageSourceGetBlockdevFormatCommonProps(virStorageSourcePtr src) const char *discard = NULL; int detectZeroesMode = virDomainDiskGetDetectZeroesMode(src->discard, src->detect_zeroes); - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (qemuBlockNodeNameValidate(src->nodeformat) < 0) return NULL; @@ -1323,7 +1323,7 @@ static virJSONValuePtr qemuBlockStorageSourceGetBlockdevFormatProps(virStorageSourcePtr src) { const char *driver = NULL; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (!(props = qemuBlockStorageSourceGetBlockdevFormatCommonProps(src))) return NULL; @@ -1405,7 +1405,7 @@ virJSONValuePtr qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src, virStorageSourcePtr backingStore) { - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (!(props = qemuBlockStorageSourceGetBlockdevFormatProps(src))) return NULL; @@ -1481,7 +1481,7 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src, virStorageSourcePtr backingStore, bool autoreadonly) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; if (VIR_ALLOC(data) < 0) return NULL; @@ -1668,7 +1668,7 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src, char *driveAlias) { qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; qemuBlockStorageSourceAttachDataPtr ret = NULL; if (VIR_ALLOC(data) < 0) @@ -1738,8 +1738,8 @@ qemuBlockStorageSourceChainDataFree(qemuBlockStorageSourceChainDataPtr data) qemuBlockStorageSourceChainDataPtr qemuBlockStorageSourceChainDetachPrepareBlockdev(virStorageSourcePtr src) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) backend = NULL; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) backend = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; virStorageSourcePtr n; if (VIR_ALLOC(data) < 0) @@ -1769,8 +1769,8 @@ qemuBlockStorageSourceChainDataPtr qemuBlockStorageSourceChainDetachPrepareDrive(virStorageSourcePtr src, char *driveAlias) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) backend = NULL; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) backend = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; if (VIR_ALLOC(data) < 0) return NULL; @@ -1928,8 +1928,8 @@ char * qemuBlockGetBackingStoreString(virStorageSourcePtr src) { int actualType = virStorageSourceGetActualType(src); - VIR_AUTOPTR(virJSONValue) backingProps = NULL; - VIR_AUTOPTR(virURI) uri = NULL; + g_autoptr(virJSONValue) backingProps = NULL; + g_autoptr(virURI) uri = NULL; g_autofree char *backingJSON = NULL; char *ret = NULL; @@ -2022,7 +2022,7 @@ qemuBlockStorageSourceCreateGetFormatPropsGeneric(virStorageSourcePtr src, virJSONValuePtr *retprops, virStorageSourcePtr backing) { - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (virJSONValueObjectCreate(&props, "s:driver", driver, @@ -2045,7 +2045,7 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStorageSourcePtr src, virJSONValuePtr *luksProps) { qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; g_autofree char *cipheralg = NULL; const char *keysecret = NULL; @@ -2085,7 +2085,7 @@ static int qemuBlockStorageSourceCreateGetFormatPropsLUKS(virStorageSourcePtr src, virJSONValuePtr *props) { - VIR_AUTOPTR(virJSONValue) luksprops = NULL; + g_autoptr(virJSONValue) luksprops = NULL; if (qemuBlockStorageSourceCreateGetEncryptionLUKS(src, &luksprops) < 0) return -1; @@ -2106,7 +2106,7 @@ static int qemuBlockStorageSourceCreateAddEncryptionQcow(virStorageSourcePtr src, virJSONValuePtr props) { - VIR_AUTOPTR(virJSONValue) encryptProps = NULL; + g_autoptr(virJSONValue) encryptProps = NULL; if (!src->encryption) return 0; @@ -2135,7 +2135,7 @@ qemuBlockStorageSourceCreateGetFormatPropsQcow2(virStorageSourcePtr src, virStorageSourcePtr backing, virJSONValuePtr *props) { - VIR_AUTOPTR(virJSONValue) qcow2props = NULL; + g_autoptr(virJSONValue) qcow2props = NULL; const char *qcow2version = NULL; if (STREQ_NULLABLE(src->compat, "0.10")) @@ -2165,7 +2165,7 @@ qemuBlockStorageSourceCreateGetFormatPropsQcow(virStorageSourcePtr src, virStorageSourcePtr backing, virJSONValuePtr *props) { - VIR_AUTOPTR(virJSONValue) qcowprops = NULL; + g_autoptr(virJSONValue) qcowprops = NULL; if (virJSONValueObjectCreate(&qcowprops, "s:driver", "qcow", @@ -2188,7 +2188,7 @@ qemuBlockStorageSourceCreateGetFormatPropsQed(virStorageSourcePtr src, virStorageSourcePtr backing, virJSONValuePtr *props) { - VIR_AUTOPTR(virJSONValue) qedprops = NULL; + g_autoptr(virJSONValue) qedprops = NULL; if (virJSONValueObjectCreate(&qedprops, "s:driver", "qed", @@ -2300,7 +2300,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorageSourcePtr src, virJSONValuePtr *props) { int actualType = virStorageSourceGetActualType(src); - VIR_AUTOPTR(virJSONValue) location = NULL; + g_autoptr(virJSONValue) location = NULL; const char *driver = NULL; const char *filename = NULL; @@ -2382,7 +2382,7 @@ qemuBlockStorageSourceCreateGeneric(virDomainObjPtr vm, bool storageCreate, qemuDomainAsyncJob asyncJob) { - VIR_AUTOPTR(virJSONValue) props = createProps; + g_autoptr(virJSONValue) props = createProps; qemuDomainObjPrivatePtr priv = vm->privateData; qemuBlockJobDataPtr job = NULL; int ret = -1; @@ -2438,7 +2438,7 @@ qemuBlockStorageSourceCreateStorage(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { int actualType = virStorageSourceGetActualType(src); - VIR_AUTOPTR(virJSONValue) createstorageprops = NULL; + g_autoptr(virJSONValue) createstorageprops = NULL; int ret; /* We create local files directly to be able to apply security labels @@ -2474,7 +2474,7 @@ qemuBlockStorageSourceCreateFormat(virDomainObjPtr vm, virStorageSourcePtr chain, qemuDomainAsyncJob asyncJob) { - VIR_AUTOPTR(virJSONValue) createformatprops = NULL; + g_autoptr(virJSONValue) createformatprops = NULL; int ret; if (src->format == VIR_STORAGE_FILE_RAW) @@ -2595,7 +2595,7 @@ qemuBlockStorageSourceCreateDetectSize(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOPTR(virHashTable) stats = NULL; + g_autoptr(virHashTable) stats = NULL; qemuBlockStatsPtr entry; int rc; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 3d52cfe0ef..239bf772d5 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -797,7 +797,7 @@ qemuBlockJobEventProcessConcludedRemoveChain(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob, virStorageSourcePtr chain) { - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; if (!(data = qemuBlockStorageSourceChainDetachPrepareBlockdev(chain))) return; @@ -1212,7 +1212,7 @@ qemuBlockJobProcessEventConcludedCreate(virQEMUDriverPtr driver, qemuBlockJobDataPtr job, qemuDomainAsyncJob asyncJob) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) backend = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) backend = NULL; /* if there is a synchronous client waiting for this job that means that * it will handle further hotplug of the created volume and also that diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 00ac2aed0e..b8f5153cbc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1580,7 +1580,7 @@ static int virQEMUCapsSEVInfoCopy(virSEVCapabilityPtr *dst, virSEVCapabilityPtr src) { - VIR_AUTOPTR(virSEVCapability) tmp = NULL; + g_autoptr(virSEVCapability) tmp = NULL; if (VIR_ALLOC(tmp) < 0 || VIR_STRDUP(tmp->pdh, src->pdh) < 0 || @@ -3576,7 +3576,7 @@ virQEMUCapsCachePrivFree(void *privData) static int virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt) { - VIR_AUTOPTR(virSEVCapability) sev = NULL; + g_autoptr(virSEVCapability) sev = NULL; if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) return 0; @@ -5583,7 +5583,7 @@ virQEMUCapsFillDomainFeatureSEVCaps(virQEMUCapsPtr qemuCaps, virDomainCapsPtr domCaps) { virSEVCapability *cap = qemuCaps->sevCapabilities; - VIR_AUTOPTR(virSEVCapability) sev = NULL; + g_autoptr(virSEVCapability) sev = NULL; if (!cap) return 0; diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 5f2372779a..7f675d4b79 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -159,7 +159,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, parentdef = virDomainCheckpointObjGetDef(moment); for (j = 0; j < parentdef->ndisks; j++) { virDomainCheckpointDiskDef *disk2; - VIR_AUTOPTR(virJSONValue) arr = NULL; + g_autoptr(virJSONValue) arr = NULL; disk2 = &parentdef->disks[j]; if (STRNEQ(disk->name, disk2->name) || @@ -356,7 +356,7 @@ qemuCheckpointCreateXML(virDomainPtr domain, virDomainMomentObjPtr other = NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = NULL; VIR_AUTOUNREF(virCapsPtr) caps = NULL; - VIR_AUTOPTR(virJSONValue) actions = NULL; + g_autoptr(virJSONValue) actions = NULL; int ret; VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 130476b9e5..6829bede99 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -731,7 +731,7 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, qemuDomainSecretInfoPtr secinfo) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; @@ -922,7 +922,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, certEncSecretAlias, qemuCaps, &props) < 0) @@ -942,7 +942,7 @@ static char * qemuBuildNetworkDriveURI(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { - VIR_AUTOPTR(virURI) uri = NULL; + g_autoptr(virURI) uri = NULL; if (!(uri = qemuBlockStorageSourceGetURI(src))) return NULL; @@ -1557,7 +1557,7 @@ qemuDiskSourceNeedsProps(virStorageSourcePtr src, static virJSONValuePtr qemuDiskSourceGetProps(virStorageSourcePtr src) { - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; virJSONValuePtr ret; if (!(props = qemuBlockStorageSourceGetBackendProps(src, true, false, false))) @@ -1600,7 +1600,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src); qemuDomainSecretInfoPtr secinfo = NULL; qemuDomainSecretInfoPtr encinfo = NULL; - VIR_AUTOPTR(virJSONValue) srcprops = NULL; + g_autoptr(virJSONValue) srcprops = NULL; g_autofree char *source = NULL; bool rawluks = false; @@ -2477,8 +2477,8 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; - VIR_AUTOPTR(virJSONValue) copyOnReadProps = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(virJSONValue) copyOnReadProps = NULL; g_autofree char *copyOnReadPropsStr = NULL; size_t i; @@ -3330,7 +3330,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, bool prealloc = false; virBitmapPtr nodemask = NULL; int rc; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, mem->targetNode); unsigned long long pagesize = mem->pagesize; bool needHugepage = !!pagesize; @@ -3584,7 +3584,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, qemuDomainObjPrivatePtr priv, virBufferPtr buf) { - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; g_autofree char *alias = NULL; int rc; virDomainMemoryDef mem = { 0 }; @@ -3616,7 +3616,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, virQEMUDriverConfigPtr cfg, qemuDomainObjPrivatePtr priv) { - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; g_autofree char *alias = NULL; if (!mem->info.alias) { @@ -4933,7 +4933,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_autofree char *netsource = NULL; - VIR_AUTOPTR(virJSONValue) srcprops = NULL; + g_autoptr(virJSONValue) srcprops = NULL; virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; qemuDomainStorageSourcePrivatePtr srcPriv = @@ -5887,7 +5887,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, size_t i; for (i = 0; i < def->nrngs; i++) { - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainRNGDefPtr rng = def->rngs[i]; g_autofree char *chardev = NULL; @@ -9000,7 +9000,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, virQEMUCapsPtr qemuCaps, bool chardevStdioLogd) { - VIR_AUTOPTR(virJSONValue) memProps = NULL; + g_autoptr(virJSONValue) memProps = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_autofree char *devstr = NULL; g_autofree char *chardev = NULL; @@ -9991,7 +9991,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, qemuDomainObjPrivatePtr priv) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (!virDomainDefHasManagedPR(def)) return 0; @@ -10050,7 +10050,7 @@ qemuBuildDBusVMStateCommandLineEach(void *payload, qemuBuildDBusVMStateCommandLineData *data = user_data; qemuDBusVMStatePtr vms = payload; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; if (!(props = qemuBuildDBusVMStateInfoProps(id, vms->addr))) return -1; @@ -10276,7 +10276,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, { size_t i; char uuid[VIR_UUID_STRING_BUFLEN]; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); unsigned int bootHostdevNet = 0; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -10715,7 +10715,7 @@ virJSONValuePtr qemuBuildHotpluggableCPUProps(const virDomainVcpuDef *vcpu) { qemuDomainVcpuPrivatePtr vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpu); - VIR_AUTOPTR(virJSONValue) ret = NULL; + g_autoptr(virJSONValue) ret = NULL; if (!(ret = virJSONValueCopy(vcpupriv->props))) return NULL; @@ -10741,7 +10741,7 @@ qemuBlockStorageSourceAttachDataPtr qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; qemuBlockStorageSourceAttachDataPtr ret = NULL; if (VIR_ALLOC(data) < 0) @@ -10809,8 +10809,8 @@ qemuBlockStorageSourceChainDataPtr qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) elem = NULL; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) elem = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; if (VIR_ALLOC(data) < 0) return NULL; @@ -10834,7 +10834,7 @@ qemuBuildStorageSourceChainAttachPrepareBlockdevOne(qemuBlockStorageSourceChainD virStorageSourcePtr backingStore, virQEMUCapsPtr qemuCaps) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) elem = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) elem = NULL; if (!(elem = qemuBlockStorageSourceAttachPrepareBlockdev(src, backingStore, true))) return -1; @@ -10861,7 +10861,7 @@ qemuBlockStorageSourceChainDataPtr qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSourcePtr top, virQEMUCapsPtr qemuCaps) { - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; virStorageSourcePtr n; if (VIR_ALLOC(data) < 0) @@ -10892,7 +10892,7 @@ qemuBuildStorageSourceChainAttachPrepareBlockdevTop(virStorageSourcePtr top, virStorageSourcePtr backingStore, virQEMUCapsPtr qemuCaps) { - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; if (VIR_ALLOC(data) < 0) return NULL; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index de03069036..630e31723a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1000,7 +1000,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, const char *filename, bool privileged) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; /* Just check the file is readable before opening it, otherwise * libvirt emits an error. diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c index 15c9bf519e..d0f25dd0d4 100644 --- a/src/qemu/qemu_dbus.c +++ b/src/qemu/qemu_dbus.c @@ -37,7 +37,7 @@ VIR_LOG_INIT("qemu.dbus"); qemuDBusVMStatePtr qemuDBusVMStateNew(const char *id, const char *addr) { - VIR_AUTOPTR(qemuDBusVMState) self = NULL; + g_autoptr(qemuDBusVMState) self = NULL; if (VIR_ALLOC(self) < 0) return NULL; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5b3e1d8fcb..e25f5a7ee8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3648,7 +3648,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, for (i = 0; i < n; i++) { g_autofree char *alias = virXMLPropString(nodes[i], "alias"); g_autofree char *pid = virXMLPropString(nodes[i], "pid"); - VIR_AUTOPTR(qemuSlirp) slirp = qemuSlirpNew(); + g_autoptr(qemuSlirp) slirp = qemuSlirpNew(); virDomainDeviceDef dev; if (!alias || !pid || !slirp || diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 69919ac203..beb72f21d1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14487,7 +14487,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; bool postcopy = !!(flags & VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY); - VIR_AUTOPTR(qemuMigrationParams) migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; unsigned long long max; int ret = -1; @@ -14565,7 +14565,7 @@ qemuDomainMigrationGetPostcopyBandwidth(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned long *bandwidth) { - VIR_AUTOPTR(qemuMigrationParams) migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; unsigned long long bw; int rc; int ret = -1; @@ -15687,7 +15687,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOPTR(virJSONValue) actions = NULL; + g_autoptr(virJSONValue) actions = NULL; int rc; int ret = -1; size_t i; @@ -18223,8 +18223,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, VIR_AUTOUNREF(virStorageSourcePtr) mirror = mirrorsrc; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool mirror_initialized = false; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) crdata = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceChainData) crdata = NULL; virStorageSourcePtr n; virStorageSourcePtr mirrorBacking = NULL; int rc = 0; @@ -21586,7 +21586,7 @@ qemuDomainGetStats(virConnectPtr conn, unsigned int flags) { g_autofree virDomainStatsRecordPtr tmp = NULL; - VIR_AUTOPTR(virTypedParamList) params = NULL; + g_autoptr(virTypedParamList) params = NULL; size_t i; if (VIR_ALLOC(params) < 0) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 10644a0e28..b8a17ed1ca 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -289,7 +289,7 @@ qemuFirmwareInterfaceParse(const char *path, qemuFirmwarePtr fw) { virJSONValuePtr interfacesJSON; - VIR_AUTOPTR(qemuFirmwareOSInterface) interfaces = NULL; + g_autoptr(qemuFirmwareOSInterface) interfaces = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t ninterfaces; size_t i; @@ -509,7 +509,7 @@ qemuFirmwareTargetParse(const char *path, for (i = 0; i < ntargets; i++) { virJSONValuePtr item = virJSONValueArrayGet(targetsJSON, i); virJSONValuePtr machines; - VIR_AUTOPTR(qemuFirmwareTarget) t = NULL; + g_autoptr(qemuFirmwareTarget) t = NULL; const char *architectureStr = NULL; size_t nmachines; size_t j; @@ -575,7 +575,7 @@ qemuFirmwareFeatureParse(const char *path, qemuFirmwarePtr fw) { virJSONValuePtr featuresJSON; - VIR_AUTOPTR(qemuFirmwareFeature) features = NULL; + g_autoptr(qemuFirmwareFeature) features = NULL; size_t nfeatures; size_t i; @@ -619,8 +619,8 @@ qemuFirmwarePtr qemuFirmwareParse(const char *path) { g_autofree char *cont = NULL; - VIR_AUTOPTR(virJSONValue) doc = NULL; - VIR_AUTOPTR(qemuFirmware) fw = NULL; + g_autoptr(virJSONValue) doc = NULL; + g_autoptr(qemuFirmware) fw = NULL; qemuFirmwarePtr ret = NULL; if (virFileReadAll(path, DOCUMENT_SIZE, &cont) < 0) @@ -657,7 +657,7 @@ static int qemuFirmwareInterfaceFormat(virJSONValuePtr doc, qemuFirmwarePtr fw) { - VIR_AUTOPTR(virJSONValue) interfacesJSON = NULL; + g_autoptr(virJSONValue) interfacesJSON = NULL; size_t i; if (!(interfacesJSON = virJSONValueNewArray())) @@ -682,7 +682,7 @@ qemuFirmwareInterfaceFormat(virJSONValuePtr doc, static virJSONValuePtr qemuFirmwareFlashFileFormat(qemuFirmwareFlashFile flash) { - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; virJSONValuePtr ret; if (!(json = virJSONValueNewObject())) @@ -707,8 +707,8 @@ static int qemuFirmwareMappingFlashFormat(virJSONValuePtr mapping, qemuFirmwareMappingFlashPtr flash) { - VIR_AUTOPTR(virJSONValue) executable = NULL; - VIR_AUTOPTR(virJSONValue) nvram_template = NULL; + g_autoptr(virJSONValue) executable = NULL; + g_autoptr(virJSONValue) nvram_template = NULL; if (!(executable = qemuFirmwareFlashFileFormat(flash->executable))) return -1; @@ -764,7 +764,7 @@ static int qemuFirmwareMappingFormat(virJSONValuePtr doc, qemuFirmwarePtr fw) { - VIR_AUTOPTR(virJSONValue) mapping = NULL; + g_autoptr(virJSONValue) mapping = NULL; if (!(mapping = virJSONValueNewObject())) return -1; @@ -805,7 +805,7 @@ static int qemuFirmwareTargetFormat(virJSONValuePtr doc, qemuFirmwarePtr fw) { - VIR_AUTOPTR(virJSONValue) targetsJSON = NULL; + g_autoptr(virJSONValue) targetsJSON = NULL; size_t i; if (!(targetsJSON = virJSONValueNewArray())) @@ -813,8 +813,8 @@ qemuFirmwareTargetFormat(virJSONValuePtr doc, for (i = 0; i < fw->ntargets; i++) { qemuFirmwareTargetPtr t = fw->targets[i]; - VIR_AUTOPTR(virJSONValue) target = NULL; - VIR_AUTOPTR(virJSONValue) machines = NULL; + g_autoptr(virJSONValue) target = NULL; + g_autoptr(virJSONValue) machines = NULL; size_t j; if (!(target = virJSONValueNewObject())) @@ -857,7 +857,7 @@ static int qemuFirmwareFeatureFormat(virJSONValuePtr doc, qemuFirmwarePtr fw) { - VIR_AUTOPTR(virJSONValue) featuresJSON = NULL; + g_autoptr(virJSONValue) featuresJSON = NULL; size_t i; if (!(featuresJSON = virJSONValueNewArray())) @@ -882,7 +882,7 @@ qemuFirmwareFeatureFormat(virJSONValuePtr doc, char * qemuFirmwareFormat(qemuFirmwarePtr fw) { - VIR_AUTOPTR(virJSONValue) doc = NULL; + g_autoptr(virJSONValue) doc = NULL; if (!fw) return NULL; @@ -1391,7 +1391,7 @@ qemuFirmwareGetSupported(const char *machine, } if (fws && fwpath) { - VIR_AUTOPTR(virFirmware) tmp = NULL; + g_autoptr(virFirmware) tmp = NULL; /* Append only unique pairs. */ for (j = 0; j < *nfws; j++) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f22b509ffa..7b3363c0c7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -422,7 +422,7 @@ qemuDomainAttachDBusVMState(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOPTR(virJSONValue) props = NULL; + g_autoptr(virJSONValue) props = NULL; int ret; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) { @@ -505,8 +505,8 @@ qemuDomainChangeMediaBlockdev(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - VIR_AUTOPTR(qemuBlockStorageSourceChainData) newbackend = NULL; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) oldbackend = NULL; + g_autoptr(qemuBlockStorageSourceChainData) newbackend = NULL; + g_autoptr(qemuBlockStorageSourceChainData) oldbackend = NULL; g_autofree char *nodename = NULL; int rc; @@ -672,12 +672,12 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk) { - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data = NULL; + g_autoptr(qemuBlockStorageSourceChainData) data = NULL; int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; g_autofree char *devstr = NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOPTR(virJSONValue) corProps = NULL; + g_autoptr(virJSONValue) corProps = NULL; g_autofree char *corAlias = NULL; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); @@ -4232,7 +4232,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, virDomainDiskDefPtr disk) { qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - VIR_AUTOPTR(qemuBlockStorageSourceChainData) diskBackend = NULL; + g_autoptr(qemuBlockStorageSourceChainData) diskBackend = NULL; virDomainDeviceDef dev; size_t i; qemuDomainObjPrivatePtr priv = vm->privateData; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 7f3ac8f085..11d21837ea 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -644,7 +644,7 @@ qemuInterfacePrepareSlirp(virQEMUDriverPtr driver, virDomainNetDefPtr net) { virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOPTR(qemuSlirp) slirp = NULL; + g_autoptr(qemuSlirp) slirp = NULL; size_t i; if (!(slirp = qemuSlirpNewForHelper(cfg->slirpHelperName))) diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 9281935d9a..7193d31dfd 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -99,7 +99,7 @@ qemuInteropFetchConfigs(const char *name, char ***configs, bool privileged) { - VIR_AUTOPTR(virHashTable) files = NULL; + g_autoptr(virHashTable) files = NULL; g_autofree char *homeConfig = NULL; g_autofree char *xdgConfig = NULL; g_autofree char *sysLocation = virFileBuildPath(QEMU_SYSTEM_LOCATION, name, NULL); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fbd6681051..1166236124 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -794,7 +794,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, unsigned int mirror_shallow, const char *tlsAlias) { - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data = NULL; + g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); int mon_ret = 0; VIR_AUTOUNREF(virStorageSourcePtr) copysrc = NULL; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e9967eadfe..5ca7c592dc 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2679,7 +2679,7 @@ qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon, int nstats = 0; int rc; size_t i; - VIR_AUTOPTR(virJSONValue) devices = NULL; + g_autoptr(virJSONValue) devices = NULL; if (!(devices = qemuMonitorJSONQueryBlockstats(mon))) return -1; @@ -4347,8 +4347,8 @@ qemuMonitorJSONDriveMirror(qemuMonitorPtr mon, bool shallow, bool reuse) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; cmd = qemuMonitorJSONMakeCommand("drive-mirror", "s:device", device, @@ -4381,8 +4381,8 @@ qemuMonitorJSONBlockdevMirror(qemuMonitorPtr mon, unsigned long long buf_size, bool shallow) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; virTristateBool autofinalize = VIR_TRISTATE_BOOL_ABSENT; virTristateBool autodismiss = VIR_TRISTATE_BOOL_ABSENT; @@ -5023,8 +5023,8 @@ int qemuMonitorJSONJobDismiss(qemuMonitorPtr mon, const char *jobname) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; if (!(cmd = qemuMonitorJSONMakeCommand("job-dismiss", "s:id", jobname, @@ -5046,8 +5046,8 @@ qemuMonitorJSONJobCancel(qemuMonitorPtr mon, const char *jobname, bool quiet) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; if (!(cmd = qemuMonitorJSONMakeCommand("job-cancel", "s:id", jobname, @@ -5073,8 +5073,8 @@ int qemuMonitorJSONJobComplete(qemuMonitorPtr mon, const char *jobname) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; if (!(cmd = qemuMonitorJSONMakeCommand("job-complete", "s:id", jobname, @@ -5808,9 +5808,9 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, bool fail_no_props, qemuMonitorCPUModelInfoPtr *model_info) { - VIR_AUTOPTR(virJSONValue) model = NULL; - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) model = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; virJSONValuePtr data; virJSONValuePtr cpu_model; virJSONValuePtr cpu_props = NULL; @@ -5883,10 +5883,10 @@ qemuMonitorJSONGetCPUModelBaseline(qemuMonitorPtr mon, virCPUDefPtr cpu_b, qemuMonitorCPUModelInfoPtr *baseline) { - VIR_AUTOPTR(virJSONValue) model_a = NULL; - VIR_AUTOPTR(virJSONValue) model_b = NULL; - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) model_a = NULL; + g_autoptr(virJSONValue) model_b = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; virJSONValuePtr data; virJSONValuePtr cpu_model; virJSONValuePtr cpu_props = NULL; @@ -5925,10 +5925,10 @@ qemuMonitorJSONGetCPUModelComparison(qemuMonitorPtr mon, virCPUDefPtr cpu_b, char **result) { - VIR_AUTOPTR(virJSONValue) model_a = NULL; - VIR_AUTOPTR(virJSONValue) model_b = NULL; - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) model_a = NULL; + g_autoptr(virJSONValue) model_b = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; const char *data_result; virJSONValuePtr data; @@ -6468,8 +6468,8 @@ qemuMonitorJSONGetStringListProperty(qemuMonitorPtr mon, const char *property, char ***strList) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; VIR_AUTOSTRINGLIST list = NULL; virJSONValuePtr data; size_t n; @@ -6959,7 +6959,7 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitorPtr mon, const char *cert_chain = NULL; unsigned int cbitpos; unsigned int reduced_phys_bits; - VIR_AUTOPTR(virSEVCapability) capability = NULL; + g_autoptr(virSEVCapability) capability = NULL; *capabilities = NULL; @@ -7750,8 +7750,8 @@ static int qemuMonitorJSONGetCPUProperties(qemuMonitorPtr mon, char ***props) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; *props = NULL; @@ -8699,8 +8699,8 @@ qemuMonitorJSONBlockdevCreate(qemuMonitorPtr mon, const char *jobname, virJSONValuePtr props) { - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; cmd = qemuMonitorJSONMakeCommand("blockdev-create", "s:job-id", jobname, @@ -9292,7 +9292,7 @@ qemuMonitorJSONGetJobInfoOne(virJSONValuePtr data) const char *status = virJSONValueObjectGetString(data, "status"); const char *errmsg = virJSONValueObjectGetString(data, "error"); int tmp; - VIR_AUTOPTR(qemuMonitorJobInfo) job = NULL; + g_autoptr(qemuMonitorJobInfo) job = NULL; qemuMonitorJobInfoPtr ret = NULL; if (VIR_ALLOC(job) < 0) @@ -9323,8 +9323,8 @@ qemuMonitorJSONGetJobInfo(qemuMonitorPtr mon, size_t *njobs) { virJSONValuePtr data; - VIR_AUTOPTR(virJSONValue) cmd = NULL; - VIR_AUTOPTR(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; size_t i; if (!(cmd = qemuMonitorJSONMakeCommand("query-jobs", NULL))) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index afbbe1a853..d21d95a977 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2517,7 +2517,7 @@ qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet) static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { - VIR_AUTOPTR(virBitmap) cpumapToSet = NULL; + g_autoptr(virBitmap) cpumapToSet = NULL; virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2644,7 +2644,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; virBitmapPtr use_cpumask = NULL; - VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + g_autoptr(virBitmap) hostcpumap = NULL; char *mem_mask = NULL; int ret = -1; diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 2fc56dcfa4..41179f72ec 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -501,8 +501,8 @@ virQEMUQAPISchemaEntryProcess(size_t pos G_GNUC_UNUSED, virHashTablePtr virQEMUQAPISchemaConvert(virJSONValuePtr schemareply) { - VIR_AUTOPTR(virHashTable) schema = NULL; - VIR_AUTOPTR(virJSONValue) schemajson = schemareply; + g_autoptr(virHashTable) schema = NULL; + g_autoptr(virJSONValue) schemajson = schemareply; if (!(schema = virHashCreate(512, virJSONValueHashFree))) return NULL; diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 53e8f27e2d..b4d85c49df 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -81,7 +81,7 @@ qemuSlirpHasFeature(const qemuSlirp *slirp, qemuSlirpPtr qemuSlirpNew(void) { - VIR_AUTOPTR(qemuSlirp) slirp = NULL; + g_autoptr(qemuSlirp) slirp = NULL; if (VIR_ALLOC(slirp) < 0 || !(slirp->features = virBitmapNew(QEMU_SLIRP_FEATURE_LAST))) @@ -97,10 +97,10 @@ qemuSlirpNew(void) qemuSlirpPtr qemuSlirpNewForHelper(const char *helper) { - VIR_AUTOPTR(qemuSlirp) slirp = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(qemuSlirp) slirp = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *output = NULL; - VIR_AUTOPTR(virJSONValue) doc = NULL; + g_autoptr(virJSONValue) doc = NULL; virJSONValuePtr featuresJSON; size_t i, nfeatures; @@ -297,7 +297,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, bool incoming) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *pidfile = NULL; g_autofree char *dbus_path = NULL; g_autofree char *dbus_addr = NULL; diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 8a653fc101..5bab7ff5fa 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -183,8 +183,8 @@ qemuVhostUserPtr qemuVhostUserParse(const char *path) { g_autofree char *cont = NULL; - VIR_AUTOPTR(virJSONValue) doc = NULL; - VIR_AUTOPTR(qemuVhostUser) vu = NULL; + g_autoptr(virJSONValue) doc = NULL; + g_autoptr(qemuVhostUser) vu = NULL; qemuVhostUserPtr ret = NULL; if (virFileReadAll(path, DOCUMENT_SIZE, &cont) < 0) @@ -214,7 +214,7 @@ qemuVhostUserParse(const char *path) char * qemuVhostUserFormat(qemuVhostUserPtr vu) { - VIR_AUTOPTR(virJSONValue) doc = NULL; + g_autoptr(virJSONValue) doc = NULL; if (!vu) return NULL; @@ -285,7 +285,7 @@ qemuVhostUserGPUFillCapabilities(qemuVhostUserPtr vu, virJSONValuePtr featuresJSON; size_t nfeatures; size_t i; - VIR_AUTOPTR(qemuVhostUserGPUFeature) features = NULL; + g_autoptr(qemuVhostUserGPUFeature) features = NULL; if (!(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -350,9 +350,9 @@ qemuVhostUserFillDomainGPU(virQEMUDriverPtr driver, goto end; for (i = 0; i < nvus; i++) { - VIR_AUTOPTR(virJSONValue) doc = NULL; + g_autoptr(virJSONValue) doc = NULL; g_autofree char *output = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; vu = vus[i]; if (vu->type != QEMU_VHOST_USER_TYPE_GPU) diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 291a6a0d9e..6daccf170e 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -108,7 +108,7 @@ int qemuExtVhostUserGPUStart(virQEMUDriverPtr driver, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); g_autofree char *shortname = NULL; g_autofree char *pidfile = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int pair[2] = { -1, -1 }; int cmdret = 0, rc; int exitstatus = 0; diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 916b14dc7f..e87ff12512 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -400,7 +400,7 @@ daemonSetupNetworking(virNetServerPtr srv, int unix_sock_rw_mask = 0; int unix_sock_adm_mask = 0; int ret = -1; - VIR_AUTOPTR(virSystemdActivation) act = NULL; + g_autoptr(virSystemdActivation) act = NULL; virSystemdActivationMap actmap[] = { { .name = DAEMON_NAME ".socket", .family = AF_UNIX, .path = sock_path }, { .name = DAEMON_NAME "-ro.socket", .family = AF_UNIX, .path = sock_path_ro }, diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index ce5f8c5278..4c712bf2dc 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -401,7 +401,7 @@ daemonConfigLoadFile(struct daemonConfig *data, const char *filename, bool allow_missing) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; if (allow_missing && access(filename, R_OK) == -1 && @@ -419,7 +419,7 @@ int daemonConfigLoadData(struct daemonConfig *data, const char *filename, const char *filedata) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; conf = virConfReadString(filedata, 0); if (!conf) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 17d39125bb..0812def922 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -637,7 +637,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext, static int virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) { - VIR_AUTOPTR(virConf) selinux_conf = NULL; + g_autoptr(virConf) selinux_conf = NULL; virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr); data->skipAllLabel = true; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 2ff34dacbd..afc5324b77 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -170,7 +170,7 @@ parserCommand(const char *profile_name, const char cmd) const char * const argv[] = { "/sbin/apparmor_parser", flag, profile, NULL }; - VIR_AUTOPTR(virCommand) command = virCommandNewArgs(argv); + g_autoptr(virCommand) command = virCommandNewArgs(argv); virCommandRawStatus(command); if ((ret = virCommandRun(command, &status)) != 0 || diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 742539036c..1228da1f47 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -360,7 +360,7 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPtr pool, .vol = vol, }; g_autofree char *parthelper_path = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (!(parthelper_path = virFileFindResource("libvirt_parthelper", abs_top_builddir "/src", @@ -414,7 +414,7 @@ virStorageBackendDiskReadGeometry(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); g_autofree char *parthelper_path = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (!(parthelper_path = virFileFindResource("libvirt_parthelper", abs_top_builddir "/src", @@ -492,7 +492,7 @@ virStorageBackendDiskBuildPool(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int format = def->source.format; const char *fmt; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int ret = -1; virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE | @@ -774,7 +774,7 @@ virStorageBackendDiskDeleteVol(virStoragePoolObjPtr pool, char *srcname = last_component(src_path); bool isDevMapperDevice; g_autofree char *devpath = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; virCheckFlags(0, -1); @@ -856,7 +856,7 @@ virStorageBackendDiskCreateVol(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virErrorPtr save_err; g_autofree char *partFormat = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(PARTED, def->source.devices[0].path, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 132b7e721f..a00308bc17 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -109,7 +109,7 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) 1 }; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(SHOWMOUNT, "--no-headers", @@ -139,7 +139,7 @@ virStorageBackendFileSystemNetFindPoolSources(const char *srcSpec, size_t i; int retNFS = -1; int retGluster = 0; - VIR_AUTOPTR(virStoragePoolSource) source = NULL; + g_autoptr(virStoragePoolSource) source = NULL; virCheckFlags(0, NULL); @@ -299,7 +299,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int rc; g_autofree char *src = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (virStorageBackendFileSystemIsValid(pool) < 0) return -1; @@ -365,7 +365,7 @@ virStorageBackendFileSystemStop(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int rc; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (virStorageBackendFileSystemIsValid(pool) < 0) return -1; @@ -413,7 +413,7 @@ static int virStorageBackendExecuteMKFS(const char *device, const char *format) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(MKFS, "-t", format, NULL); diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 7fb4e1ef8e..07aca084d8 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -238,7 +238,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, glfs_fd_t *fd = NULL; ssize_t len; int backingFormat; - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) vol = NULL; VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; g_autofree char *header = NULL; @@ -478,7 +478,7 @@ virStorageBackendGlusterFindPoolSources(const char *srcSpec, char *ret = NULL; int rc; size_t i; - VIR_AUTOPTR(virStoragePoolSource) source = NULL; + g_autoptr(virStoragePoolSource) source = NULL; virCheckFlags(0, NULL); diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index eba9c4790f..b11d1d6622 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -161,7 +161,7 @@ virStorageBackendISCSIFindPoolSources(const char *srcSpec, .sources = NULL }; g_autofree char *portal = NULL; - VIR_AUTOPTR(virStoragePoolSource) source = NULL; + g_autoptr(virStoragePoolSource) source = NULL; virCheckFlags(0, NULL); diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 9d8f7d9ed2..78e347c9b0 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -307,7 +307,7 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); uint32_t block_size; uint64_t nb_block; - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) vol = NULL; if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) return -1; @@ -491,7 +491,7 @@ virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec, .sources = NULL }; g_autofree char *portal = NULL; - VIR_AUTOPTR(virStoragePoolSource) source = NULL; + g_autoptr(virStoragePoolSource) source = NULL; virCheckFlags(0, NULL); diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 784e238ba7..04f3decdf3 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -49,7 +49,7 @@ virStorageBackendLogicalSetActive(virStoragePoolObjPtr pool, bool on) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int ret; cmd = virStorageBackendLogicalChangeCmd(VGCHANGE, def, on); @@ -71,7 +71,7 @@ virStorageBackendLogicalSetActive(virStoragePoolObjPtr pool, static void virStorageBackendLogicalRemoveDevice(const char *path) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(PVREMOVE, path, NULL); if (virCommandRun(cmd, NULL) < 0) @@ -89,7 +89,7 @@ virStorageBackendLogicalRemoveDevice(const char *path) static int virStorageBackendLogicalInitializeDevice(const char *path) { - VIR_AUTOPTR(virCommand) pvcmd = NULL; + g_autoptr(virCommand) pvcmd = NULL; /* * LVM requires that the first sector is blanked if using @@ -421,7 +421,7 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool, .pool = pool, .vol = vol, }; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(LVS, "--separator", "#", @@ -520,7 +520,7 @@ virStorageBackendLogicalGetPoolSources(virStoragePoolSourceListPtr sourceList) int vars[] = { 2 }; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; /* * NOTE: ignoring errors here; this is just to "touch" any logical volumes @@ -702,7 +702,7 @@ virStorageBackendLogicalBuildPool(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int ret = -1; size_t i = 0; - VIR_AUTOPTR(virCommand) vgcmd = NULL; + g_autoptr(virCommand) vgcmd = NULL; virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE | VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, ret); @@ -765,7 +765,7 @@ virStorageBackendLogicalRefreshPool(virStoragePoolObjPtr pool) 2 }; virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; virWaitForDevices(); @@ -817,7 +817,7 @@ virStorageBackendLogicalDeletePool(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); size_t i; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; virCheckFlags(0, -1); @@ -841,8 +841,8 @@ virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, unsigned int flags) { - VIR_AUTOPTR(virCommand) lvchange_cmd = NULL; - VIR_AUTOPTR(virCommand) lvremove_cmd = NULL; + g_autoptr(virCommand) lvchange_cmd = NULL; + g_autoptr(virCommand) lvremove_cmd = NULL; virCheckFlags(0, -1); @@ -869,7 +869,7 @@ virStorageBackendLogicalLVCreate(virStorageVolDefPtr vol, virStoragePoolDefPtr def) { unsigned long long capacity = vol->target.capacity; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (vol->target.encryption && vol->target.encryption->format != VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) { diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index cbd544b038..2d9ebf3ba3 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -46,7 +46,7 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, const char *dev) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) vol = NULL; if (VIR_ALLOC(vol) < 0) return -1; diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 8b62969219..485cabb219 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -720,7 +720,7 @@ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool) goto cleanup; for (i = 0; names[i] != NULL; i++) { - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) vol = NULL; if (VIR_ALLOC(vol) < 0) goto cleanup; diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 25183d0d2f..f03c5c7e05 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -110,7 +110,7 @@ virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, static int virStorageBackendSheepdogAddVolume(virStoragePoolObjPtr pool, const char *diskInfo) { - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) vol = NULL; if (diskInfo == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -140,7 +140,7 @@ virStorageBackendSheepdogRefreshAllVol(virStoragePoolObjPtr pool) g_autofree char *output = NULL; VIR_AUTOSTRINGLIST lines = NULL; VIR_AUTOSTRINGLIST cells = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "list", "-r", NULL); virStorageBackendSheepdogAddHostArg(cmd, pool); @@ -177,7 +177,7 @@ static int virStorageBackendSheepdogRefreshPool(virStoragePoolObjPtr pool) { g_autofree char *output = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(SHEEPDOGCLI, "node", "info", "-r", NULL); virStorageBackendSheepdogAddHostArg(cmd, pool); @@ -198,7 +198,7 @@ virStorageBackendSheepdogDeleteVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; virCheckFlags(0, -1); @@ -241,7 +241,7 @@ virStorageBackendSheepdogBuildVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; virCheckFlags(0, -1); @@ -325,7 +325,7 @@ virStorageBackendSheepdogRefreshVol(virStoragePoolObjPtr pool, { char *output = NULL; virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "list", vol->name, "-r", NULL); virStorageBackendSheepdogAddHostArg(cmd, pool); @@ -355,7 +355,7 @@ virStorageBackendSheepdogResizeVol(virStoragePoolObjPtr pool, unsigned long long capacity, unsigned int flags) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; virCheckFlags(0, -1); diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index ee944c18e1..ef51f254a8 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -41,7 +41,7 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) g_autofree char *grp_name = NULL; g_autofree char *usr_name = NULL; g_autofree char *mode = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int ret; /* Check the permissions */ @@ -122,7 +122,7 @@ virStorageBackendVzPoolStop(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int rc; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; /* Short-circuit if already unmounted */ if ((rc = virStorageBackendVzIsMounted(pool)) != 1) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 5a417119f3..6bfff9f5dd 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -53,7 +53,7 @@ virStorageBackendZFSVolModeNeeded(void) { int ret = -1, exit_code = -1; g_autofree char *error = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; /* 'zfs get' without arguments prints out * usage information to stderr, including @@ -178,7 +178,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); size_t i; VIR_AUTOSTRINGLIST lines = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *volumes_list = NULL; /** @@ -223,7 +223,7 @@ virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool G_GNUC_UNUSED) virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); char *zpool_props = NULL; size_t i; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; VIR_AUTOSTRINGLIST lines = NULL; VIR_AUTOSTRINGLIST tokens = NULL; @@ -297,7 +297,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int ret = -1; int volmode_needed = -1; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (vol->target.encryption != NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -366,7 +366,7 @@ virStorageBackendZFSDeleteVol(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOPTR(virCommand) destroy_cmd = NULL; + g_autoptr(virCommand) destroy_cmd = NULL; virCheckFlags(0, -1); @@ -384,7 +384,7 @@ virStorageBackendZFSBuildPool(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); size_t i; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int ret = -1; virCheckFlags(0, -1); @@ -413,7 +413,7 @@ virStorageBackendZFSDeletePool(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; virCheckFlags(0, -1); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index af3b04fbf4..d878329a45 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -738,7 +738,7 @@ storagePoolCreateXML(virConnectPtr conn, virStorageBackendPtr backend; virObjectEventPtr event = NULL; unsigned int build_flags = 0; - VIR_AUTOPTR(virStoragePoolDef) newDef = NULL; + g_autoptr(virStoragePoolDef) newDef = NULL; g_autofree char *stateFile = NULL; virCheckFlags(VIR_STORAGE_POOL_CREATE_WITH_BUILD | @@ -825,7 +825,7 @@ storagePoolDefineXML(virConnectPtr conn, virStoragePoolDefPtr def; virStoragePoolPtr pool = NULL; virObjectEventPtr event = NULL; - VIR_AUTOPTR(virStoragePoolDef) newDef = NULL; + g_autoptr(virStoragePoolDef) newDef = NULL; virCheckFlags(0, NULL); @@ -1908,7 +1908,7 @@ storageVolCreateXML(virStoragePoolPtr pool, virStoragePoolDefPtr def; virStorageBackendPtr backend; virStorageVolPtr vol = NULL, newvol = NULL; - VIR_AUTOPTR(virStorageVolDef) voldef = NULL; + g_autoptr(virStorageVolDef) voldef = NULL; virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); @@ -2047,7 +2047,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, virStorageVolPtr newvol = NULL; virStorageVolPtr vol = NULL; int buildret; - VIR_AUTOPTR(virStorageVolDef) voldef = NULL; + g_autoptr(virStorageVolDef) voldef = NULL; virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA | VIR_STORAGE_VOL_CREATE_REFLINK, @@ -2295,7 +2295,7 @@ virStorageVolPoolRefreshDataFree(void *opaque) static int virStorageBackendPloopRestoreDesc(char *path) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *refresh_tool = NULL; g_autofree char *desc = NULL; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 6a99387597..c51494045d 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -598,7 +598,7 @@ storageBackendCreatePloop(virStoragePoolObjPtr pool G_GNUC_UNUSED, { int ret = -1; bool created = false; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *create_tool = NULL; virCheckFlags(0, -1); @@ -667,7 +667,7 @@ static int storagePloopResize(virStorageVolDefPtr vol, unsigned long long capacity) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *resize_tool = NULL; resize_tool = virFindFileInPath("ploop"); @@ -1285,7 +1285,7 @@ storageBackendDoCreateQemuImg(virStoragePoolObjPtr pool, const char *inputSecretPath, virStorageVolEncryptConvertStep convertStep) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virStorageBackendCreateQemuImgCmdFromVol(pool, vol, inputvol, flags, create_tool, @@ -2261,7 +2261,7 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, int ret = -1; const char *type; virStorageEncryptionPtr enc = vol->target.encryption; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *img_tool = NULL; g_autofree char *secretPath = NULL; g_autofree char *secretAlias = NULL; @@ -2381,7 +2381,7 @@ static int storageBackendPloopHasSnapshots(char *path) { char *snap_tool = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *output = NULL; snap_tool = virFindFileInPath("ploop"); @@ -2595,7 +2595,7 @@ storageBackendVolWipeLocalFile(const char *path, const char *alg_char = NULL; struct stat st; VIR_AUTOCLOSE fd = -1; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; fd = open(path, O_RDWR); if (fd == -1) { @@ -2672,7 +2672,7 @@ static int storageBackendVolWipePloop(virStorageVolDefPtr vol, unsigned int algorithm) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *target_path = NULL; g_autofree char *disk_desc = NULL; g_autofree char *create_tool = NULL; @@ -2913,7 +2913,7 @@ virStorageBackendFindGlusterPoolSources(const char *host, bool report) { int rc; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *glusterpath = NULL; g_autofree char *outbuf = NULL; @@ -3181,7 +3181,7 @@ virStorageBackendPARTEDFindLabel(const char *device, }; char *start, *end; int ret = VIR_STORAGE_PARTED_ERROR; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *output = NULL; g_autofree char *error = NULL; @@ -3527,7 +3527,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) struct stat statbuf; int direrr; int ret = -1; - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) vol = NULL; VIR_AUTOCLOSE fd = -1; VIR_AUTOUNREF(virStorageSourcePtr) target = NULL; @@ -3666,7 +3666,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); int retval = -1; - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) vol = NULL; g_autofree char *devpath = NULL; /* Check if the pool is using a stable target path. The call to diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 237bcb9c7e..8c77ec6e0d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1075,7 +1075,7 @@ testOpenVolumesForPool(const char *file, int num; g_autofree char *vol_xpath = NULL; g_autofree xmlNodePtr *nodes = NULL; - VIR_AUTOPTR(virStorageVolDef) volDef = NULL; + g_autoptr(virStorageVolDef) volDef = NULL; /* Find storage volumes */ if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", objidx) < 0) @@ -6347,7 +6347,7 @@ testConnectFindStoragePoolSources(virConnectPtr conn G_GNUC_UNUSED, { int pool_type; char *ret = NULL; - VIR_AUTOPTR(virStoragePoolSource) source = NULL; + g_autoptr(virStoragePoolSource) source = NULL; virCheckFlags(0, NULL); @@ -6428,7 +6428,7 @@ testStoragePoolCreateXML(virConnectPtr conn, virStoragePoolDefPtr def; virStoragePoolPtr pool = NULL; virObjectEventPtr event = NULL; - VIR_AUTOPTR(virStoragePoolDef) newDef = NULL; + g_autoptr(virStoragePoolDef) newDef = NULL; virCheckFlags(0, NULL); @@ -6491,7 +6491,7 @@ testStoragePoolDefineXML(virConnectPtr conn, virStoragePoolDefPtr def; virStoragePoolPtr pool = NULL; virObjectEventPtr event = NULL; - VIR_AUTOPTR(virStoragePoolDef) newDef = NULL; + g_autoptr(virStoragePoolDef) newDef = NULL; virCheckFlags(0, NULL); @@ -6994,7 +6994,7 @@ testStorageVolCreateXML(virStoragePoolPtr pool, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; virStorageVolPtr ret = NULL; - VIR_AUTOPTR(virStorageVolDef) privvol = NULL; + g_autoptr(virStorageVolDef) privvol = NULL; virCheckFlags(0, NULL); @@ -7054,7 +7054,7 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, virStoragePoolDefPtr def; virStorageVolDefPtr origvol = NULL; virStorageVolPtr ret = NULL; - VIR_AUTOPTR(virStorageVolDef) privvol = NULL; + g_autoptr(virStorageVolDef) privvol = NULL; virCheckFlags(0, NULL); diff --git a/src/util/virauth.c b/src/util/virauth.c index 004b2f3a71..979cb5773e 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -111,7 +111,7 @@ virAuthGetCredential(const char *servicename, const char *path, char **value) { - VIR_AUTOPTR(virAuthConfig) config = NULL; + g_autoptr(virAuthConfig) config = NULL; const char *tmp; *value = NULL; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index ed8f06acc7..5ac489004d 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -1199,7 +1199,7 @@ char * virBitmapDataFormat(const void *data, int len) { - VIR_AUTOPTR(virBitmap) map = NULL; + g_autoptr(virBitmap) map = NULL; if (!(map = virBitmapNewData(data, len))) return NULL; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index a62a513b0c..93b3dd218f 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -488,7 +488,7 @@ virCommandMassClose(virCommandPtr cmd, int childout, int childerr) { - VIR_AUTOPTR(virBitmap) fds = NULL; + g_autoptr(virBitmap) fds = NULL; int openmax = sysconf(_SC_OPEN_MAX); int fd = -1; @@ -839,7 +839,7 @@ virExec(virCommandPtr cmd) int virRun(const char *const*argv, int *status) { - VIR_AUTOPTR(virCommand) cmd = virCommandNewArgs(argv); + g_autoptr(virCommand) cmd = virCommandNewArgs(argv); return virCommandRun(cmd, status); } @@ -3020,7 +3020,7 @@ virCommandFree(virCommandPtr cmd) * This requests asynchronous string IO on @cmd. It is useful in * combination with virCommandRunAsync(): * - * VIR_AUTOPTR(virCommand) cmd = virCommandNew*(...); + * g_autoptr(virCommand) cmd = virCommandNew*(...); * g_autofree char *buf = NULL; * * ... diff --git a/src/util/virfile.c b/src/util/virfile.c index 457235d195..e0b6398823 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -910,7 +910,7 @@ int virFileNBDDeviceAssociate(const char *file, { g_autofree char *nbddev = NULL; g_autofree char *qemunbd = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; const char *fmtstr = NULL; if (!virFileNBDLoadDriver()) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index a38516a1bb..cc1e2b34ea 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -113,7 +113,7 @@ virFirewallCheckUpdateLock(bool *lockflag, const char *const*args) { int status; /* Ignore failed commands without logging them */ - VIR_AUTOPTR(virCommand) cmd = virCommandNewArgs(args); + g_autoptr(virCommand) cmd = virCommandNewArgs(args); if (virCommandRun(cmd, &status) < 0 || status) { VIR_INFO("locking not supported by %s", args[0]); } else { @@ -666,7 +666,7 @@ virFirewallApplyRuleDirect(virFirewallRulePtr rule, { size_t i; const char *bin = virFirewallLayerCommandTypeToString(rule->layer); - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int status; g_autofree char *error = NULL; @@ -838,7 +838,7 @@ virFirewallApply(virFirewallPtr firewall) if (virFirewallApplyGroup(firewall, i) < 0) { VIR_DEBUG("Rolling back groups up to %zu for %p", i, firewall); size_t first = i; - VIR_AUTOPTR(virError) saved_error = virSaveLastError(); + g_autoptr(virError) saved_error = virSaveLastError(); /* * Look at any inheritance markers to figure out diff --git a/src/util/virhook.c b/src/util/virhook.c index 19207c2b25..a687629fc2 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -241,7 +241,7 @@ virHookCall(int driver, { int ret; g_autofree char *path = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; const char *drvstr; const char *opstr; const char *subopstr; diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 984f6bb290..dbc235d6f1 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -229,7 +229,7 @@ static int virHostdevGetPCIHostDevice(const virDomainHostdevDef *hostdev, virPCIDevicePtr *pci) { - VIR_AUTOPTR(virPCIDevice) actual = NULL; + g_autoptr(virPCIDevice) actual = NULL; const virDomainHostdevSubsysPCI *pcisrc = &hostdev->source.subsys.u.pci; *pci = NULL; @@ -272,7 +272,7 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs) for (i = 0; i < nhostdevs; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; - VIR_AUTOPTR(virPCIDevice) pci = NULL; + g_autoptr(virPCIDevice) pci = NULL; if (virHostdevGetPCIHostDevice(hostdev, &pci) < 0) return NULL; @@ -537,7 +537,7 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev, g_autofree char *linkdev = NULL; g_autofree virMacAddrPtr MAC = NULL; g_autofree virMacAddrPtr adminMAC = NULL; - VIR_AUTOPTR(virNetDevVlan) vlan = NULL; + g_autoptr(virNetDevVlan) vlan = NULL; virNetDevVPortProfilePtr virtPort; int vf = -1; bool port_profile_associate = false; @@ -1111,7 +1111,7 @@ virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr, for (i = 0; i < nhostdevs; i++) { const virDomainHostdevDef *hostdev = hostdevs[i]; - VIR_AUTOPTR(virPCIDevice) actual = NULL; + g_autoptr(virPCIDevice) actual = NULL; if (virHostdevGetPCIHostDevice(hostdev, &actual) < 0) goto cleanup; @@ -1156,7 +1156,7 @@ virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr, virObjectLock(mgr->activeUSBHostdevs); for (i = 0; i < nhostdevs; i++) { virDomainHostdevSubsysUSBPtr usbsrc; - VIR_AUTOPTR(virUSBDevice) usb = NULL; + g_autoptr(virUSBDevice) usb = NULL; hostdev = hostdevs[i]; usbsrc = &hostdev->source.subsys.u.usb; @@ -1191,7 +1191,7 @@ virHostdevUpdateActiveSCSIHostDevices(virHostdevManagerPtr mgr, const char *dom_name) { virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - VIR_AUTOPTR(virSCSIDevice) scsi = NULL; + g_autoptr(virSCSIDevice) scsi = NULL; virSCSIDevicePtr tmp = NULL; if (!(scsi = virSCSIDeviceNew(NULL, @@ -1260,7 +1260,7 @@ virHostdevUpdateActiveMediatedDevices(virHostdevManagerPtr mgr, { int ret = -1; size_t i; - VIR_AUTOPTR(virMediatedDevice) mdev = NULL; + g_autoptr(virMediatedDevice) mdev = NULL; if (nhostdevs == 0) return 0; @@ -1462,7 +1462,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr, for (i = 0; i < nhostdevs; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; bool required = true; - VIR_AUTOPTR(virUSBDevice) usb = NULL; + g_autoptr(virUSBDevice) usb = NULL; if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) continue; @@ -1507,7 +1507,7 @@ virHostdevPrepareSCSIHostDevices(virDomainHostdevDefPtr hostdev, virSCSIDeviceListPtr list) { virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - VIR_AUTOPTR(virSCSIDevice) scsi = NULL; + g_autoptr(virSCSIDevice) scsi = NULL; if (hostdev->managed) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -1651,7 +1651,7 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr, for (i = 0; i < nhostdevs; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevSubsysSCSIVHostPtr hostsrc = &hostdev->source.subsys.u.scsi_host; - VIR_AUTOPTR(virSCSIVHostDevice) host = NULL; + g_autoptr(virSCSIVHostDevice) host = NULL; if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) @@ -1734,7 +1734,7 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr mgr, for (i = 0; i < nhostdevs; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevSubsysMediatedDevPtr src = &hostdev->source.subsys.u.mdev; - VIR_AUTOPTR(virMediatedDevice) mdev = NULL; + g_autoptr(virMediatedDevice) mdev = NULL; if (!virHostdevIsMdevDevice(hostdev)) continue; @@ -1782,7 +1782,7 @@ virHostdevReAttachUSBDevices(virHostdevManagerPtr mgr, for (i = 0; i < nhostdevs; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb; - VIR_AUTOPTR(virUSBDevice) usb = NULL; + g_autoptr(virUSBDevice) usb = NULL; virUSBDevicePtr tmp; const char *usedby_drvname; const char *usedby_domname; @@ -1834,7 +1834,7 @@ virHostdevReAttachSCSIHostDevices(virHostdevManagerPtr mgr, const char *dom_name) { virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - VIR_AUTOPTR(virSCSIDevice) scsi = NULL; + g_autoptr(virSCSIDevice) scsi = NULL; virSCSIDevicePtr tmp; if (!(scsi = virSCSIDeviceNew(NULL, @@ -1909,7 +1909,7 @@ virHostdevReAttachSCSIVHostDevices(virHostdevManagerPtr mgr, virObjectLock(mgr->activeSCSIVHostHostdevs); for (i = 0; i < nhostdevs; i++) { - VIR_AUTOPTR(virSCSIVHostDevice) host = NULL; + g_autoptr(virSCSIVHostDevice) host = NULL; virSCSIVHostDevicePtr tmp; virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevSubsysSCSIVHostPtr hostsrc = &hostdev->source.subsys.u.scsi_host; @@ -1978,7 +1978,7 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPtr mgr, virObjectLock(mgr->activeMediatedHostdevs); for (i = 0; i < nhostdevs; i++) { - VIR_AUTOPTR(virMediatedDevice) mdev = NULL; + g_autoptr(virMediatedDevice) mdev = NULL; virMediatedDevicePtr tmp; virDomainHostdevSubsysMediatedDevPtr mdevsrc; virDomainHostdevDefPtr hostdev = hostdevs[i]; diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index f2140b47de..50e8e7afc5 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -90,7 +90,7 @@ virISCSIGetSession(const char *devpath, int exitstatus = 0; g_autofree char *error = NULL; - VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode", + g_autoptr(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode", "session", NULL); virCommandSetErrorBuffer(cmd, &error); @@ -125,7 +125,7 @@ virStorageBackendIQNFound(const char *initiatoriqn, g_autofree char *outbuf = NULL; g_autofree char *iface = NULL; g_autofree char *iqn = NULL; - VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, + g_autoptr(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode", "iface", NULL); *ifacename = NULL; @@ -210,7 +210,7 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, int exitstatus = -1; g_autofree char *iface_name = NULL; g_autofree char *temp_ifacename = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (virAsprintf(&temp_ifacename, "libvirt-iface-%08llx", @@ -285,7 +285,7 @@ virISCSIConnection(const char *portal, "--targetname", target, NULL }; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *ifacename = NULL; cmd = virCommandNewArgs(baseargv); @@ -349,7 +349,7 @@ virISCSIConnectionLogout(const char *portal, int virISCSIRescanLUNs(const char *session) { - VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, + g_autoptr(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode", "session", "-r", session, "-R", @@ -404,7 +404,7 @@ virISCSIScanTargetsInternal(const char *portal, int vars[] = { 2 }; struct virISCSITargetList list; size_t i; - VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, + g_autoptr(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode", "discovery", "--type", "sendtargets", "--portal", portal, @@ -519,7 +519,7 @@ int virISCSINodeNew(const char *portal, const char *target) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int status; cmd = virCommandNewArgList(ISCSIADM, @@ -553,7 +553,7 @@ virISCSINodeUpdate(const char *portal, const char *name, const char *value) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int status; cmd = virCommandNewArgList(ISCSIADM, diff --git a/src/util/virjson.c b/src/util/virjson.c index c876a4a261..c1476bfbbe 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -2050,7 +2050,7 @@ char * virJSONStringReformat(const char *jsonstr, bool pretty) { - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; if (!(json = virJSONValueFromString(jsonstr))) return NULL; @@ -2144,7 +2144,7 @@ virJSONValueObjectDeflattenWorker(const char *key, virJSONValuePtr virJSONValueObjectDeflatten(virJSONValuePtr json) { - VIR_AUTOPTR(virJSONValue) deflattened = NULL; + g_autoptr(virJSONValue) deflattened = NULL; virJSONValuePtr ret = NULL; if (!(deflattened = virJSONValueNewObject())) diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 56758750ae..2f6ab90ded 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -28,7 +28,7 @@ static int doModprobe(const char *opts, const char *module, char **outbuf, char **errbuf) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNew(MODPROBE); if (opts) @@ -49,7 +49,7 @@ doModprobe(const char *opts, const char *module, char **outbuf, char **errbuf) static int doRmmod(const char *module, char **errbuf) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(RMMOD, module, NULL); virCommandSetErrorBuffer(cmd, errbuf); diff --git a/src/util/virlease.c b/src/util/virlease.c index 79fdd0699d..a49bd5b9fb 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -49,7 +49,7 @@ virLeaseReadCustomLeaseFile(virJSONValuePtr leases_array_new, char **server_duid) { g_autofree char *lease_entries = NULL; - VIR_AUTOPTR(virJSONValue) leases_array = NULL; + g_autoptr(virJSONValue) leases_array = NULL; long long expirytime; int custom_lease_file_len = 0; virJSONValuePtr lease_tmp = NULL; @@ -212,7 +212,7 @@ virLeaseNew(virJSONValuePtr *lease_ret, const char *iaid, const char *server_duid) { - VIR_AUTOPTR(virJSONValue) lease_new = NULL; + g_autoptr(virJSONValue) lease_new = NULL; const char *exptime_tmp = getenv("DNSMASQ_LEASE_EXPIRES"); long long expirytime = 0; g_autofree char *exptime = NULL; diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 7260799e5d..31fd961277 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -141,7 +141,7 @@ virMediatedDevicePtr virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) { virMediatedDevicePtr ret = NULL; - VIR_AUTOPTR(virMediatedDevice) dev = NULL; + g_autoptr(virMediatedDevice) dev = NULL; g_autofree char *sysfspath = NULL; if (!(sysfspath = virMediatedDeviceGetSysfsPath(uuidstr))) @@ -495,7 +495,7 @@ int virMediatedDeviceTypeReadAttrs(const char *sysfspath, virMediatedDeviceTypePtr *type) { - VIR_AUTOPTR(virMediatedDeviceType) tmp = NULL; + g_autoptr(virMediatedDeviceType) tmp = NULL; #define MDEV_GET_SYSFS_ATTR(attr, dst, cb, optional) \ do { \ diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e23061dd4c..d8ae5fbc5f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2726,7 +2726,7 @@ static int virNetDevGetMcastList(const char *ifname, char *buf = NULL; char *next = NULL; int ret = -1, len; - VIR_AUTOPTR(virNetDevMcastEntry) entry = NULL; + g_autoptr(virNetDevMcastEntry) entry = NULL; mcast->entries = NULL; mcast->nentries = 0; diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index edaf1e7c34..edf4cc6236 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -952,7 +952,7 @@ virNetDevBridgeFDBAddDel(const virMacAddr *mac, const char *ifname, struct nlmsgerr *err; unsigned int recvbuflen; struct ndmsg ndm = { .ndm_family = PF_BRIDGE, .ndm_state = NUD_NOARP }; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + g_autoptr(virNetlinkMsg) nl_msg = NULL; g_autofree struct nlmsghdr *resp = NULL; if (virNetDevGetIndex(ifname, &ndm.ndm_ifindex) < 0) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index bc31581f77..1bd18ea30a 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -166,8 +166,8 @@ virNetDevIPAddrAdd(const char *ifname, unsigned int prefix) { unsigned int recvbuflen; - VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; - VIR_AUTOPTR(virSocketAddr) broadcast = NULL; + g_autoptr(virNetlinkMsg) nlmsg = NULL; + g_autoptr(virSocketAddr) broadcast = NULL; g_autofree struct nlmsghdr *resp = NULL; g_autofree char *ipStr = NULL; g_autofree char *peerStr = NULL; @@ -239,7 +239,7 @@ virNetDevIPAddrDel(const char *ifname, unsigned int prefix) { unsigned int recvbuflen; - VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; + g_autoptr(virNetlinkMsg) nlmsg = NULL; g_autofree struct nlmsghdr *resp = NULL; if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifname, @@ -289,7 +289,7 @@ virNetDevIPRouteAdd(const char *ifname, int errCode; virSocketAddr defaultAddr; virSocketAddrPtr actualAddr; - VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; + g_autoptr(virNetlinkMsg) nlmsg = NULL; g_autofree char *toStr = NULL; g_autofree char *viaStr = NULL; g_autofree struct nlmsghdr *resp = NULL; @@ -431,7 +431,7 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) unsigned int recvbuflen; bool dad = true; time_t max_time = time(NULL) + VIR_DAD_WAIT_TIMEOUT; - VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; + g_autoptr(virNetlinkMsg) nlmsg = NULL; if (!(nlmsg = nlmsg_alloc_simple(RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP))) { @@ -620,7 +620,7 @@ virNetDevIPCheckIPv6Forwarding(void) .devices = NULL, .ndevices = 0 }; - VIR_AUTOPTR(virNetlinkMsg) nlmsg = NULL; + g_autoptr(virNetlinkMsg) nlmsg = NULL; /* Prepare the request message */ @@ -688,7 +688,7 @@ virNetDevIPAddrAdd(const char *ifname, unsigned int prefix) { virSocketAddr broadcast; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *addrstr = NULL; g_autofree char *bcaststr = NULL; g_autofree char *peerstr = NULL; @@ -743,7 +743,7 @@ virNetDevIPAddrDel(const char *ifname, virSocketAddr *addr, unsigned int prefix) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *addrstr = NULL; if (!(addrstr = virSocketAddrFormat(addr))) @@ -778,7 +778,7 @@ virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr gateway, unsigned int metric) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *addrstr = NULL; g_autofree char *gatewaystr = NULL; diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 0e02824acc..4c388b6c55 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1117,9 +1117,9 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, } if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) { - VIR_AUTOPTR(virMacAddr) MAC = NULL; - VIR_AUTOPTR(virMacAddr) adminMAC = NULL; - VIR_AUTOPTR(virNetDevVlan) vlan = NULL; + g_autoptr(virMacAddr) MAC = NULL; + g_autoptr(virMacAddr) adminMAC = NULL; + g_autoptr(virNetDevVlan) vlan = NULL; if ((virNetDevReadNetConfig(linkdev, -1, stateDir, &adminMAC, &vlan, &MAC) == 0) && diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index a3c0da85a0..6e13c0f684 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -141,7 +141,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, char macaddrstr[VIR_MAC_STRING_BUFLEN]; char ifuuidstr[VIR_UUID_STRING_BUFLEN]; char vmuuidstr[VIR_UUID_STRING_BUFLEN]; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *attachedmac_ex_id = NULL; g_autofree char *ifaceid_ex_id = NULL; g_autofree char *profile_ex_id = NULL; @@ -213,7 +213,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, */ int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char *ifname) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNew(OVSVSCTL); virNetDevOpenvswitchAddTimeout(cmd); @@ -240,7 +240,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) { size_t len; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNew(OVSVSCTL); virNetDevOpenvswitchAddTimeout(cmd); @@ -276,7 +276,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) */ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (!migrate) { VIR_DEBUG("No OVS port data for interface %s", ifname); @@ -315,7 +315,7 @@ int virNetDevOpenvswitchInterfaceParseStats(const char *json, virDomainInterfaceStatsPtr stats) { - VIR_AUTOPTR(virJSONValue) jsonStats = NULL; + g_autoptr(virJSONValue) jsonStats = NULL; virJSONValuePtr jsonMap = NULL; size_t i; @@ -386,7 +386,7 @@ int virNetDevOpenvswitchInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *output = NULL; cmd = virCommandNew(OVSVSCTL); @@ -504,7 +504,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, size_t ntokens = 0; int status; int ret = -1; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; /* Openvswitch vhostuser path are hardcoded to * /<runstatedir>/openvswitch/<ifname> @@ -550,7 +550,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, int virNetDevOpenvswitchUpdateVlan(const char *ifname, virNetDevVlanPtr virtVlan) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNew(OVSVSCTL); virNetDevOpenvswitchAddTimeout(cmd); diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 36a1e89c9e..4e10cdf12b 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -120,7 +120,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) for (i = 0; i < MAX_VETH_RETRIES; i++) { g_autofree char *veth1auto = NULL; g_autofree char *veth2auto = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; int status; if (!*veth1) { @@ -195,7 +195,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) int virNetDevVethDelete(const char *veth) { int status; - VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList("ip", "link", + g_autoptr(virCommand) cmd = virCommandNewArgList("ip", "link", "del", veth, NULL); if (virCommandRun(cmd, &status) < 0) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 34c3f28087..90049b58a1 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -297,7 +297,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, }; struct pollfd fds[1]; g_autofree struct nlmsghdr *temp_resp = NULL; - VIR_AUTOPTR(virNetlinkHandle) nlhandle = NULL; + g_autoptr(virNetlinkHandle) nlhandle = NULL; int len = 0; memset(fds, 0, sizeof(fds)); @@ -338,7 +338,7 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg, .nl_pid = dst_pid, .nl_groups = 0, }; - VIR_AUTOPTR(virNetlinkHandle) nlhandle = NULL; + g_autoptr(virNetlinkHandle) nlhandle = NULL; if (!(nlhandle = virNetlinkSendRequest(nl_msg, src_pid, nladdr, protocol, groups))) @@ -396,7 +396,7 @@ virNetlinkDumpLink(const char *ifname, int ifindex, .ifi_index = ifindex }; unsigned int recvbuflen; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + g_autoptr(virNetlinkMsg) nl_msg = NULL; g_autofree struct nlmsghdr *resp = NULL; if (ifname && ifindex <= 0 && virNetDevGetIndex(ifname, &ifindex) < 0) @@ -507,7 +507,7 @@ virNetlinkNewLink(const char *ifname, struct nlattr *infodata = NULL; unsigned int buflen; struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + g_autoptr(virNetlinkMsg) nl_msg = NULL; g_autofree struct nlmsghdr *resp = NULL; *error = 0; @@ -613,7 +613,7 @@ virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback) struct nlmsgerr *err; struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; unsigned int recvbuflen; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + g_autoptr(virNetlinkMsg) nl_msg = NULL; g_autofree struct nlmsghdr *resp = NULL; nl_msg = nlmsg_alloc_simple(RTM_DELLINK, @@ -697,7 +697,7 @@ virNetlinkGetNeighbor(void **nlData, uint32_t src_pid, uint32_t dst_pid) .ndm_family = AF_UNSPEC, }; unsigned int recvbuflen; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + g_autoptr(virNetlinkMsg) nl_msg = NULL; g_autofree struct nlmsghdr *resp = NULL; nl_msg = nlmsg_alloc_simple(RTM_GETNEIGH, NLM_F_DUMP | NLM_F_REQUEST); diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index c58d429fdb..f81ea1ce02 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -239,7 +239,7 @@ int virNodeSuspend(unsigned int target, static int virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *binary = NULL; int status; diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 37a5fc894b..6f3f0420d2 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -57,7 +57,7 @@ char * virNumaGetAutoPlacementAdvice(unsigned short vcpus, unsigned long long balloon) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; char *output = NULL; cmd = virCommandNewArgList(NUMAD, "-w", NULL); @@ -259,7 +259,7 @@ virNumaGetNodeCPUs(int node, size_t i; g_autofree unsigned long *mask = NULL; g_autofree unsigned long *allonesmask = NULL; - VIR_AUTOPTR(virBitmap) cpumap = NULL; + g_autoptr(virBitmap) cpumap = NULL; *cpus = NULL; @@ -312,7 +312,7 @@ int virNumaNodesetToCPUset(virBitmapPtr nodeset, virBitmapPtr *cpuset) { - VIR_AUTOPTR(virBitmap) allNodesCPUs = NULL; + g_autoptr(virBitmap) allNodesCPUs = NULL; size_t nodesetSize; size_t i; @@ -325,7 +325,7 @@ virNumaNodesetToCPUset(virBitmapPtr nodeset, nodesetSize = virBitmapSize(nodeset); for (i = 0; i < nodesetSize; i++) { - VIR_AUTOPTR(virBitmap) nodeCPUs = NULL; + g_autoptr(virBitmap) nodeCPUs = NULL; if (!virBitmapIsBitSet(nodeset, i)) continue; diff --git a/src/util/virpci.c b/src/util/virpci.c index ed053ed9f5..fa1c67b4cb 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -460,7 +460,7 @@ virPCIDeviceIterDevices(virPCIDeviceIterPredicate predicate, while ((ret = virDirRead(dir, &entry, PCI_SYSFS "devices")) > 0) { unsigned int domain, bus, slot, function; - VIR_AUTOPTR(virPCIDevice) check = NULL; + g_autoptr(virPCIDevice) check = NULL; char *tmp; /* expected format: <domain>:<bus>:<slot>.<function> */ @@ -782,8 +782,8 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevicePtr dev, int cfgfd, virPCIDeviceList *inactiveDevs) { - VIR_AUTOPTR(virPCIDevice) parent = NULL; - VIR_AUTOPTR(virPCIDevice) conflict = NULL; + g_autoptr(virPCIDevice) parent = NULL; + g_autoptr(virPCIDevice) conflict = NULL; uint8_t config_space[PCI_CONF_LEN]; uint16_t ctl; int ret = -1; @@ -1370,7 +1370,7 @@ virPCIDeviceNew(unsigned int domain, unsigned int slot, unsigned int function) { - VIR_AUTOPTR(virPCIDevice) dev = NULL; + g_autoptr(virPCIDevice) dev = NULL; g_autofree char *vendor = NULL; g_autofree char *product = NULL; @@ -1624,7 +1624,7 @@ virPCIDeviceListAdd(virPCIDeviceListPtr list, int virPCIDeviceListAddCopy(virPCIDeviceListPtr list, virPCIDevicePtr dev) { - VIR_AUTOPTR(virPCIDevice) copy = virPCIDeviceCopy(dev); + g_autoptr(virPCIDevice) copy = virPCIDeviceCopy(dev); if (!copy) return -1; @@ -1834,7 +1834,7 @@ static int virPCIDeviceGetIOMMUGroupAddOne(virPCIDeviceAddressPtr newDevAddr, void *opaque) { virPCIDeviceListPtr groupList = opaque; - VIR_AUTOPTR(virPCIDevice) newDev = NULL; + g_autoptr(virPCIDevice) newDev = NULL; if (!(newDev = virPCIDeviceNew(newDevAddr->domain, newDevAddr->bus, newDevAddr->slot, newDevAddr->function))) @@ -2057,7 +2057,7 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) static int virPCIDeviceIsBehindSwitchLackingACS(virPCIDevicePtr dev) { - VIR_AUTOPTR(virPCIDevice) parent = NULL; + g_autoptr(virPCIDevice) parent = NULL; if (virPCIDeviceGetParent(dev, &parent) < 0) return -1; @@ -2081,7 +2081,7 @@ virPCIDeviceIsBehindSwitchLackingACS(virPCIDevicePtr dev) * parent can be found */ do { - VIR_AUTOPTR(virPCIDevice) tmp = NULL; + g_autoptr(virPCIDevice) tmp = NULL; int acs; int ret; @@ -2616,7 +2616,7 @@ virPCIGetMdevTypes(const char *sysfspath, DIR *dir = NULL; struct dirent *entry; g_autofree char *types_path = NULL; - VIR_AUTOPTR(virMediatedDeviceType) mdev_type = NULL; + g_autoptr(virMediatedDeviceType) mdev_type = NULL; virMediatedDeviceTypePtr *mdev_types = NULL; size_t ntypes = 0; size_t i; diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 2fccfc24ff..162c3c603f 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -56,7 +56,7 @@ virQEMUBuildCommandLineJSONArrayBitmap(const char *key, { ssize_t pos = -1; ssize_t end; - VIR_AUTOPTR(virBitmap) bitmap = NULL; + g_autoptr(virBitmap) bitmap = NULL; if (virJSONValueGetArrayAsBitmap(array, &bitmap) < 0) return -1; diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 5cae15afd2..425d7adfe9 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -183,7 +183,7 @@ virSCSIDeviceNew(const char *sysfs_prefix, bool readonly, bool shareable) { - VIR_AUTOPTR(virSCSIDevice) dev = NULL; + g_autoptr(virSCSIDevice) dev = NULL; virSCSIDevicePtr ret = NULL; g_autofree char *sg = NULL; g_autofree char *vendor_path = NULL; @@ -273,7 +273,7 @@ virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, const char *drvname, const char *domname) { - VIR_AUTOPTR(virUsedByInfo) copy = NULL; + g_autoptr(virUsedByInfo) copy = NULL; if (VIR_ALLOC(copy) < 0) return -1; @@ -440,7 +440,7 @@ virSCSIDeviceListDel(virSCSIDeviceListPtr list, virSCSIDeviceUsedByInfoFree(dev->used_by[i]); VIR_DELETE_ELEMENT(dev->used_by, i, dev->n_used_by); } else { - VIR_AUTOPTR(virSCSIDevice) tmp = NULL; + g_autoptr(virSCSIDevice) tmp = NULL; tmp = virSCSIDeviceListSteal(list, dev); } break; diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index cbd9069146..9ba0d3f2a0 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -250,7 +250,7 @@ virSCSIVHostDeviceGetPath(virSCSIVHostDevicePtr dev) virSCSIVHostDevicePtr virSCSIVHostDeviceNew(const char *name) { - VIR_AUTOPTR(virSCSIVHostDevice) dev = NULL; + g_autoptr(virSCSIVHostDevice) dev = NULL; virSCSIVHostDevicePtr ret = NULL; if (VIR_ALLOC(dev) < 0) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 5726e62e68..51d80b1cb8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1369,7 +1369,7 @@ int virStorageFileGetLVMKey(const char *path, */ int status; int ret = -1; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList(LVS, "--noheadings", "--unbuffered", "--nosuffix", @@ -1442,7 +1442,7 @@ virStorageFileGetSCSIKey(const char *path, bool ignoreError G_GNUC_UNUSED) { int status; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList("/lib/udev/scsi_id", "--replace-whitespace", @@ -1510,7 +1510,7 @@ virStorageFileGetNPIVKey(const char *path, const char *serial; const char *port; g_autofree char *outbuf = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; cmd = virCommandNewArgList("/lib/udev/scsi_id", "--replace-whitespace", @@ -1852,7 +1852,7 @@ virStorageAuthDefPtr virStorageAuthDefCopy(const virStorageAuthDef *src) { virStorageAuthDefPtr ret = NULL; - VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; + g_autoptr(virStorageAuthDef) authdef = NULL; if (VIR_ALLOC(authdef) < 0) return NULL; @@ -1879,7 +1879,7 @@ virStorageAuthDefParse(xmlNodePtr node, xmlNodePtr saveNode = ctxt->node; virStorageAuthDefPtr ret = NULL; xmlNodePtr secretnode = NULL; - VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; + g_autoptr(virStorageAuthDef) authdef = NULL; g_autofree char *authtype = NULL; ctxt->node = node; @@ -2680,7 +2680,7 @@ static int virStorageSourceParseBackingURI(virStorageSourcePtr src, const char *uristr) { - VIR_AUTOPTR(virURI) uri = NULL; + g_autoptr(virURI) uri = NULL; const char *path = NULL; VIR_AUTOSTRINGLIST scheme = NULL; @@ -2829,7 +2829,7 @@ virStorageSourceParseRBDColonString(const char *rbdstr, { char *p, *e, *next; g_autofree char *options = NULL; - VIR_AUTOPTR(virStorageAuthDef) authdef = NULL; + g_autoptr(virStorageAuthDef) authdef = NULL; /* optionally skip the "rbd:" prefix if provided */ if (STRPREFIX(rbdstr, "rbd:")) @@ -3615,7 +3615,7 @@ static int virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src, virJSONValuePtr json) { - VIR_AUTOPTR(virJSONValue) deflattened = NULL; + g_autoptr(virJSONValue) deflattened = NULL; virJSONValuePtr file; const char *drvname; size_t i; @@ -3656,7 +3656,7 @@ static int virStorageSourceParseBackingJSON(virStorageSourcePtr src, const char *json) { - VIR_AUTOPTR(virJSONValue) root = NULL; + g_autoptr(virJSONValue) root = NULL; if (!(root = virJSONValueFromString(json))) return -1; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 9d5e36ba7b..c7702c8c25 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -174,7 +174,7 @@ virTPMExecGetCaps(virCommandPtr cmd, int exitstatus; virBitmapPtr bitmap; g_autofree char *outbuf = NULL; - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; virJSONValuePtr featureList; virJSONValuePtr item; size_t idx; @@ -234,7 +234,7 @@ static virBitmapPtr virTPMGetCaps(TypeFromStringFn typeFromStringFn, const char *exec, const char *param1) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (!(cmd = virCommandNew(exec))) return NULL; diff --git a/src/util/virusb.c b/src/util/virusb.c index 9ff16a769c..036a7caf79 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -120,7 +120,7 @@ virUSBDeviceSearch(unsigned int vendor, struct dirent *de; virUSBDeviceListPtr list = NULL; virUSBDeviceListPtr ret = NULL; - VIR_AUTOPTR(virUSBDevice) usb = NULL; + g_autoptr(virUSBDevice) usb = NULL; int direrr; if (!(list = virUSBDeviceListNew())) diff --git a/src/util/virutil.c b/src/util/virutil.c index 742acd8b9b..cf3a397516 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1481,7 +1481,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, void virWaitForDevices(void) { - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *udev = NULL; int exitstatus; diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 1ef4a39667..ba5b876ffb 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -414,7 +414,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, PRUint32 variant = HardDiskVariant_Standard; resultCodeUnion resultCode; virStorageVolPtr ret = NULL; - VIR_AUTOPTR(virStorageVolDef) def = NULL; + g_autoptr(virStorageVolDef) def = NULL; if (!data->vboxObj) return ret; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 6e0467d251..5396353412 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1275,7 +1275,7 @@ virVMXParseConfig(virVMXContext *ctx, const char *vmx) { bool success = false; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; char *encoding = NULL; char *utf8; virDomainDefPtr def = NULL; diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index e8c892fdd6..3bf1271b3e 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -46,11 +46,11 @@ static int testBackingXMLjsonXML(const void *args) { const struct testBackingXMLjsonXMLdata *data = args; - VIR_AUTOPTR(xmlDoc) xml = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) xml = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - VIR_AUTOPTR(virJSONValue) backendprops = NULL; - VIR_AUTOPTR(virJSONValue) wrapper = NULL; + g_autoptr(virJSONValue) backendprops = NULL; + g_autoptr(virJSONValue) wrapper = NULL; g_autofree char *propsstr = NULL; g_autofree char *protocolwrapper = NULL; g_autofree char *actualxml = NULL; @@ -193,7 +193,7 @@ testQemuDiskXMLToProps(const void *opaque) virStorageSourcePtr n; virJSONValuePtr formatProps = NULL; virJSONValuePtr storageProps = NULL; - VIR_AUTOPTR(virJSONValue) storageSrcOnlyProps = NULL; + g_autoptr(virJSONValue) storageSrcOnlyProps = NULL; char *xmlpath = NULL; char *xmlstr = NULL; int ret = -1; @@ -363,8 +363,8 @@ testQemuImageCreateLoadDiskXML(const char *name, { virDomainSnapshotDiskDefPtr diskdef = NULL; - VIR_AUTOPTR(xmlDoc) doc = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) doc = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; xmlNodePtr node; g_autofree char *xmlpath = NULL; virStorageSourcePtr ret = NULL; @@ -398,8 +398,8 @@ static int testQemuImageCreate(const void *opaque) { struct testQemuImageCreateData *data = (void *) opaque; - VIR_AUTOPTR(virJSONValue) protocolprops = NULL; - VIR_AUTOPTR(virJSONValue) formatprops = NULL; + g_autoptr(virJSONValue) protocolprops = NULL; + g_autoptr(virJSONValue) formatprops = NULL; VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) actualbuf = VIR_BUFFER_INITIALIZER; diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index ca396b36b1..9287ea554b 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -18,9 +18,9 @@ testParseFormatFW(const void *opaque) { const char *filename = opaque; g_autofree char *path = NULL; - VIR_AUTOPTR(qemuFirmware) fw = NULL; + g_autoptr(qemuFirmware) fw = NULL; g_autofree char *buf = NULL; - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; g_autofree char *expected = NULL; g_autofree char *actual = NULL; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 76b131295a..d3da08875a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -591,7 +591,7 @@ testQemuHotplugCpuIndividual(const void *opaque) static int mymain(void) { - VIR_AUTOPTR(virHashTable) qmpschema = NULL; + g_autoptr(virHashTable) qmpschema = NULL; int ret = 0; struct qemuHotplugTestData data = {0}; struct testQemuHotplugCpuParams cpudata; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index b989e3897f..f754e4d94b 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -154,7 +154,7 @@ testQemuMonitorJSONGetStatus(const void *opaque) virDomainXMLOptionPtr xmlopt = data->xmlopt; bool running = false; virDomainPausedReason reason = 0; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -247,7 +247,7 @@ testQemuMonitorJSONGetVersion(const void *opaque) int minor; int micro; char *package = NULL; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -351,7 +351,7 @@ testQemuMonitorJSONGetMachines(const void *opaque) const char *null = NULL; size_t i; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -432,7 +432,7 @@ testQemuMonitorJSONGetCPUDefinitions(const void *opaque) qemuMonitorCPUDefInfoPtr *cpus = NULL; int ncpus = 0; size_t i; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -515,7 +515,7 @@ testQemuMonitorJSONGetCommands(const void *opaque) char **commands = NULL; int ncommands = 0; size_t i; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -579,7 +579,7 @@ testQemuMonitorJSONGetTPMModels(const void *opaque) int ret = -1; char **tpmmodels = NULL; int ntpmmodels = 0; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -633,7 +633,7 @@ testQemuMonitorJSONGetCommandLineOptionParameters(const void *opaque) char **params = NULL; int nparams = 0; bool found = false; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -947,7 +947,7 @@ testQemuMonitorJSONDetachChardev(const void *opaque) { const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -980,7 +980,7 @@ testQemuMonitorJSONGetListPaths(const void *opaque) qemuMonitorJSONListPathPtr *paths; int npaths = 0; size_t i; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1055,7 +1055,7 @@ testQemuMonitorJSONGetObjectProperty(const void *opaque) const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; qemuMonitorJSONObjectProperty prop; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1095,7 +1095,7 @@ testQemuMonitorJSONSetObjectProperty(const void *opaque) const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; qemuMonitorJSONObjectProperty prop; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1148,7 +1148,7 @@ testQemuMonitorJSONGetDeviceAliases(const void *opaque) const char **alias; const char *expected[] = { "virtio-disk25", "video0", "serial0", "ide0-0-0", "usb", NULL }; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1205,7 +1205,7 @@ testQemuMonitorJSONCPU(const void *opaque) virDomainXMLOptionPtr xmlopt = data->xmlopt; bool running = false; virDomainPausedReason reason = 0; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1260,7 +1260,7 @@ testQemuMonitorJSONSimpleFunc(const void *opaque) (testQemuMonitorJSONSimpleFuncDataPtr) opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; const char *reply = data->reply; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1284,7 +1284,7 @@ testQemuMonitorJSON ## funcName(const void *opaque) \ const testQemuMonitorJSONSimpleFuncData *data = opaque; \ virDomainXMLOptionPtr xmlopt = data->xmlopt; \ const char *reply = data->reply; \ - VIR_AUTOPTR(qemuMonitorTest) test = NULL; \ + g_autoptr(qemuMonitorTest) test = NULL; \ \ if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) \ return -1; \ @@ -1358,7 +1358,7 @@ testQemuMonitorJSONqemuMonitorJSONNBDServerStart(const void *opaque) .socket = (char *)"/tmp/sock", .transport = VIR_STORAGE_NET_HOST_TRANS_UNIX, }; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1387,8 +1387,8 @@ testQemuMonitorJSONqemuMonitorJSONMergeBitmaps(const void *opaque) { const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; - VIR_AUTOPTR(virJSONValue) arr = NULL; + g_autoptr(qemuMonitorTest) test = NULL; + g_autoptr(virJSONValue) arr = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1481,7 +1481,7 @@ testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *opaque) {0, 17629, (char *) "/machine/unattached/device[0]", false}, {1, 17630, (char *) "/machine/unattached/device[1]", false}, }; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1562,7 +1562,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *opaque) const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; unsigned long long currmem; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1594,7 +1594,7 @@ testQemuMonitorJSONqemuMonitorJSONGetVirtType(const void *opaque) const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; virDomainVirtType virtType; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1671,7 +1671,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque) int ret = -1; virHashTablePtr blockDevices = NULL, expectedBlockDevices = NULL; struct qemuDomainDiskInfo *info; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1750,7 +1750,7 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque) virHashTablePtr blockstats = NULL; qemuBlockStatsPtr stats; int ret = -1; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; const char *reply = "{" @@ -1910,7 +1910,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *opaque) const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; unsigned long long cacheSize; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -1944,7 +1944,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *opaque) int ret = -1; qemuMonitorMigrationStats stats, expectedStats; char *error = NULL; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2042,7 +2042,7 @@ testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *opaque) qemuMonitorChardevInfo info1 = { (char *) "/dev/pts/21", VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED }; qemuMonitorChardevInfo info2 = { (char *) "/dev/pts/20", VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT }; qemuMonitorChardevInfo info3 = { NULL, VIR_DOMAIN_CHR_DEVICE_STATE_DISCONNECTED }; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2159,7 +2159,7 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *opaque) virDomainXMLOptionPtr xmlopt = data->xmlopt; int ret = -1; virDomainBlockIoTuneInfo info, expectedInfo; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2214,7 +2214,7 @@ testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *opaque) virDomainXMLOptionPtr xmlopt = data->xmlopt; int ret = -1; char *arch; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2264,7 +2264,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *opaque) " ]," " \"id\": \"libvirt-22\"" "}"; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2310,7 +2310,7 @@ testQemuMonitorJSONqemuMonitorJSONSendKey(const void *opaque) const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; unsigned int keycodes[] = {43, 26, 46, 32}; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2332,7 +2332,7 @@ testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *opaque) const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; unsigned int keycodes[] = {43, 26, 46, 32}; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2374,7 +2374,7 @@ testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *opaque) " \"desc\": \"Parameter 'top' is missing\"" " }" "}"; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2416,7 +2416,7 @@ testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *opaqu " }," " \"id\": \"libvirt-9\"" "}"; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2455,7 +2455,7 @@ testQemuMonitorJSONGetCPUData(const void *opaque) char *jsonStr = NULL; char *actual = NULL; int ret = -1; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; @@ -2517,7 +2517,7 @@ testQemuMonitorJSONGetNonExistingCPUData(const void *opaque) virDomainXMLOptionPtr xmlopt = data->xmlopt; virCPUDataPtr cpuData = NULL; int rv, ret = -1; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2562,7 +2562,7 @@ testQemuMonitorJSONGetIOThreads(const void *opaque) int ninfo = 0; int ret = -1; size_t i; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; @@ -2708,7 +2708,7 @@ testQemuMonitorCPUInfo(const void *opaque) qemuMonitorCPUInfoPtr vcpus = NULL; int rc; int ret = -1; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; + g_autoptr(qemuMonitorTest) test = NULL; if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; @@ -3008,9 +3008,9 @@ static int testQemuMonitorJSONTransaction(const void *opaque) { const testGenericData *data = opaque; - VIR_AUTOPTR(qemuMonitorTest) test = NULL; - VIR_AUTOPTR(virJSONValue) actions = NULL; - VIR_AUTOPTR(virJSONValue) mergebitmaps = NULL; + g_autoptr(qemuMonitorTest) test = NULL; + g_autoptr(virJSONValue) actions = NULL; + g_autoptr(virJSONValue) mergebitmaps = NULL; if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index cc196263f3..6b3aa97e39 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -513,7 +513,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test, { g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; virJSONValuePtr schemaroot; - VIR_AUTOPTR(virJSONValue) emptyargs = NULL; + g_autoptr(virJSONValue) emptyargs = NULL; g_autofree char *schemapath = NULL; if (!test->qapischema) @@ -568,7 +568,7 @@ qemuMonitorTestProcessCommandDefault(qemuMonitorTestPtr test, const char *cmdstr) { struct qemuMonitorTestHandlerData *data = item->opaque; - VIR_AUTOPTR(virJSONValue) val = NULL; + g_autoptr(virJSONValue) val = NULL; virJSONValuePtr cmdargs = NULL; const char *cmdname; int rc; @@ -624,7 +624,7 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test, struct qemuMonitorTestHandlerData *data = item->opaque; g_autofree char *reformatted = NULL; g_autofree char *errmsg = NULL; - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; virJSONValuePtr cmdargs; const char *cmdname; int ret = -1; diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index b25f7f65b0..0ee96d9ecc 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -18,9 +18,9 @@ testParseFormatVU(const void *opaque) { const char *filename = opaque; g_autofree char *path = NULL; - VIR_AUTOPTR(qemuVhostUser) vu = NULL; + g_autoptr(qemuVhostUser) vu = NULL; g_autofree char *buf = NULL; - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; g_autofree char *expected = NULL; g_autofree char *actual = NULL; diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index ae038a78ea..6504881920 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -58,7 +58,7 @@ test_node_info_parser(const void *opaque) const struct testNodeInfoParserData *data = opaque; collie_test test = data->data; g_autofree char *output = NULL; - VIR_AUTOPTR(virStoragePoolDef) pool = NULL; + g_autoptr(virStoragePoolDef) pool = NULL; if (!(pool = virStoragePoolDefParseFile(data->poolxml))) return -1; @@ -86,8 +86,8 @@ test_vdi_list_parser(const void *opaque) const struct testVDIListParserData *data = opaque; collie_test test = data->data; g_autofree char *output = NULL; - VIR_AUTOPTR(virStoragePoolDef) pool = NULL; - VIR_AUTOPTR(virStorageVolDef) vol = NULL; + g_autoptr(virStoragePoolDef) pool = NULL; + g_autoptr(virStorageVolDef) vol = NULL; if (!(pool = virStoragePoolDefParseFile(data->poolxml))) return -1; diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c index 766588c369..2ec7cbef66 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -28,7 +28,7 @@ testCompareXMLToArgvFiles(bool shouldFail, const char *defTypeStr; g_autofree char *actualCmdline = NULL; g_autofree char *src = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; if (!(def = virStoragePoolDefParseFile(poolxml))) goto cleanup; diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 4fb37c976a..0f7bc27293 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -19,7 +19,7 @@ static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml) { g_autofree char *actual = NULL; - VIR_AUTOPTR(virStoragePoolDef) dev = NULL; + g_autoptr(virStoragePoolDef) dev = NULL; if (!(dev = virStoragePoolDefParseFile(inxml))) return -1; diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 955620eb47..af90aa6953 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -47,10 +47,10 @@ testCompareXMLToArgvFiles(bool shouldFail, virStoragePoolDefPtr def = NULL; virStoragePoolObjPtr obj = NULL; g_autofree char *actualCmdline = NULL; - VIR_AUTOPTR(virStorageVolDef) vol = NULL; - VIR_AUTOPTR(virStorageVolDef) inputvol = NULL; - VIR_AUTOPTR(virStoragePoolDef) inputpool = NULL; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virStorageVolDef) vol = NULL; + g_autoptr(virStorageVolDef) inputvol = NULL; + g_autoptr(virStoragePoolDef) inputpool = NULL; + g_autoptr(virCommand) cmd = NULL; if (!(def = virStoragePoolDefParseFile(poolxml))) goto cleanup; diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 2d15480c96..0c8cecc10d 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -18,8 +18,8 @@ testCompareXMLToXMLFiles(const char *poolxml, const char *inxml, const char *outxml, unsigned int flags) { g_autofree char *actual = NULL; - VIR_AUTOPTR(virStoragePoolDef) pool = NULL; - VIR_AUTOPTR(virStorageVolDef) dev = NULL; + g_autoptr(virStoragePoolDef) pool = NULL; + g_autoptr(virStorageVolDef) dev = NULL; if (!(pool = virStoragePoolDefParseFile(poolxml))) return -1; diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index ff6b506b7d..545e9272df 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -745,9 +745,9 @@ static int test15(const void *opaque) { const struct testBinaryOpData *data = opaque; - VIR_AUTOPTR(virBitmap) amap = NULL; - VIR_AUTOPTR(virBitmap) bmap = NULL; - VIR_AUTOPTR(virBitmap) resmap = NULL; + g_autoptr(virBitmap) amap = NULL; + g_autoptr(virBitmap) bmap = NULL; + g_autoptr(virBitmap) resmap = NULL; if (!(amap = virBitmapParseUnlimited(data->a)) || !(bmap = virBitmapParseUnlimited(data->b)) || diff --git a/tests/virconftest.c b/tests/virconftest.c index eb8c9cb579..1ad34caec6 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -33,7 +33,7 @@ static int testConfRoundTrip(const void *opaque) { const char *name = opaque; int ret = -1; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; int len = 10000; char *buffer = NULL; char *srcfile = NULL; @@ -79,7 +79,7 @@ static int testConfMemoryNoNewline(const void *opaque G_GNUC_UNUSED) "string = 'foo'\n" \ "uint = 12345"; - VIR_AUTOPTR(virConf) conf = virConfReadString(srcdata, 0); + g_autoptr(virConf) conf = virConfReadString(srcdata, 0); int ret = -1; virConfValuePtr val; unsigned long long llvalue; @@ -148,7 +148,7 @@ static int testConfParseInt(const void *opaque G_GNUC_UNUSED) "ssize_t = -87539319\n" \ "string = \"foo\"\n"; - VIR_AUTOPTR(virConf) conf = virConfReadString(srcdata, 0); + g_autoptr(virConf) conf = virConfReadString(srcdata, 0); int iv; unsigned int ui; size_t s; @@ -293,7 +293,7 @@ static int testConfParseBool(const void *opaque G_GNUC_UNUSED) "int = 6963472309248\n" \ "string = \"foo\"\n"; - VIR_AUTOPTR(virConf) conf = virConfReadString(srcdata, 0); + g_autoptr(virConf) conf = virConfReadString(srcdata, 0); bool f = true; bool t = false; @@ -353,7 +353,7 @@ static int testConfParseString(const void *opaque G_GNUC_UNUSED) "string = \"foo\"\n"; int ret = -1; - VIR_AUTOPTR(virConf) conf = virConfReadString(srcdata, 0); + g_autoptr(virConf) conf = virConfReadString(srcdata, 0); char *str = NULL; if (!conf) @@ -392,7 +392,7 @@ static int testConfParseStringList(const void *opaque G_GNUC_UNUSED) "string = \"foo\"\n"; int ret = -1; - VIR_AUTOPTR(virConf) conf = virConfReadString(srcdata, 0); + g_autoptr(virConf) conf = virConfReadString(srcdata, 0); char **str = NULL; if (!conf) diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 13717ad522..f72e70879b 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -20,7 +20,7 @@ static int testJSONFromFile(const void *data) { const struct testInfo *info = data; - VIR_AUTOPTR(virJSONValue) injson = NULL; + g_autoptr(virJSONValue) injson = NULL; g_autofree char *infile = NULL; g_autofree char *indata = NULL; g_autofree char *outfile = NULL; @@ -66,7 +66,7 @@ static int testJSONFromString(const void *data) { const struct testInfo *info = data; - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; const char *expectstr = info->expect ? info->expect : info->doc; g_autofree char *formatted = NULL; @@ -107,8 +107,8 @@ static int testJSONAddRemove(const void *data) { const struct testInfo *info = data; - VIR_AUTOPTR(virJSONValue) json = NULL; - VIR_AUTOPTR(virJSONValue) name = NULL; + g_autoptr(virJSONValue) json = NULL; + g_autoptr(virJSONValue) name = NULL; g_autofree char *infile = NULL; g_autofree char *indata = NULL; g_autofree char *outfile = NULL; @@ -178,7 +178,7 @@ static int testJSONLookup(const void *data) { const struct testInfo *info = data; - VIR_AUTOPTR(virJSONValue) json = NULL; + g_autoptr(virJSONValue) json = NULL; virJSONValuePtr value = NULL; g_autofree char *result = NULL; int rc; @@ -279,8 +279,8 @@ static int testJSONCopy(const void *data) { const struct testInfo *info = data; - VIR_AUTOPTR(virJSONValue) json = NULL; - VIR_AUTOPTR(virJSONValue) jsonCopy = NULL; + g_autoptr(virJSONValue) json = NULL; + g_autoptr(virJSONValue) jsonCopy = NULL; g_autofree char *result = NULL; g_autofree char *resultCopy = NULL; @@ -343,8 +343,8 @@ static int testJSONDeflatten(const void *data) { const struct testInfo *info = data; - VIR_AUTOPTR(virJSONValue) injson = NULL; - VIR_AUTOPTR(virJSONValue) deflattened = NULL; + g_autoptr(virJSONValue) injson = NULL; + g_autoptr(virJSONValue) deflattened = NULL; g_autofree char *infile = NULL; g_autofree char *indata = NULL; g_autofree char *outfile = NULL; @@ -387,9 +387,9 @@ testJSONDeflatten(const void *data) static int testJSONEscapeObj(const void *data G_GNUC_UNUSED) { - VIR_AUTOPTR(virJSONValue) json = NULL; - VIR_AUTOPTR(virJSONValue) nestjson = NULL; - VIR_AUTOPTR(virJSONValue) parsejson = NULL; + g_autoptr(virJSONValue) json = NULL; + g_autoptr(virJSONValue) nestjson = NULL; + g_autoptr(virJSONValue) parsejson = NULL; g_autofree char *neststr = NULL; g_autofree char *result = NULL; const char *parsednestedstr; @@ -439,10 +439,10 @@ testJSONEscapeObj(const void *data G_GNUC_UNUSED) static int testJSONObjectFormatSteal(const void *opaque G_GNUC_UNUSED) { - VIR_AUTOPTR(virJSONValue) a1 = NULL; - VIR_AUTOPTR(virJSONValue) a2 = NULL; - VIR_AUTOPTR(virJSONValue) t1 = NULL; - VIR_AUTOPTR(virJSONValue) t2 = NULL; + g_autoptr(virJSONValue) a1 = NULL; + g_autoptr(virJSONValue) a2 = NULL; + g_autoptr(virJSONValue) t1 = NULL; + g_autoptr(virJSONValue) t2 = NULL; if (!(a1 = virJSONValueNewString("test")) || !(a2 = virJSONValueNewString("test"))) { diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xmltest.c index 9cbb327d92..973fee5747 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -38,7 +38,7 @@ testCompareXMLToXMLFiles(const char *expected) { char *actual = NULL; int ret = -1; - VIR_AUTOPTR(virNetworkPortDef) dev = NULL; + g_autoptr(virNetworkPortDef) dev = NULL; if (!(dev = virNetworkPortDefParseFile(expected))) goto cleanup; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index c3a2cc10c8..6cec458088 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -117,7 +117,7 @@ testPrepImages(void) { int ret = EXIT_FAILURE; bool compat = false; - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *buf = NULL; qemuimg = virFindFileInPath("qemu-img"); @@ -663,7 +663,7 @@ mymain(void) struct testBackingParseData data5; virStorageSourcePtr chain2; /* short for chain->backingStore */ virStorageSourcePtr chain3; /* short for chain2->backingStore */ - VIR_AUTOPTR(virCommand) cmd = NULL; + g_autoptr(virCommand) cmd = NULL; VIR_AUTOUNREF(virStorageSourcePtr) chain = NULL; if (storageRegisterAll() < 0) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 109e0a5456..1a78f006cc 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -553,7 +553,7 @@ testActivation(bool useNames) virSystemdActivationMap map[2]; int *fds = NULL; size_t nfds = 0; - VIR_AUTOPTR(virSystemdActivation) act = NULL; + g_autoptr(virSystemdActivation) act = NULL; g_auto(virBuffer) names = VIR_BUFFER_INITIALIZER; virBufferAddLit(&names, "demo-unix.socket"); diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index f49202d292..8e84c84887 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -68,7 +68,7 @@ static int testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars) { char *gotxlcfgData = NULL; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; virConnectPtr conn = NULL; int wrote = 4096; int ret = -1; @@ -128,7 +128,7 @@ testCompareFormatXML(const char *xlcfg, const char *xml, bool replaceVars) { char *xlcfgData = NULL; char *gotxml = NULL; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; int ret = -1; virConnectPtr conn; virDomainDefPtr def = NULL; diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 484b023a1c..b67b14ea9d 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -41,7 +41,7 @@ static int testCompareParseXML(const char *xmcfg, const char *xml) { char *gotxmcfgData = NULL; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; int ret = -1; virConnectPtr conn = NULL; int wrote = 4096; @@ -87,7 +87,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml) { char *xmcfgData = NULL; char *gotxml = NULL; - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; int ret = -1; virDomainDefPtr def = NULL; diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 68ccd73056..16c209ab36 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -82,8 +82,8 @@ virshDomainInterfaceCompleter(vshControl *ctl, unsigned int flags) { virshControlPtr priv = ctl->privData; - VIR_AUTOPTR(xmlDoc) xmldoc = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) xmldoc = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; int ninterfaces; g_autofree xmlNodePtr *interfaces = NULL; size_t i; @@ -133,8 +133,8 @@ virshDomainDiskTargetCompleter(vshControl *ctl, unsigned int flags) { virshControlPtr priv = ctl->privData; - VIR_AUTOPTR(xmlDoc) xmldoc = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) xmldoc = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; g_autofree xmlNodePtr *disks = NULL; int ndisks; size_t i; @@ -199,8 +199,8 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, virshControlPtr priv = ctl->privData; const char *iface = NULL; char **ret = NULL; - VIR_AUTOPTR(xmlDoc) xml = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) xml = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; virMacAddr macaddr; char macstr[VIR_MAC_STRING_BUFLEN] = ""; int ninterfaces; @@ -260,8 +260,8 @@ virshDomainDeviceAliasCompleter(vshControl *ctl, unsigned int flags) { virshControlPtr priv = ctl->privData; - VIR_AUTOPTR(xmlDoc) xmldoc = NULL; - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlDoc) xmldoc = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; int naliases; g_autofree xmlNodePtr *aliases = NULL; size_t i; diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 5a54c0a3a0..ce43818be3 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -54,11 +54,11 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; virshControlPtr priv = ctl->privData; unsigned int npages = 0; g_autofree xmlNodePtr *pages = NULL; - VIR_AUTOPTR(xmlDoc) doc = NULL; + g_autoptr(xmlDoc) doc = NULL; size_t i = 0; const char *cellnum = NULL; bool cellno = vshCommandOptBool(cmd, "cellno"); @@ -110,11 +110,11 @@ virshCellnoCompleter(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { - VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; virshControlPtr priv = ctl->privData; unsigned int ncells = 0; g_autofree xmlNodePtr *cells = NULL; - VIR_AUTOPTR(xmlDoc) doc = NULL; + g_autoptr(xmlDoc) doc = NULL; size_t i = 0; g_autofree char *cap_xml = NULL; char **ret = NULL; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e8097bb165..f46d30341d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8645,7 +8645,7 @@ static const vshCmdOptDef opts_inject_nmi[] = { static bool cmdInjectNMI(vshControl *ctl, const vshCmd *cmd) { - VIR_AUTOPTR(virshDomain) dom = NULL; + g_autoptr(virshDomain) dom = NULL; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -8832,7 +8832,7 @@ static int getSignalNumber(vshControl *ctl, const char *signame) static bool cmdSendProcessSignal(vshControl *ctl, const vshCmd *cmd) { - VIR_AUTOPTR(virshDomain) dom = NULL; + g_autoptr(virshDomain) dom = NULL; const char *signame; long long pid_value; int signum; @@ -9506,7 +9506,7 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { static bool cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) { - VIR_AUTOPTR(virshDomain) dom = NULL; + g_autoptr(virshDomain) dom = NULL; g_autofree char *monitor_cmd = NULL; g_autofree char *result = NULL; unsigned int flags = 0; diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c index a24a14d1d3..eb2b2dfe9e 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -152,7 +152,7 @@ hideErrorFunc(void *opaque G_GNUC_UNUSED, int main(int argc, char **argv) { - VIR_AUTOPTR(virConf) conf = NULL; + g_autoptr(virConf) conf = NULL; const char *login_shell_path = conf_file; pid_t cpid = -1; int ret = EXIT_CANCELED; -- 2.19.2
Allow g_autoptr to be used instead of VIR_AUTOUNREF. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/conf/checkpoint_conf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/checkpoint_conf.h b/src/conf/checkpoint_conf.h index 2be041ff56..982096abed 100644 --- a/src/conf/checkpoint_conf.h +++ b/src/conf/checkpoint_conf.h @@ -57,6 +57,7 @@ struct _virDomainCheckpointDef { virDomainCheckpointDiskDef *disks; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainCheckpointDef, virObjectUnref); typedef enum { VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE = 1 << 0, -- 2.19.2
Now that all the types using VIR_AUTOUNREF have a cleanup func defined to virObjectUnref, use g_autoptr instead of VIR_AUTOUNREF. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/conf/checkpoint_conf.c | 2 +- src/conf/domain_conf.c | 24 ++++++++++++------------ src/esx/esx_driver.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_blockjob.c | 14 +++++++------- src/qemu/qemu_checkpoint.c | 10 +++++----- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_conf.c | 10 +++++----- src/qemu/qemu_domain.c | 14 +++++++------- src/qemu/qemu_driver.c | 24 ++++++++++++------------ src/qemu/qemu_firmware.c | 2 +- src/qemu/qemu_hotplug.c | 24 ++++++++++++------------ src/qemu/qemu_migration.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_slirp.c | 4 ++-- src/qemu/qemu_vhost_user_gpu.c | 6 +++--- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_util.c | 4 ++-- src/test/test_driver.c | 4 ++-- src/util/virhostdev.c | 18 +++++++++--------- src/util/virstoragefile.c | 20 ++++++++++---------- src/vbox/vbox_common.c | 4 ++-- src/vz/vz_driver.c | 2 +- tests/qemublocktest.c | 6 +++--- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemusecuritytest.c | 4 ++-- tests/storagepoolcapstest.c | 6 +++--- tests/virstoragetest.c | 8 ++++---- 29 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 376a627ee4..e7b204a4d2 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -134,7 +134,7 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, int n; char *tmp; g_autofree xmlNodePtr *nodes = NULL; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; + g_autoptr(virDomainCheckpointDef) def = NULL; if (!(def = virDomainCheckpointDefNew())) return NULL; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a0690e23f7..8616f820fc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1785,7 +1785,7 @@ static virDomainVcpuDefPtr virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt) { virDomainVcpuDefPtr ret = NULL; - VIR_AUTOUNREF(virObjectPtr) priv = NULL; + g_autoptr(virObject) priv = NULL; if (xmlopt && xmlopt->privateData.vcpuNew && !(priv = xmlopt->privateData.vcpuNew())) @@ -9276,7 +9276,7 @@ virDomainStorageSourceParseBase(const char *type, const char *format, const char *index) { - VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; + g_autoptr(virStorageSource) src = NULL; virStorageSourcePtr ret = NULL; if (!(src = virStorageSourceNew())) @@ -9402,7 +9402,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt, { VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr source; - VIR_AUTOUNREF(virStorageSourcePtr) backingStore = NULL; + g_autoptr(virStorageSource) backingStore = NULL; g_autofree char *type = NULL; g_autofree char *format = NULL; g_autofree char *idx = NULL; @@ -19526,7 +19526,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def, int ret = -1; g_autoptr(virBitmap) vcpus = NULL; g_autofree xmlNodePtr *nodes = NULL; - VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; + g_autoptr(virResctrlAlloc) alloc = NULL; ctxt->node = node; @@ -19724,7 +19724,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, virDomainResctrlDefPtr resctrl = NULL; g_autoptr(virBitmap) vcpus = NULL; g_autofree xmlNodePtr *nodes = NULL; - VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; + g_autoptr(virResctrlAlloc) alloc = NULL; ssize_t i = 0; int n; @@ -30936,9 +30936,9 @@ virDomainNetCreatePort(virConnectPtr conn, unsigned int flags) { virErrorPtr save_err; - VIR_AUTOUNREF(virNetworkPtr) net = NULL; + g_autoptr(virNetwork) net = NULL; g_autoptr(virNetworkPortDef) portdef = NULL; - VIR_AUTOUNREF(virNetworkPortPtr) port = NULL; + g_autoptr(virNetworkPort) port = NULL; g_autofree char *portxml = NULL; if (!(net = virNetworkLookupByName(conn, iface->data.network.name))) @@ -31156,8 +31156,8 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) virNetworkDefPtr def = NULL; int ret = -1; g_autofree char *xml = NULL; - VIR_AUTOUNREF(virConnectPtr) conn = NULL; - VIR_AUTOUNREF(virNetworkPtr) net = NULL; + g_autoptr(virConnect) conn = NULL; + g_autoptr(virNetwork) net = NULL; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) return iface->type; @@ -31344,9 +31344,9 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def) virStorageVolInfo info; g_autoptr(virStoragePoolDef) pooldef = NULL; g_autofree char *poolxml = NULL; - VIR_AUTOUNREF(virConnectPtr) conn = NULL; - VIR_AUTOUNREF(virStoragePoolPtr) pool = NULL; - VIR_AUTOUNREF(virStorageVolPtr) vol = NULL; + g_autoptr(virConnect) conn = NULL; + g_autoptr(virStoragePool) pool = NULL; + g_autoptr(virStorageVol) vol = NULL; if (def->src->type != VIR_STORAGE_TYPE_VOLUME) return 0; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b7c80d5c43..cdf925d62c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4100,7 +4100,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, virDomainSnapshotPtr snapshot = NULL; bool diskOnly = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) != 0; bool quiesce = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) != 0; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def = NULL; + g_autoptr(virDomainSnapshotDef) def = NULL; unsigned int parse_flags = 0; /* ESX supports disk-only and quiesced snapshots; libvirt tracks no diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 631cfc9a49..64b21f2073 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6539,7 +6539,7 @@ libxlDomainSetMetadata(virDomainPtr dom, unsigned int flags) { libxlDriverPrivatePtr driver = dom->conn->privateData; - VIR_AUTOUNREF(libxlDriverConfigPtr) cfg = libxlDriverConfigGet(driver); + g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); virDomainObjPtr vm = NULL; int ret = -1; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 239bf772d5..cda31f8719 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -103,7 +103,7 @@ qemuBlockJobDataPtr qemuBlockJobDataNew(qemuBlockJobType type, const char *name) { - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; if (qemuBlockJobDataInitialize() < 0) return NULL; @@ -206,7 +206,7 @@ qemuBlockJobDiskNew(virDomainObjPtr vm, qemuBlockJobType type, const char *jobname) { - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; if (!(job = qemuBlockJobDataNew(type, jobname))) return NULL; @@ -224,7 +224,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, virStorageSourcePtr base) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -255,7 +255,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, virStorageSourcePtr base) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; g_autofree char *jobname = NULL; qemuBlockJobType jobtype = QEMU_BLOCKJOB_TYPE_COMMIT; @@ -290,7 +290,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, virStorageSourcePtr chain, bool storage) { - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; g_autofree char *jobname = NULL; const char *nodename = src->nodeformat; @@ -323,7 +323,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, bool reuse) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -595,7 +595,7 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObjPtr vm, virStorageSourcePtr newsrc) { virDomainDiskDefPtr persistDisk = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) copy = NULL; + g_autoptr(virStorageSource) copy = NULL; virStorageSourcePtr n; if (!vm->newDef) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 7f675d4b79..4b4ad8bb83 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -118,7 +118,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, virDomainMomentObjPtr moment; virDomainCheckpointDefPtr parentdef = NULL; size_t i, j; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autofree char *chkFile = NULL; if (!metadata_only && !virDomainObjIsActive(vm)) { @@ -354,11 +354,11 @@ qemuCheckpointCreateXML(virDomainPtr domain, bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; unsigned int parse_flags = 0; virDomainMomentObjPtr other = NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = NULL; - VIR_AUTOUNREF(virCapsPtr) caps = NULL; + g_autoptr(virQEMUDriverConfig) cfg = NULL; + g_autoptr(virCaps) caps = NULL; g_autoptr(virJSONValue) actions = NULL; int ret; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; + g_autoptr(virDomainCheckpointDef) def = NULL; virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE, NULL); @@ -532,7 +532,7 @@ qemuCheckpointDelete(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverPtr driver = priv->driver; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); int ret = -1; virDomainMomentObjPtr chk = NULL; virQEMUMomentRemove rem; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6829bede99..d5f29ba5d4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6753,7 +6753,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps) { size_t i; - VIR_AUTOUNREF(virCapsPtr) caps = NULL; + g_autoptr(virCaps) caps = NULL; virCPUDefPtr cpu = def->cpu; if (!(caps = virQEMUDriverGetCapabilities(driver, false))) @@ -8337,7 +8337,7 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, char **chardev) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -10277,7 +10277,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, size_t i; char uuid[VIR_UUID_STRING_BUFLEN]; g_autoptr(virCommand) cmd = NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); unsigned int bootHostdevNet = 0; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 630e31723a..10d06d7e1c 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -105,7 +105,7 @@ qemuDriverUnlock(virQEMUDriverPtr driver) virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = NULL; + g_autoptr(virQEMUDriverConfig) cfg = NULL; if (virQEMUConfigInitialize() < 0) return NULL; @@ -1243,7 +1243,7 @@ virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver) virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) { size_t i, j; - VIR_AUTOUNREF(virCapsPtr) caps = NULL; + g_autoptr(virCaps) caps = NULL; g_autofree virSecurityManagerPtr *sec_managers = NULL; /* Security driver data */ const char *doi, *model, *lbl, *type; @@ -1379,9 +1379,9 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver, virArch arch, virDomainVirtType virttype) { - VIR_AUTOUNREF(virDomainCapsPtr) domCaps = NULL; - VIR_AUTOUNREF(virCapsPtr) caps = NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virDomainCaps) domCaps = NULL; + g_autoptr(virCaps) caps = NULL; + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virHashTablePtr domCapsCache = virQEMUCapsGetDomainCapsCache(qemuCaps); struct virQEMUDriverSearchDomcapsData data = { .path = virQEMUCapsGetBinary(qemuCaps), diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e25f5a7ee8..1bda2f5159 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3015,7 +3015,7 @@ qemuDomainObjPrivateXMLParseBlockjobChain(xmlNodePtr node, g_autofree char *format = NULL; g_autofree char *type = NULL; g_autofree char *index = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; + g_autoptr(virStorageSource) src = NULL; xmlNodePtr sourceNode; unsigned int xmlflags = VIR_DOMAIN_DEF_PARSE_STATUS; @@ -3161,7 +3161,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObjPtr vm, { VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainDiskDefPtr disk = NULL; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; g_autofree char *name = NULL; g_autofree char *typestr = NULL; int type; @@ -3313,7 +3313,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); g_autofree char *format = NULL; g_autofree char *type = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) migrSource = NULL; + g_autoptr(virStorageSource) migrSource = NULL; xmlNodePtr sourceNode; ctxt->node = node; @@ -8083,7 +8083,7 @@ void qemuDomainSaveConfig(virDomainObjPtr obj) { virQEMUDriverPtr driver = QEMU_DOMAIN_PRIVATE(obj)->driver; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = NULL; + g_autoptr(virQEMUDriverConfig) cfg = NULL; virDomainDefPtr def = NULL; if (virDomainObjIsActive(obj)) @@ -8911,7 +8911,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, def->cpu && (def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) { - VIR_AUTOUNREF(virQEMUCapsPtr) qCaps = NULL; + g_autoptr(virQEMUCaps) qCaps = NULL; if (qemuCaps) { qCaps = virObjectRef(qemuCaps); @@ -10263,7 +10263,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, virStorageSourcePtr disksrc, bool report_broken) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virStorageSourcePtr src; /* iterator for the backing chain declared in XML */ virStorageSourcePtr n; /* iterator for the backing chain detected from disk */ qemuDomainObjPrivatePtr priv = vm->privateData; @@ -10442,7 +10442,7 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver, virStorageSourcePtr src, qemuDomainStorageSourceAccessFlags flags) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); const char *srcstr = NULLSTR(src->path); int ret = -1; virErrorPtr orig_err = NULL; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index beb72f21d1..86d7647628 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -255,7 +255,7 @@ qemuSecurityChownCallback(const virStorageSource *src, int save_errno = 0; int ret = -1; int rv; - VIR_AUTOUNREF(virStorageSourcePtr) cpy = NULL; + g_autoptr(virStorageSource) cpy = NULL; rv = virStorageFileSupportsSecurityDriver(src); if (rv <= 0) @@ -4804,7 +4804,7 @@ processBlockJobEvent(virQEMUDriverPtr driver, int status) { virDomainDiskDefPtr disk; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) return; @@ -13695,7 +13695,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, { int ret = VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver = conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virQEMUCapsPtr qemuCaps = NULL; bool failIncompatible; virCPUDefPtr hvCPU; @@ -13908,7 +13908,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virCPUDefPtr *cpus = NULL; virQEMUCapsPtr qemuCaps = NULL; virArch arch; @@ -15458,7 +15458,7 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; char *backingStoreStr; virDomainDiskDefPtr persistdisk; - VIR_AUTOUNREF(virStorageSourcePtr) terminator = NULL; + g_autoptr(virStorageSource) terminator = NULL; bool supportsCreate; bool supportsBacking; int rc; @@ -15968,7 +15968,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, virCapsPtr caps = NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def = NULL; + g_autoptr(virDomainSnapshotDef) def = NULL; virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT | @@ -17970,7 +17970,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, virDomainDiskDefPtr disk; int ret = -1; qemuMonitorBlockJobInfo rawInfo; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; virCheckFlags(VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES, -1); @@ -18214,13 +18214,13 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, virDomainDiskDefPtr disk = NULL; int ret = -1; bool need_unlink = false; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); const char *format = NULL; bool mirror_reuse = !!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT); bool mirror_shallow = !!(flags & VIR_DOMAIN_BLOCK_COPY_SHALLOW); bool existing = mirror_reuse; qemuBlockJobDataPtr job = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) mirror = mirrorsrc; + g_autoptr(virStorageSource) mirror = mirrorsrc; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool mirror_initialized = false; g_autoptr(qemuBlockStorageSourceChainData) data = NULL; @@ -18493,7 +18493,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, virDomainObjPtr vm; int ret = -1; unsigned long long speed = bandwidth; - VIR_AUTOUNREF(virStorageSourcePtr) dest = NULL; + g_autoptr(virStorageSource) dest = NULL; virCheckFlags(VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | @@ -18698,7 +18698,7 @@ qemuDomainBlockCommit(virDomainPtr dom, g_autofree char *backingPath = NULL; unsigned long long speed = bandwidth; qemuBlockJobDataPtr job = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) mirror = NULL; + g_autoptr(virStorageSource) mirror = NULL; const char *nodetop = NULL; const char *nodebase = NULL; bool persistjob = false; @@ -20693,7 +20693,7 @@ qemuDomainGetResctrlMonData(virQEMUDriverPtr driver, virDomainResctrlDefPtr resctrl = NULL; virQEMUResctrlMonDataPtr res = NULL; char **features = NULL; - VIR_AUTOUNREF(virCapsPtr) caps = NULL; + g_autoptr(virCaps) caps = NULL; size_t i = 0; size_t j = 0; diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index b8a17ed1ca..313c909aed 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1028,7 +1028,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, virDomainDefPtr def, const qemuFirmware *fw) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); const qemuFirmwareMappingFlash *flash = &fw->mapping.data.flash; const qemuFirmwareMappingKernel *kernel = &fw->mapping.data.kernel; const qemuFirmwareMappingMemory *memory = &fw->mapping.data.memory; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7b3363c0c7..df6f3f9b55 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -584,7 +584,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, virStorageSourcePtr newsrc, bool force) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; virStorageSourcePtr oldsrc = disk->src; qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); @@ -676,7 +676,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; g_autofree char *devstr = NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virJSONValue) corProps = NULL; g_autofree char *corAlias = NULL; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); @@ -1147,7 +1147,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, bool iface_connected = false; virDomainNetType actualType; virNetDevBandwidthPtr actualBandwidth; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virDomainCCWAddressSetPtr ccwaddrs = NULL; size_t i; g_autofree char *charDevAlias = NULL; @@ -1543,7 +1543,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, bool teardowndevice = false; bool teardownmemlock = false; int backend; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); unsigned int flags = 0; if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) @@ -1767,7 +1767,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr driver, const char **secAlias) { int ret = -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainChrSourcePrivatePtr chrSourcePriv; qemuDomainSecretInfoPtr secinfo = NULL; @@ -1823,7 +1823,7 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr driver, virDomainChrSourceDefPtr dev, const char *inAlias) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; g_autofree char *tlsAlias = NULL; g_autofree char *secAlias = NULL; @@ -2333,7 +2333,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; virErrorPtr orig_err; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); unsigned long long oldmem = virDomainDefGetMemoryTotal(vm->def); unsigned long long newmem = oldmem + mem->size; g_autofree char *devstr = NULL; @@ -3301,7 +3301,7 @@ qemuDomainAttachLease(virQEMUDriverPtr driver, virDomainLeaseDefPtr lease) { int ret = -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); if (virDomainLeaseInsertPreAlloc(vm->def) < 0) goto cleanup; @@ -4012,7 +4012,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr dev) { virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev); - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); const char *type = virDomainGraphicsTypeToString(dev->type); size_t i; int ret = -1; @@ -4555,7 +4555,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainNetDefPtr net) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; g_autofree char *hostnet_name = NULL; g_autofree char *charDevAlias = NULL; @@ -6306,7 +6306,7 @@ qemuDomainSetVcpusInternal(virQEMUDriverPtr driver, unsigned int nvcpus, bool hotpluggable) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virBitmapPtr vcpumap = NULL; bool enable; int ret = -1; @@ -6501,7 +6501,7 @@ qemuDomainSetVcpuInternal(virQEMUDriverPtr driver, virBitmapPtr map, bool state) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virBitmapPtr livevcpus = NULL; int ret = -1; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1166236124..b34e47e473 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -797,7 +797,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); int mon_ret = 0; - VIR_AUTOUNREF(virStorageSourcePtr) copysrc = NULL; + g_autoptr(virStorageSource) copysrc = NULL; VIR_DEBUG("starting blockdev mirror for disk=%s to host=%s", diskAlias, host); @@ -991,7 +991,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, unsigned long long mirror_speed = speed; bool mirror_shallow = *migrate_flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC; int rv; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d21d95a977..b2d07cf279 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -936,7 +936,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon G_GNUC_UNUSED, virQEMUDriverPtr driver = opaque; struct qemuProcessEvent *processEvent = NULL; virDomainDiskDefPtr disk; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL; + g_autoptr(qemuBlockJobData) job = NULL; char *data = NULL; virObjectLock(vm); @@ -5537,7 +5537,7 @@ static int qemuProcessStartUpdateCustomCaps(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(priv->driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); qemuDomainXmlNsDefPtr nsdef = vm->def->namespaceData; char **next; int tmp; diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index b4d85c49df..6e6393f49d 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -240,7 +240,7 @@ qemuSlirpStop(qemuSlirpPtr slirp, virDomainNetDefPtr net, bool hot) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autofree char *pidfile = NULL; g_autofree char *dbus_path = NULL; g_autofree char *id = qemuSlirpGetDBusVMStateId(net); @@ -296,7 +296,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, bool hotplug, bool incoming) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virCommand) cmd = NULL; g_autofree char *pidfile = NULL; g_autofree char *dbus_path = NULL; diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 6daccf170e..49f48c6d08 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -105,7 +105,7 @@ int qemuExtVhostUserGPUStart(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainVideoDefPtr video) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autofree char *shortname = NULL; g_autofree char *pidfile = NULL; g_autoptr(virCommand) cmd = NULL; @@ -209,7 +209,7 @@ void qemuExtVhostUserGPUStop(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainVideoDefPtr video) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autofree char *pidfile = NULL; g_autofree char *shortname = NULL; virErrorPtr orig_err; @@ -252,7 +252,7 @@ qemuExtVhostUserGPUSetupCgroup(virQEMUDriverPtr driver, virDomainVideoDefPtr video, virCgroupPtr cgroup) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autofree char *shortname = NULL; int rc; pid_t pid; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 07aca084d8..1b87e800ac 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -239,7 +239,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, ssize_t len; int backingFormat; g_autoptr(virStorageVolDef) vol = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; + g_autoptr(virStorageSource) meta = NULL; g_autofree char *header = NULL; *volptr = NULL; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index c51494045d..e97bd2151a 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3359,7 +3359,7 @@ storageBackendProbeTarget(virStorageSourcePtr target, int backingStoreFormat; int rc; struct stat sb; - VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; + g_autoptr(virStorageSource) meta = NULL; VIR_AUTOCLOSE fd = -1; if (encryption) @@ -3529,7 +3529,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) int ret = -1; g_autoptr(virStorageVolDef) vol = NULL; VIR_AUTOCLOSE fd = -1; - VIR_AUTOUNREF(virStorageSourcePtr) target = NULL; + g_autoptr(virStorageSource) target = NULL; if (virDirOpen(&dir, def->target.path) < 0) goto cleanup; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 8c77ec6e0d..42bb3d19f0 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -8558,7 +8558,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain, bool update_current = true; bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; unsigned int parse_flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def = NULL; + g_autoptr(virDomainSnapshotDef) def = NULL; /* * DISK_ONLY: Not implemented yet @@ -9042,7 +9042,7 @@ testDomainCheckpointCreateXML(virDomainPtr domain, bool update_current = true; bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; unsigned int parse_flags = 0; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; + g_autoptr(virDomainCheckpointDef) def = NULL; virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE | VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE, NULL); diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index dbc235d6f1..5ceadc6026 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -144,7 +144,7 @@ virHostdevManagerDispose(void *obj) static virHostdevManagerPtr virHostdevManagerNew(void) { - VIR_AUTOUNREF(virHostdevManagerPtr) hostdevMgr = NULL; + g_autoptr(virHostdevManager) hostdevMgr = NULL; bool privileged = geteuid() == 0; if (!(hostdevMgr = virObjectNew(virHostdevManagerClass))) @@ -264,7 +264,7 @@ virHostdevGetPCIHostDevice(const virDomainHostdevDef *hostdev, static virPCIDeviceListPtr virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs) { - VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs = NULL; + g_autoptr(virPCIDeviceList) pcidevs = NULL; size_t i; if (!(pcidevs = virPCIDeviceListNew())) @@ -713,7 +713,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr, int nhostdevs, unsigned int flags) { - VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs = NULL; + g_autoptr(virPCIDeviceList) pcidevs = NULL; int last_processed_hostdev_vf = -1; size_t i; int ret = -1; @@ -985,7 +985,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, int nhostdevs, const char *oldStateDir) { - VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs = NULL; + g_autoptr(virPCIDeviceList) pcidevs = NULL; size_t i; if (!nhostdevs) @@ -1386,7 +1386,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, * automatically found before. */ if (vendor) { - VIR_AUTOUNREF(virUSBDeviceListPtr) devs = NULL; + g_autoptr(virUSBDeviceList) devs = NULL; rc = virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, &devs); if (rc < 0) { @@ -1442,7 +1442,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr, unsigned int flags) { size_t i; - VIR_AUTOUNREF(virUSBDeviceListPtr) list = NULL; + g_autoptr(virUSBDeviceList) list = NULL; virUSBDevicePtr tmp; bool coldBoot = !!(flags & VIR_HOSTDEV_COLD_BOOT); @@ -1537,7 +1537,7 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr, { size_t i, j; int count; - VIR_AUTOUNREF(virSCSIDeviceListPtr) list = NULL; + g_autoptr(virSCSIDeviceList) list = NULL; virSCSIDevicePtr tmp; if (!nhostdevs) @@ -1632,7 +1632,7 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { - VIR_AUTOUNREF(virSCSIVHostDeviceListPtr) list = NULL; + g_autoptr(virSCSIVHostDeviceList) list = NULL; virSCSIVHostDevicePtr tmp; size_t i, j; @@ -1718,7 +1718,7 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr mgr, int nhostdevs) { size_t i; - VIR_AUTOUNREF(virMediatedDeviceListPtr) list = NULL; + g_autoptr(virMediatedDeviceList) list = NULL; if (!nhostdevs) return 0; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 51d80b1cb8..ac0c70b21e 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1129,7 +1129,7 @@ static virStorageSourcePtr virStorageFileMetadataNew(const char *path, int format) { - VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; + g_autoptr(virStorageSource) def = NULL; virStorageSourcePtr ret = NULL; if (!(def = virStorageSourceNew())) @@ -1219,7 +1219,7 @@ virStorageFileGetMetadataFromFD(const char *path, struct stat sb; int dummy; g_autofree char *buf = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; + g_autoptr(virStorageSource) meta = NULL; if (!backingFormat) backingFormat = &dummy; @@ -2251,7 +2251,7 @@ virStorageSourceCopy(const virStorageSource *src, bool backingChain) { virStorageSourcePtr ret = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; + g_autoptr(virStorageSource) def = NULL; if (!(def = virStorageSourceNew())) return NULL; @@ -2629,7 +2629,7 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, { virStorageSourcePtr ret = NULL; g_autofree char *dirname = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; + g_autoptr(virStorageSource) def = NULL; if (!(def = virStorageSourceNew())) return NULL; @@ -3681,7 +3681,7 @@ virStorageSourceNewFromBackingAbsolute(const char *path, { const char *json; int rc = 0; - VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; + g_autoptr(virStorageSource) def = NULL; *src = NULL; @@ -3748,7 +3748,7 @@ virStorageSourceNewFromChild(virStorageSourcePtr parent, virStorageSourcePtr *child) { struct stat st; - VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; + g_autoptr(virStorageSource) def = NULL; int rc = 0; *child = NULL; @@ -3948,7 +3948,7 @@ virStorageSourceUpdateCapacity(virStorageSourcePtr src, bool probe) { int format = src->format; - VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; + g_autoptr(virStorageSource) meta = NULL; /* Raw files: capacity is physical size. For all other files: if * the metadata has a capacity, use that, otherwise fall back to @@ -4943,7 +4943,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, int backingFormat; int rv; g_autofree char *buf = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) backingStore = NULL; + g_autoptr(virStorageSource) backingStore = NULL; VIR_DEBUG("path=%s format=%d uid=%u gid=%u", src->path, src->format, @@ -5028,7 +5028,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, VIR_STEAL_PTR(src->backingStore, backingStore); if (src->externalDataStoreRaw) { - VIR_AUTOUNREF(virStorageSourcePtr) externalDataStore = NULL; + g_autoptr(virStorageSource) externalDataStore = NULL; if ((rv = virStorageSourceNewFromExternalData(src, &externalDataStore)) < 0) @@ -5121,7 +5121,7 @@ virStorageFileGetBackingStoreStr(virStorageSourcePtr src, ssize_t headerLen; int rv; g_autofree char *buf = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) tmp = NULL; + g_autoptr(virStorageSource) tmp = NULL; *backing = NULL; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 50c7de3e02..7fa9a98a1e 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -5477,7 +5477,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, virDomainSnapshotPtr ret = NULL; unsigned int parse_flags = (VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def = NULL; + g_autoptr(virDomainSnapshotDef) def = NULL; if (!data->vboxObj) return ret; @@ -6199,7 +6199,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, char uuidstr[VIR_UUID_STRING_BUFLEN]; char *ret = NULL; virDomainDefPtr defdom; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def = NULL; + g_autoptr(virDomainSnapshotDef) def = NULL; if (!data->vboxObj) return ret; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 917acdae57..fe46d6349e 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2595,7 +2595,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, virDomainSnapshotObjListPtr snapshots = NULL; virDomainMomentObjPtr current; bool job = false; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def = NULL; + g_autoptr(virDomainSnapshotDef) def = NULL; virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE, NULL); diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 3bf1271b3e..6d90e2faf5 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -54,8 +54,8 @@ testBackingXMLjsonXML(const void *args) g_autofree char *propsstr = NULL; g_autofree char *protocolwrapper = NULL; g_autofree char *actualxml = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc = NULL; + g_autoptr(virStorageSource) xmlsrc = NULL; + g_autoptr(virStorageSource) jsonsrc = NULL; if (!(xmlsrc = virStorageSourceNew())) return -1; @@ -400,7 +400,7 @@ testQemuImageCreate(const void *opaque) struct testQemuImageCreateData *data = (void *) opaque; g_autoptr(virJSONValue) protocolprops = NULL; g_autoptr(virJSONValue) formatprops = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; + g_autoptr(virStorageSource) src = NULL; g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) actualbuf = VIR_BUFFER_INITIALIZER; g_autofree char *jsonprotocol = NULL; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index 72d1eeaea5..f6eb1f69b2 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -41,7 +41,7 @@ testCompareXMLToXMLFiles(const char *inxml, g_autofree char *inXmlData = NULL; g_autofree char *outXmlData = NULL; g_autofree char *actual = NULL; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; + g_autoptr(virDomainCheckpointDef) def = NULL; if (flags & TEST_REDEFINE) parseflags |= VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c index c84ee0bf7d..66cb124f09 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -38,7 +38,7 @@ testCompareXMLToXMLFiles(const char *inxml, unsigned int parseflags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; unsigned int formatflags = VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE; bool cur = false; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def = NULL; + g_autoptr(virDomainSnapshotDef) def = NULL; if (flags & TEST_INTERNAL) { parseflags |= VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL; diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 83719a28f2..288718c2a5 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -40,7 +40,7 @@ prepareObjects(virQEMUDriverPtr driver, virDomainObjPtr *vm_ret) { qemuDomainObjPrivatePtr priv; - VIR_AUTOUNREF(virDomainObjPtr) vm = NULL; + g_autoptr(virDomainObj) vm = NULL; g_autofree char *filename = NULL; g_autofree char *domxml = NULL; g_autofree char *latestCapsFile = NULL; @@ -84,7 +84,7 @@ static int testDomain(const void *opaque) { const struct testData *data = opaque; - VIR_AUTOUNREF(virDomainObjPtr) vm = NULL; + g_autoptr(virDomainObj) vm = NULL; VIR_AUTOSTRINGLIST notRestored = NULL; size_t i; int ret = -1; diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c index 185372e939..6b0680291e 100644 --- a/tests/storagepoolcapstest.c +++ b/tests/storagepoolcapstest.c @@ -54,7 +54,7 @@ test_virStoragePoolCapsFormat(const void *opaque) struct test_virStoragePoolCapsFormatData *data = (struct test_virStoragePoolCapsFormatData *) opaque; virCapsPtr driverCaps = data->driverCaps; - VIR_AUTOUNREF(virStoragePoolCapsPtr) poolCaps = NULL; + g_autoptr(virStoragePoolCaps) poolCaps = NULL; g_autofree char *path = NULL; g_autofree char *poolCapsXML = NULL; @@ -81,8 +81,8 @@ static int mymain(void) { int ret = 0; - VIR_AUTOUNREF(virCapsPtr) fullCaps = NULL; - VIR_AUTOUNREF(virCapsPtr) fsCaps = NULL; + g_autoptr(virCaps) fullCaps = NULL; + g_autoptr(virCaps) fsCaps = NULL; #define DO_TEST(Filename, DriverCaps) \ do { \ diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 6cec458088..33ef662115 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -86,7 +86,7 @@ testStorageFileGetMetadata(const char *path, { struct stat st; virStorageSourcePtr ret = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; + g_autoptr(virStorageSource) def = NULL; if (!(def = virStorageSourceNew())) return NULL; @@ -278,7 +278,7 @@ testStorageChain(const void *args) const struct testChainData *data = args; virStorageSourcePtr elt; size_t i = 0; - VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; + g_autoptr(virStorageSource) meta = NULL; g_autofree char *broken = NULL; meta = testStorageFileGetMetadata(data->start, data->format, -1, -1); @@ -612,7 +612,7 @@ testBackingParse(const void *args) const struct testBackingParseData *data = args; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_autofree char *xml = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; + g_autoptr(virStorageSource) src = NULL; int rc; int erc = data->rv; @@ -664,7 +664,7 @@ mymain(void) virStorageSourcePtr chain2; /* short for chain->backingStore */ virStorageSourcePtr chain3; /* short for chain2->backingStore */ g_autoptr(virCommand) cmd = NULL; - VIR_AUTOUNREF(virStorageSourcePtr) chain = NULL; + g_autoptr(virStorageSource) chain = NULL; if (storageRegisterAll() < 0) return EXIT_FAILURE; -- 2.19.2
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/libvirt_private.syms | 1 - src/util/virobject.c | 14 -------------- src/util/virobject.h | 15 --------------- 3 files changed, 30 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7d62df8086..0da02bb8bd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2636,7 +2636,6 @@ virClassForObjectRWLockable; virClassIsDerivedFrom; virClassName; virClassNew; -virObjectAutoUnref; virObjectFreeCallback; virObjectFreeHashData; virObjectIsClass; diff --git a/src/util/virobject.c b/src/util/virobject.c index 33feeb659a..c5363308d8 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -367,20 +367,6 @@ virObjectUnref(void *anyobj) } -/** - * virObjectAutoUnref: - * - * Helper used by VIR_AUTOUNREF - */ -void -virObjectAutoUnref(void *objptr) -{ - virObjectPtr *obj = objptr; - virObjectUnref(*obj); - *obj = NULL; -} - - /** * virObjectRef: * @anyobj: any instance of virObjectPtr diff --git a/src/util/virobject.h b/src/util/virobject.h index 773a009f5e..7cb3457021 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -109,21 +109,6 @@ virObjectNew(virClassPtr klass) bool virObjectUnref(void *obj); -void -virObjectAutoUnref(void *objptr); - -/** - * VIR_AUTOUNREF: - * @type: type of an virObject subclass to be unref'd automatically - * - * DEPRECATED: Use g_autoptr(type) instead - * - * Declares a variable of @type which will be automatically unref'd when - * control goes out of the scope. - */ -#define VIR_AUTOUNREF(type) \ - __attribute__((cleanup(virObjectAutoUnref))) type - G_DEFINE_AUTOPTR_CLEANUP_FUNC(virObject, virObjectUnref); void * -- 2.19.2
Now that we no longer use any of the macros from this file, remove it. This also removes a typo. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/conf/domain_capabilities.h | 1 - src/conf/storage_conf.h | 1 - src/qemu/qemu_firmware.h | 1 - src/qemu/qemu_migration_params.h | 1 - src/qemu/qemu_vhost_user.h | 1 - src/util/Makefile.inc.am | 1 - src/util/virauthconfig.h | 1 - src/util/virautoclean.h | 89 -------------------------------- src/util/virbitmap.h | 1 - src/util/virbuffer.h | 1 - src/util/vircommand.h | 1 - src/util/virconf.h | 1 - src/util/virerror.h | 1 - src/util/virfile.h | 1 - src/util/virfirewall.h | 1 - src/util/virhash.h | 2 - src/util/virjson.h | 1 - src/util/virmacaddr.h | 1 - src/util/virmdev.h | 1 - src/util/virnetdev.h | 1 - src/util/virnetdevip.h | 1 - src/util/virnetdevvlan.h | 1 - src/util/virnetlink.h | 1 - src/util/virpci.h | 1 - src/util/virperf.h | 1 - src/util/virscsi.h | 1 - src/util/virscsivhost.h | 1 - src/util/virsocketaddr.h | 1 - src/util/virstoragefile.h | 1 - src/util/virsystemd.h | 1 - src/util/virtypedparam.h | 1 - src/util/viruri.h | 1 - src/util/virusb.h | 1 - src/util/virxml.h | 1 - tests/qemumonitortestutils.h | 1 - 35 files changed, 124 deletions(-) delete mode 100644 src/util/virautoclean.h diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index b5c322fd90..a31458c653 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -22,7 +22,6 @@ #include "internal.h" #include "domain_conf.h" -#include "virautoclean.h" #include "virenum.h" typedef const char * (*virDomainCapsValToStr)(int value); diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index b172e82ccb..d2600efff0 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -29,7 +29,6 @@ #include "device_conf.h" #include "object_event.h" #include "storage_adapter_conf.h" -#include "virautoclean.h" #include "virenum.h" #include "virxml.h" diff --git a/src/qemu/qemu_firmware.h b/src/qemu/qemu_firmware.h index 10b8eb822b..4be65bc664 100644 --- a/src/qemu/qemu_firmware.h +++ b/src/qemu/qemu_firmware.h @@ -22,7 +22,6 @@ #include "domain_conf.h" #include "qemu_conf.h" -#include "virautoclean.h" #include "virarch.h" #include "virfirmware.h" diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index e8380e6fb1..9aea24725f 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -27,7 +27,6 @@ #include "virxml.h" #include "qemu_monitor.h" #include "qemu_conf.h" -#include "virautoclean.h" #include "virenum.h" typedef enum { diff --git a/src/qemu/qemu_vhost_user.h b/src/qemu/qemu_vhost_user.h index 6bb5f5807c..369ba00caa 100644 --- a/src/qemu/qemu_vhost_user.h +++ b/src/qemu/qemu_vhost_user.h @@ -22,7 +22,6 @@ #include "domain_conf.h" #include "qemu_conf.h" -#include "virautoclean.h" #include "virarch.h" typedef struct _qemuVhostUser qemuVhostUser; diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 9747816fac..705b93c93c 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -17,7 +17,6 @@ UTIL_SOURCES = \ util/virauth.h \ util/virauthconfig.c \ util/virauthconfig.h \ - util/virautoclean.h \ util/virbitmap.c \ util/virbitmap.h \ util/virbuffer.c \ diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h index 44bef7e2be..de28b1ff28 100644 --- a/src/util/virauthconfig.h +++ b/src/util/virauthconfig.h @@ -21,7 +21,6 @@ #pragma once #include "internal.h" -#include "virautoclean.h" typedef struct _virAuthConfig virAuthConfig; typedef virAuthConfig *virAuthConfigPtr; diff --git a/src/util/virautoclean.h b/src/util/virautoclean.h deleted file mode 100644 index 71312a2782..0000000000 --- a/src/util/virautoclean.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * virautoclean.h: automatic scope-based memory clearing helper macros for - * use in header files - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - * - */ - -#pragma once - -/** - * DEPRECATION WARNING - * - * The macros in this file should not be used in newly written code. - * Use the equivalent GLib macros instead. - * - * For existing code, use of the libvirt and GLib macros must NEVER - * be mixed within a single method. - * - * The use of the libvirt VIR_FREE macros should also not be mixed - * with GLib auto-free macros and vice-verca. - * - * Existing code should be converted to the new GLib macros and - * g_free APIs as needed. - */ - -/** - * VIR_DEFINE_AUTOPTR_FUNC: - * @type: type of the variable to be freed automatically - * @func: cleanup function to be automatically called - * - * This macro defines a function for automatic freeing of - * resources allocated to a variable of type @type. This newly - * defined function works as a necessary wrapper around @func. - */ -#define VIR_DEFINE_AUTOPTR_FUNC(t, f) \ - G_DEFINE_AUTOPTR_CLEANUP_FUNC(t, f) - -/** - * VIR_DEFINE_AUTOCLEAN_FUNC: - * @type: type of the variable to be cleared automatically - * @func: cleanup function to be automatically called - * - * This macro defines a function for automatic clearing of - * resources in a stack'd variable of type @type. Note that @func must - * take pointer to @type. - */ -#define VIR_DEFINE_AUTOCLEAN_FUNC(type, func) \ - G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(type, func) - -/** - * VIR_AUTOPTR: - * @type: type of the variable to be freed automatically - * - * Macro to automatically free the memory allocated to - * the variable declared with it by calling the function - * defined by VIR_DEFINE_AUTOPTR_FUNC when the variable - * goes out of scope. - * - * Note that this macro must NOT be used with vectors! The freeing function - * will not free any elements beyond the first. - */ -#define VIR_AUTOPTR(type) g_autoptr(type) - -/** - * VIR_AUTOCLEAN: - * @type: type of the variable to be cleared automatically - * - * Macro to automatically call clearing function registered for variable of @type - * when the variable goes out of scope. - * The cleanup function is registered by VIR_DEFINE_AUTOCLEAN_FUNC macro for - * the given type. - * - * Note that this macro must NOT be used with vectors! The cleaning function - * will not clean any elements beyond the first. - */ -#define VIR_AUTOCLEAN(type) g_auto(type) diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index e0c5541c13..7f1a109c01 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -22,7 +22,6 @@ #pragma once #include "internal.h" -#include "virautoclean.h" #include <sys/types.h> diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index 0c074121bc..ff24ab1019 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -23,7 +23,6 @@ #include <stdarg.h> #include "internal.h" -#include "virautoclean.h" /** diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 2f39dec1b3..9086f9a90c 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -23,7 +23,6 @@ #include "internal.h" #include "virbuffer.h" -#include "virautoclean.h" typedef struct _virCommand virCommand; typedef virCommand *virCommandPtr; diff --git a/src/util/virconf.h b/src/util/virconf.h index 304b325985..0b2de34d36 100644 --- a/src/util/virconf.h +++ b/src/util/virconf.h @@ -22,7 +22,6 @@ #include "virutil.h" #include "virenum.h" -#include "virautoclean.h" /** * virConfType: diff --git a/src/util/virerror.h b/src/util/virerror.h index 7e5ed29ae2..2e27655b72 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -22,7 +22,6 @@ #pragma once #include "internal.h" -#include "virautoclean.h" #define VIR_ERROR_MAX_LENGTH 1024 diff --git a/src/util/virfile.h b/src/util/virfile.h index b8256a96b3..a570529330 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -29,7 +29,6 @@ #include "internal.h" #include "virbitmap.h" #include "virstoragefile.h" -#include "virautoclean.h" typedef enum { VIR_FILE_CLOSE_PRESERVE_ERRNO = 1 << 0, diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index bcc1437b9a..6148f46827 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -21,7 +21,6 @@ #pragma once #include "internal.h" -#include "virautoclean.h" typedef struct _virFirewall virFirewall; typedef virFirewall *virFirewallPtr; diff --git a/src/util/virhash.h b/src/util/virhash.h index 5bb59376af..b5e7c79260 100644 --- a/src/util/virhash.h +++ b/src/util/virhash.h @@ -9,8 +9,6 @@ #pragma once -#include "virautoclean.h" - /* * The hash table. */ diff --git a/src/util/virjson.h b/src/util/virjson.h index 1ce7b75e3b..fa8571c73b 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -25,7 +25,6 @@ #include "internal.h" #include "virbitmap.h" #include "virbuffer.h" -#include "virautoclean.h" #include <stdarg.h> diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 2fda2b0239..0296cfa965 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -21,7 +21,6 @@ #pragma once #include "internal.h" -#include "virautoclean.h" #define VIR_MAC_BUFLEN 6 #define VIR_MAC_HEXLEN (VIR_MAC_BUFLEN * 2) diff --git a/src/util/virmdev.h b/src/util/virmdev.h index 2f73b1a530..e0905a3f6e 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -21,7 +21,6 @@ #include "internal.h" #include "virobject.h" #include "virutil.h" -#include "virautoclean.h" #include "virenum.h" typedef enum { diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index ea3779bb98..b5a5214bcb 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -25,7 +25,6 @@ #include "virmacaddr.h" #include "virpci.h" #include "virnetdevvlan.h" -#include "virautoclean.h" #include "virenum.h" #ifdef HAVE_STRUCT_IFREQ diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 59d2d4a044..1fa6dd8836 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -19,7 +19,6 @@ #pragma once #include "virsocketaddr.h" -#include "virautoclean.h" typedef struct _virNetDevIPAddr virNetDevIPAddr; typedef virNetDevIPAddr *virNetDevIPAddrPtr; diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 0e4fd03dcb..9dbf07a6e2 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -20,7 +20,6 @@ #include <virutil.h> -#include "virautoclean.h" #include "virenum.h" typedef enum { diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 5cb6060b3b..030547e573 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -21,7 +21,6 @@ #include "internal.h" #include "virmacaddr.h" -#include "virautoclean.h" #if defined(__linux__) && defined(HAVE_LIBNL) diff --git a/src/util/virpci.h b/src/util/virpci.h index 4ffe5db2d6..cfb4581edf 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -24,7 +24,6 @@ #include "virmdev.h" #include "virobject.h" #include "virutil.h" -#include "virautoclean.h" #include "virenum.h" typedef struct _virPCIDevice virPCIDevice; diff --git a/src/util/virperf.h b/src/util/virperf.h index df990109b1..3102b42af9 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -19,7 +19,6 @@ #pragma once #include "virutil.h" -#include "virautoclean.h" #include "virenum.h" /* Some Intel processor families introduced some RDT (Resource Director diff --git a/src/util/virscsi.h b/src/util/virscsi.h index 3a92366efc..51627e0c05 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -22,7 +22,6 @@ #include "internal.h" #include "virobject.h" -#include "virautoclean.h" typedef struct _virSCSIDevice virSCSIDevice; typedef virSCSIDevice *virSCSIDevicePtr; diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index d3185b14bc..a5296890cd 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -23,7 +23,6 @@ #include "internal.h" #include "virobject.h" #include "virutil.h" -#include "virautoclean.h" typedef struct _virSCSIVHostDevice virSCSIVHostDevice; typedef virSCSIVHostDevice *virSCSIVHostDevicePtr; diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index 6cdf7b7c4f..1180864f06 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -25,7 +25,6 @@ #endif #include "internal.h" -#include "virautoclean.h" /* On architectures which lack these limits, define them (ie. Cygwin). * Note that the libvirt code should be robust enough to handle the diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 545e60ba00..c357803e50 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -29,7 +29,6 @@ #include "virstorageencryption.h" #include "virutil.h" #include "virsecret.h" -#include "virautoclean.h" #include "virenum.h" /* Minimum header size required to probe all known formats with diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index fcdf6d17fe..dfea75948b 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -22,7 +22,6 @@ #pragma once #include "internal.h" -#include "virautoclean.h" typedef struct _virSystemdActivation virSystemdActivation; typedef virSystemdActivation *virSystemdActivationPtr; diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 42a4da466e..ea48ee5009 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -24,7 +24,6 @@ #include "internal.h" #include "virutil.h" #include "virenum.h" -#include "virautoclean.h" /** * VIR_TYPED_PARAM_MULTIPLE: diff --git a/src/util/viruri.h b/src/util/viruri.h index f91debefe9..b7f845f41f 100644 --- a/src/util/viruri.h +++ b/src/util/viruri.h @@ -24,7 +24,6 @@ #include "internal.h" #include "virconf.h" -#include "virautoclean.h" typedef struct _virURI virURI; typedef virURI *virURIPtr; diff --git a/src/util/virusb.h b/src/util/virusb.h index 7ff1d55c9e..42a3303952 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -22,7 +22,6 @@ #include "internal.h" #include "virobject.h" -#include "virautoclean.h" #define USB_DEVFS "/dev/bus/usb/" diff --git a/src/util/virxml.h b/src/util/virxml.h index 283c592b2c..dfdc1f73c3 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -28,7 +28,6 @@ #include <libxml/relaxng.h> #include "virbuffer.h" -#include "virautoclean.h" xmlXPathContextPtr virXMLXPathContextNew(xmlDocPtr xml) G_GNUC_WARN_UNUSED_RESULT; diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index f6d7f3623c..8e213ec921 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -23,7 +23,6 @@ #include "qemu/qemu_conf.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" -#include "virautoclean.h" typedef struct _qemuMonitorTest qemuMonitorTest; typedef qemuMonitorTest *qemuMonitorTestPtr; -- 2.19.2
On 10/15/19 5:03 PM, Ján Tomko wrote:
Ján Tomko (9): util: xml: use g_auto directly for VIR_XPATH_NODE_AUTORESTORE virbuffer: use g_auto directly for virBuffer Use g_autofree instead of VIR_AUTOFREE Use G_DEFINE_AUTOPTR_CLEANUP_FUNC instead of VIR_DEFINE_AUTOPTR_FUNC Use g_autoptr instead of VIR_AUTOPTR Define G_DEFINE_AUTOPTR_CLEANUP_FUNC for virDomainCheckpointDef Use g_autoptr instead of VIR_AUTOUNREF Delete virObjectAutoUnref Remove virautoclean.h
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Ján Tomko -
Michal Privoznik