[libvirt PATCH v2 00/24] eliminate VIR_FREE in all *Free() functions
When I sent a patch to convert (what I thought was) all of the VIR_FREEs in any *Free() function in the conf directory to g_free (with the justification that it was trivial to verify that the pointers weren't being referenced after they had been freed), there were two responses that stuck in my mind: 1) Daniel said that this was a reasonable class of uses to change and a reasonable way to arrive at the desired end result. 2) Peter justifiably expressing concern over the amount of churn in the code, and also said that he'd rather not have things "halfway" for an indeterminate time. The combination of those two comments (ignoring the part about "concern for churn" :-) let me to sit down last night and make this patch series that eliminates all uses of VIR_FREE from any function whose name ends in "Free" (or eliminate/rename the function, just for completeness' sake) In the vast majority of cases, this was done by replacing the VIR_FREEs in the functions with g_free (while verifying that everything being g_freed was actually something pointed to by the parent object that was sent to the *Free() function, and that the parent object itself was subsequently freed). But there were a a couple of cases where this wasn't quite the right thing to do: * in patch 20, two functions ending with Free() don't actually free the pointer they're sent. They instead behave like a *Clear() function, VIR_FREEing their components. Since we can see that these functions aren't actually be used as *Clear() functions (and never will be used that way), but don't want to promote confusion by leaving them misnamed, the patch renames them to *FreeContent() (more accurate name) and changes their VIR_FREEs to g_frees (it takes more than just looking at one function, but it's very easy to verify that the pointers are never referenced after they're freed). * In Patch 21-23, several *Free() functions were actually being passed a full copy of an object, and then VIR_FREEing all the pointers in the copied object. So the name was misleading, the function was inefficiently copying entire objects, and was unnecessarily NULLing the pointers that were then tossed out when the function returned. So I renamed the functions (21), changed the calling sequences to use pointers instead of copied objects (22), and (of course) changed the VIR_FREEs into g_free (23). * in Patch 24, a *Free() function actually appears to be used as a Clear() function. So I left the VIR_FREEs in place, but renamed the function to *Clear(). However, its one use as a *Clear() is when being called from a "Reset" function that (as far as I can see) is never used. If we could get rid of that Reset function, I could just fold the *Clear() function into its one remaining caller, and eliminate the VIR_FREEs. If someone knows more about the function virNetSSHSessionAuthReset() (which is in a section of the file labeled "Public API") please enlighten me. ** The last time I ran wc over the diffs of these patches, it showed they are eliminating 542 uses of VIR_FREE, which is > 13% of the 4k remaining. There is a companion series that eliminates VIR_FREE from all *Dispose() functions, but I'm sending it separately since the two series are completely independent, and I didn't want to scare anyone off. (Really, most of these can be very mechanically reviewed - just verify that all the items being g_freed are subordinates of the main argument to the function, and that that object is freed before return) Laine Stump (24): conf: replace remaining straggler VIR_FREE with g_free in vir*Free() util: replace VIR_FREE with g_free in all vir*Free() functions bhyve: replace VIR_FREE with g_free in all vir*Free() functions libxl: replace VIR_FREE with g_free in all vir*Free() functions qemu: replace VIR_FREE with g_free in all vir*Free() functions test_driver: replace VIR_FREE with g_free in all vir*Free() functions vbox: replace VIR_FREE with g_free in all vir*Free() functions vmx: replace VIR_FREE with g_free in all vir*Free() functions vz: replace VIR_FREE with g_free in all vir*Free() functions admin: replace VIR_FREE with g_free in all vir*Free() functions locking: replace VIR_FREE with g_free in all vir*Free() functions logging: replace VIR_FREE with g_free in all vir*Free() functions remote: replace VIR_FREE with g_free in all vir*Free() functions rpc: replace VIR_FREE with g_free in all vir*Free() functions security: replace VIR_FREE with g_free in all vir*Free() functions tools: replace VIR_FREE with g_free in all vir*Free() functions tests: replace VIR_FREE with g_free in all vir*Free() functions storage: replace VIR_FREE with g_free in all vir*Free() functions libvirtd: replace straggler VIR_FREE with g_free in all vir*Free() functions util: rename two *Free() functions while changing VIR_FREE to g_free qemu: rename virFirmware*Free() functions to have more accurate names qemu: pass pointers instead of copying objects for qemuFirmware*FreeContent() qemu: replace VIR_FREE with g_free in qemuFirmware*FreeContent() rpc: rename virNetSessionAuthMethodsFree to virNetSessionAuthMethodsClear src/admin/admin_server_dispatch.c | 2 +- src/bhyve/bhyve_conf.c | 6 +- src/bhyve/bhyve_domain.c | 2 +- src/conf/domain_conf.c | 6 +- src/conf/numa_conf.c | 10 +-- src/conf/storage_encryption_conf.c | 2 +- src/conf/virchrdev.c | 6 +- src/libvirt-domain.c | 18 +++--- src/libvirt-network.c | 14 ++--- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_migration.c | 6 +- src/locking/lock_daemon.c | 6 +- src/locking/lock_daemon_config.c | 6 +- src/locking/lock_driver_lockd.c | 10 +-- src/locking/lock_driver_sanlock.c | 6 +- src/locking/lock_manager.c | 2 +- src/logging/log_daemon.c | 4 +- src/logging/log_daemon_config.c | 6 +- src/logging/log_handler.c | 6 +- src/logging/log_manager.c | 2 +- src/qemu/qemu_block.c | 36 +++++------ src/qemu/qemu_capabilities.c | 8 +-- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_conf.c | 6 +- src/qemu/qemu_domain.c | 14 ++--- src/qemu/qemu_firmware.c | 42 ++++++------- src/qemu/qemu_migration_params.c | 4 +- src/qemu/qemu_monitor.c | 48 +++++++-------- src/qemu/qemu_monitor_json.c | 22 +++---- src/qemu/qemu_process.c | 24 ++++---- src/qemu/qemu_saveimage.c | 6 +- src/qemu/qemu_slirp.c | 2 +- src/qemu/qemu_vhost_user.c | 8 +-- src/remote/remote_daemon_config.c | 48 +++++++-------- src/remote/remote_daemon_dispatch.c | 4 +- src/remote/remote_driver.c | 2 +- src/rpc/virnetmessage.c | 2 +- src/rpc/virnetsshsession.c | 6 +- src/security/security_dac.c | 8 +-- src/security/security_selinux.c | 10 +-- src/storage/storage_backend_fs.c | 6 +- src/storage/storage_backend_rbd.c | 10 +-- src/storage/storage_backend_scsi.c | 4 +- src/storage/storage_driver.c | 4 +- src/test/test_driver.c | 6 +- src/util/virarptable.c | 8 +-- src/util/virauthconfig.c | 4 +- src/util/virbitmap.c | 4 +- src/util/vircgroup.c | 12 ++-- src/util/vircommand.c | 24 ++++---- src/util/virconf.c | 10 +-- src/util/virdnsmasq.c | 32 +++++----- src/util/virebtables.c | 4 +- src/util/virfdstream.c | 10 +-- src/util/virfile.c | 4 +- src/util/virfirewall.c | 16 ++--- src/util/virfirmware.c | 8 +-- src/util/virjson.c | 12 ++-- src/util/virlockspace.c | 12 ++-- src/util/virlog.c | 12 ++-- src/util/virmacaddr.c | 2 +- src/util/virmdev.c | 16 ++--- src/util/virnetdev.c | 12 ++-- src/util/virnetdevbandwidth.c | 6 +- src/util/virnetdevip.c | 6 +- src/util/virnetdevmacvlan.c | 8 +-- src/util/virnetdevvlan.c | 2 +- src/util/virnvme.c | 2 +- src/util/virobject.c | 2 +- src/util/virpci.c | 18 +++--- src/util/virperf.c | 2 +- src/util/virportallocator.c | 4 +- src/util/virresctrl.c | 6 +- src/util/virrotatingfile.c | 14 ++--- src/util/virscsi.c | 16 ++--- src/util/virscsivhost.c | 10 +-- src/util/virseclabel.c | 16 ++--- src/util/virsocketaddr.c | 2 +- src/util/virsysinfo.c | 96 ++++++++++++++--------------- src/util/virsystemd.c | 6 +- src/util/virthreadpool.c | 6 +- src/util/virtypedparam-public.c | 2 +- src/util/virtypedparam.c | 8 +-- src/util/viruri.c | 20 +++--- src/util/virusb.c | 8 +-- src/util/virxml.c | 4 +- src/vbox/vbox_snapshot_conf.c | 54 ++++++++-------- src/vmx/vmx.c | 6 +- src/vz/vz_driver.c | 8 +-- src/vz/vz_utils.c | 2 +- tests/nodedevmdevctltest.c | 4 +- tests/nwfilterxml2firewalltest.c | 2 +- tests/qemuhotplugtest.c | 12 ++-- tests/qemumonitortestutils.c | 28 ++++----- tests/virnetdaemontest.c | 2 +- tests/virnetserverclienttest.c | 2 +- tools/virsh-checkpoint.c | 6 +- tools/virsh-domain-monitor.c | 4 +- tools/virsh-domain.c | 2 +- tools/virsh-interface.c | 4 +- tools/virsh-network.c | 8 +-- tools/virsh-nodedev.c | 4 +- tools/virsh-nwfilter.c | 8 +-- tools/virsh-pool.c | 4 +- tools/virsh-secret.c | 4 +- tools/virsh-snapshot.c | 6 +- tools/virsh-volume.c | 4 +- tools/vsh-table.c | 10 +-- tools/vsh.c | 6 +- 110 files changed, 557 insertions(+), 557 deletions(-) -- 2.29.2
I missed a few in commit f9f81f1c Signed-off-by: Laine Stump <laine@redhat.com> --- src/conf/domain_conf.c | 6 +++--- src/conf/numa_conf.c | 10 +++++----- src/conf/storage_encryption_conf.c | 2 +- src/conf/virchrdev.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 12ebdb37f4..3f71297283 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26528,7 +26528,7 @@ virDomainRNGDefFree(virDomainRNGDefPtr def) switch ((virDomainRNGBackend) def->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: - VIR_FREE(def->source.file); + g_free(def->source.file); break; case VIR_DOMAIN_RNG_BACKEND_EGD: virObjectUnref(def->source.chardev); @@ -26539,8 +26539,8 @@ virDomainRNGDefFree(virDomainRNGDefPtr def) } virDomainDeviceInfoClear(&def->info); - VIR_FREE(def->virtio); - VIR_FREE(def); + g_free(def->virtio); + g_free(def); } diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index f8a7a01ac9..338d779e90 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -416,15 +416,15 @@ virDomainNumaFree(virDomainNumaPtr numa) virBitmapFree(numa->mem_nodes[i].nodeset); if (numa->mem_nodes[i].ndistances > 0) - VIR_FREE(numa->mem_nodes[i].distances); + g_free(numa->mem_nodes[i].distances); - VIR_FREE(numa->mem_nodes[i].caches); + g_free(numa->mem_nodes[i].caches); } - VIR_FREE(numa->mem_nodes); + g_free(numa->mem_nodes); - VIR_FREE(numa->interconnects); + g_free(numa->interconnects); - VIR_FREE(numa); + g_free(numa); } /** diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 7fd0df70a9..e2ae7f7b51 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -64,7 +64,7 @@ virStorageEncryptionSecretFree(virStorageEncryptionSecretPtr secret) if (!secret) return; virSecretLookupDefClear(&secret->seclookupdef); - VIR_FREE(secret); + g_free(secret); } void diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index d356a1babf..e5257650d4 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -223,8 +223,8 @@ static void virChrdevFDStreamCloseCbFree(void *opaque) { virChrdevStreamInfoPtr priv = opaque; - VIR_FREE(priv->path); - VIR_FREE(priv); + g_free(priv->path); + g_free(priv); } /** @@ -304,7 +304,7 @@ void virChrdevFree(virChrdevsPtr devs) virMutexUnlock(&devs->lock); virMutexDestroy(&devs->lock); - VIR_FREE(devs); + g_free(devs); } /** -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/util/virarptable.c | 8 +-- src/util/virauthconfig.c | 4 +- src/util/virbitmap.c | 4 +- src/util/vircgroup.c | 12 ++--- src/util/vircommand.c | 24 ++++----- src/util/virconf.c | 10 ++-- src/util/virdnsmasq.c | 16 +++--- src/util/virebtables.c | 4 +- src/util/virfdstream.c | 10 ++-- src/util/virfile.c | 4 +- src/util/virfirewall.c | 16 +++--- src/util/virfirmware.c | 8 +-- src/util/virjson.c | 12 ++--- src/util/virlockspace.c | 12 ++--- src/util/virlog.c | 12 ++--- src/util/virmacaddr.c | 2 +- src/util/virmdev.c | 16 +++--- src/util/virnetdev.c | 12 ++--- src/util/virnetdevbandwidth.c | 6 +-- src/util/virnetdevip.c | 6 +-- src/util/virnetdevmacvlan.c | 8 +-- src/util/virnetdevvlan.c | 2 +- src/util/virnvme.c | 2 +- src/util/virobject.c | 2 +- src/util/virpci.c | 18 +++---- src/util/virperf.c | 2 +- src/util/virportallocator.c | 4 +- src/util/virresctrl.c | 6 +-- src/util/virrotatingfile.c | 14 ++--- src/util/virscsi.c | 16 +++--- src/util/virscsivhost.c | 10 ++-- src/util/virseclabel.c | 16 +++--- src/util/virsocketaddr.c | 2 +- src/util/virsysinfo.c | 96 ++++++++++++++++----------------- src/util/virsystemd.c | 6 +-- src/util/virthreadpool.c | 6 +-- src/util/virtypedparam-public.c | 2 +- src/util/virtypedparam.c | 8 +-- src/util/viruri.c | 20 +++---- src/util/virusb.c | 8 +-- src/util/virxml.c | 4 +- 41 files changed, 225 insertions(+), 225 deletions(-) diff --git a/src/util/virarptable.c b/src/util/virarptable.c index dac3486470..dfe3ebee5b 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -172,9 +172,9 @@ virArpTableFree(virArpTablePtr table) return; for (i = 0; i < table->n; i++) { - VIR_FREE(table->t[i].ipaddr); - VIR_FREE(table->t[i].mac); + g_free(table->t[i].ipaddr); + g_free(table->t[i].mac); } - VIR_FREE(table->t); - VIR_FREE(table); + g_free(table->t); + g_free(table); } diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 6b5487c4b0..0fc1b5c589 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -88,8 +88,8 @@ void virAuthConfigFree(virAuthConfigPtr auth) return; g_key_file_free(auth->keyfile); - VIR_FREE(auth->path); - VIR_FREE(auth); + g_free(auth->path); + g_free(auth); } diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 4fde6f4fd2..b2569b0b03 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -94,8 +94,8 @@ void virBitmapFree(virBitmapPtr bitmap) { if (bitmap) { - VIR_FREE(bitmap->map); - VIR_FREE(bitmap); + g_free(bitmap->map); + g_free(bitmap); } } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 15071d8b1b..b11bbc5f9e 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3580,15 +3580,15 @@ virCgroupFree(virCgroupPtr group) return; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - VIR_FREE(group->legacy[i].mountPoint); - VIR_FREE(group->legacy[i].linkPoint); - VIR_FREE(group->legacy[i].placement); + g_free(group->legacy[i].mountPoint); + g_free(group->legacy[i].linkPoint); + g_free(group->legacy[i].placement); } - VIR_FREE(group->unified.mountPoint); - VIR_FREE(group->unified.placement); + g_free(group->unified.mountPoint); + g_free(group->unified.placement); - VIR_FREE(group); + g_free(group); } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index b1a26f68aa..87a60be201 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -3028,25 +3028,25 @@ virCommandFree(virCommandPtr cmd) VIR_FORCE_CLOSE(cmd->passfd[i].fd); } cmd->npassfd = 0; - VIR_FREE(cmd->passfd); + g_free(cmd->passfd); if (cmd->asyncioThread) { virThreadJoin(cmd->asyncioThread); - VIR_FREE(cmd->asyncioThread); + g_free(cmd->asyncioThread); } - VIR_FREE(cmd->inbuf); + g_free(cmd->inbuf); VIR_FORCE_CLOSE(cmd->outfd); VIR_FORCE_CLOSE(cmd->errfd); for (i = 0; i < cmd->nargs; i++) - VIR_FREE(cmd->args[i]); - VIR_FREE(cmd->args); + g_free(cmd->args[i]); + g_free(cmd->args); for (i = 0; i < cmd->nenv; i++) - VIR_FREE(cmd->env[i]); - VIR_FREE(cmd->env); + g_free(cmd->env[i]); + g_free(cmd->env); - VIR_FREE(cmd->pwd); + g_free(cmd->pwd); if (cmd->handshake) { /* The other 2 fds in these arrays are closed @@ -3056,21 +3056,21 @@ virCommandFree(virCommandPtr cmd) VIR_FORCE_CLOSE(cmd->handshakeNotify[1]); } - VIR_FREE(cmd->pidfile); + g_free(cmd->pidfile); if (cmd->reap) virCommandAbort(cmd); #if defined(WITH_SECDRIVER_SELINUX) - VIR_FREE(cmd->seLinuxLabel); + g_free(cmd->seLinuxLabel); #endif #if defined(WITH_SECDRIVER_APPARMOR) - VIR_FREE(cmd->appArmorProfile); + g_free(cmd->appArmorProfile); #endif virCommandFreeSendBuffers(cmd); - VIR_FREE(cmd); + g_free(cmd); } /** diff --git a/src/util/virconf.c b/src/util/virconf.c index e983a769ee..d85fc32b64 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -788,15 +788,15 @@ virConfFree(virConfPtr conf) tmp = conf->entries; while (tmp) { virConfEntryPtr next; - VIR_FREE(tmp->name); + g_free(tmp->name); virConfFreeValue(tmp->value); - VIR_FREE(tmp->comment); + g_free(tmp->comment); next = tmp->next; - VIR_FREE(tmp); + g_free(tmp); tmp = next; } - VIR_FREE(conf->filename); - VIR_FREE(conf); + g_free(conf->filename); + g_free(conf); return 0; } diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 63ac088e06..c21819c981 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -75,14 +75,14 @@ addnhostsFree(dnsmasqAddnHostsfile *addnhostsfile) for (i = 0; i < addnhostsfile->nhosts; i++) addnhostFree(&addnhostsfile->hosts[i]); - VIR_FREE(addnhostsfile->hosts); + g_free(addnhostsfile->hosts); addnhostsfile->nhosts = 0; } - VIR_FREE(addnhostsfile->path); + g_free(addnhostsfile->path); - VIR_FREE(addnhostsfile); + g_free(addnhostsfile); } static int @@ -272,14 +272,14 @@ hostsfileFree(dnsmasqHostsfile *hostsfile) for (i = 0; i < hostsfile->nhosts; i++) dhcphostFree(&hostsfile->hosts[i]); - VIR_FREE(hostsfile->hosts); + g_free(hostsfile->hosts); hostsfile->nhosts = 0; } - VIR_FREE(hostsfile->path); + g_free(hostsfile->path); - VIR_FREE(hostsfile); + g_free(hostsfile); } /* Note: There are many additional dhcp-host specifications @@ -465,14 +465,14 @@ dnsmasqContextFree(dnsmasqContext *ctx) if (!ctx) return; - VIR_FREE(ctx->config_dir); + g_free(ctx->config_dir); if (ctx->hostsfile) hostsfileFree(ctx->hostsfile); if (ctx->addnhostsfile) addnhostsFree(ctx->addnhostsfile); - VIR_FREE(ctx); + g_free(ctx); } /** diff --git a/src/util/virebtables.c b/src/util/virebtables.c index b23ce21ae9..e296cf2578 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -73,8 +73,8 @@ ebtablesContextFree(ebtablesContext *ctx) { if (!ctx) return; - VIR_FREE(ctx->chain); - VIR_FREE(ctx); + g_free(ctx->chain); + g_free(ctx); } diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index 1a7b671179..6a2c6844e1 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -198,14 +198,14 @@ virFDStreamMsgFree(virFDStreamMsgPtr msg) switch (msg->type) { case VIR_FDSTREAM_MSG_TYPE_DATA: - VIR_FREE(msg->stream.data.buf); + g_free(msg->stream.data.buf); break; case VIR_FDSTREAM_MSG_TYPE_HOLE: /* nada */ break; } - VIR_FREE(msg); + g_free(msg); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFDStreamMsg, virFDStreamMsgFree); @@ -413,9 +413,9 @@ virFDStreamThreadDataFree(virFDStreamThreadDataPtr data) return; virObjectUnref(data->st); - VIR_FREE(data->fdinname); - VIR_FREE(data->fdoutname); - VIR_FREE(data); + g_free(data->fdinname); + g_free(data->fdoutname); + g_free(data); } diff --git a/src/util/virfile.c b/src/util/virfile.c index e07f3d6b9c..e25cbe797e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -382,9 +382,9 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) if (!wfd) return; - VIR_FREE(wfd->err_msg); + g_free(wfd->err_msg); virCommandFree(wfd->cmd); - VIR_FREE(wfd); + g_free(wfd); } diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index b84f0f5f48..8b69a18ecc 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -196,9 +196,9 @@ virFirewallRuleFree(virFirewallRulePtr rule) return; for (i = 0; i < rule->argsLen; i++) - VIR_FREE(rule->args[i]); - VIR_FREE(rule->args); - VIR_FREE(rule); + g_free(rule->args[i]); + g_free(rule->args); + g_free(rule); } @@ -212,13 +212,13 @@ virFirewallGroupFree(virFirewallGroupPtr group) for (i = 0; i < group->naction; i++) virFirewallRuleFree(group->action[i]); - VIR_FREE(group->action); + g_free(group->action); for (i = 0; i < group->nrollback; i++) virFirewallRuleFree(group->rollback[i]); - VIR_FREE(group->rollback); + g_free(group->rollback); - VIR_FREE(group); + g_free(group); } @@ -237,9 +237,9 @@ void virFirewallFree(virFirewallPtr firewall) for (i = 0; i < firewall->ngroups; i++) virFirewallGroupFree(firewall->groups[i]); - VIR_FREE(firewall->groups); + g_free(firewall->groups); - VIR_FREE(firewall); + g_free(firewall); } #define VIR_FIREWALL_RETURN_IF_ERROR(firewall) \ diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c index 6b8a64eafa..d49bea3a55 100644 --- a/src/util/virfirmware.c +++ b/src/util/virfirmware.c @@ -37,9 +37,9 @@ virFirmwareFree(virFirmwarePtr firmware) if (!firmware) return; - VIR_FREE(firmware->name); - VIR_FREE(firmware->nvram); - VIR_FREE(firmware); + g_free(firmware->name); + g_free(firmware->nvram); + g_free(firmware); } @@ -51,7 +51,7 @@ virFirmwareFreeList(virFirmwarePtr *firmwares, size_t nfirmwares) for (i = 0; i < nfirmwares; i++) virFirmwareFree(firmwares[i]); - VIR_FREE(firmwares); + g_free(firmwares); } diff --git a/src/util/virjson.c b/src/util/virjson.c index f85b61957c..a509943fde 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -398,28 +398,28 @@ virJSONValueFree(virJSONValuePtr value) switch ((virJSONType) value->type) { case VIR_JSON_TYPE_OBJECT: for (i = 0; i < value->data.object.npairs; i++) { - VIR_FREE(value->data.object.pairs[i].key); + g_free(value->data.object.pairs[i].key); virJSONValueFree(value->data.object.pairs[i].value); } - VIR_FREE(value->data.object.pairs); + g_free(value->data.object.pairs); break; case VIR_JSON_TYPE_ARRAY: for (i = 0; i < value->data.array.nvalues; i++) virJSONValueFree(value->data.array.values[i]); - VIR_FREE(value->data.array.values); + g_free(value->data.array.values); break; case VIR_JSON_TYPE_STRING: - VIR_FREE(value->data.string); + g_free(value->data.string); break; case VIR_JSON_TYPE_NUMBER: - VIR_FREE(value->data.number); + g_free(value->data.number); break; case VIR_JSON_TYPE_BOOLEAN: case VIR_JSON_TYPE_NULL: break; } - VIR_FREE(value); + g_free(value); } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 71d5dfb83e..7df319004e 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -102,11 +102,11 @@ static void virLockSpaceResourceFree(virLockSpaceResourcePtr res) } } - VIR_FREE(res->owners); + g_free(res->owners); VIR_FORCE_CLOSE(res->fd); - VIR_FREE(res->path); - VIR_FREE(res->name); - VIR_FREE(res); + g_free(res->path); + g_free(res->name); + g_free(res); } @@ -499,9 +499,9 @@ void virLockSpaceFree(virLockSpacePtr lockspace) return; virHashFree(lockspace->resources); - VIR_FREE(lockspace->dir); + g_free(lockspace->dir); virMutexDestroy(&lockspace->lock); - VIR_FREE(lockspace); + g_free(lockspace); } diff --git a/src/util/virlog.c b/src/util/virlog.c index fad310a68a..cdfeba8251 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -339,8 +339,8 @@ virLogFilterFree(virLogFilterPtr filter) if (!filter) return; - VIR_FREE(filter->match); - VIR_FREE(filter); + g_free(filter->match); + g_free(filter); } @@ -361,7 +361,7 @@ virLogFilterListFree(virLogFilterPtr *list, int count) for (i = 0; i < count; i++) virLogFilterFree(list[i]); - VIR_FREE(list); + g_free(list); } @@ -387,8 +387,8 @@ virLogOutputFree(virLogOutputPtr output) if (output->c) output->c(output->data); - VIR_FREE(output->name); - VIR_FREE(output); + g_free(output->name); + g_free(output); } @@ -410,7 +410,7 @@ virLogOutputListFree(virLogOutputPtr *list, int count) for (i = 0; i < count; i++) virLogOutputFree(list[i]); - VIR_FREE(list); + g_free(list); } diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 35918bca41..3811457f31 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -250,5 +250,5 @@ virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]) void virMacAddrFree(virMacAddrPtr addr) { - VIR_FREE(addr); + g_free(addr); } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 46db6249de..1f5c2cba30 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -183,10 +183,10 @@ virMediatedDeviceFree(virMediatedDevicePtr dev) { if (!dev) return; - VIR_FREE(dev->path); - VIR_FREE(dev->used_by_drvname); - VIR_FREE(dev->used_by_domname); - VIR_FREE(dev); + g_free(dev->path); + g_free(dev->used_by_drvname); + g_free(dev->used_by_domname); + g_free(dev); } @@ -476,10 +476,10 @@ virMediatedDeviceTypeFree(virMediatedDeviceTypePtr type) if (!type) return; - VIR_FREE(type->id); - VIR_FREE(type->name); - VIR_FREE(type->device_api); - VIR_FREE(type); + g_free(type->id); + g_free(type->name); + g_free(type->device_api); + g_free(type); } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 6ee59989ed..2b4c8b6280 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -127,7 +127,7 @@ struct _virNetDevMcastEntry { static void virNetDevMcastEntryFree(virNetDevMcastEntryPtr entry) { - VIR_FREE(entry); + g_free(entry); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevMcastEntry, virNetDevMcastEntryFree); @@ -2868,11 +2868,11 @@ void virNetDevRxFilterFree(virNetDevRxFilterPtr filter) { if (filter) { - VIR_FREE(filter->name); - VIR_FREE(filter->unicast.table); - VIR_FREE(filter->multicast.table); - VIR_FREE(filter->vlan.table); - VIR_FREE(filter); + g_free(filter->name); + g_free(filter->unicast.table); + g_free(filter->multicast.table); + g_free(filter->vlan.table); + g_free(filter); } } diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index c8eb5cfc79..612e8f985c 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -34,9 +34,9 @@ virNetDevBandwidthFree(virNetDevBandwidthPtr def) if (!def) return; - VIR_FREE(def->in); - VIR_FREE(def->out); - VIR_FREE(def); + g_free(def->in); + g_free(def->out); + g_free(def); } static void diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index fc7808cbaa..4eb8ef76d1 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -775,8 +775,8 @@ virNetDevIPRouteFree(virNetDevIPRoutePtr def) { if (!def) return; - VIR_FREE(def->family); - VIR_FREE(def); + g_free(def->family); + g_free(def); } virSocketAddrPtr @@ -913,5 +913,5 @@ virNetDevIPInfoAddToDev(const char *ifname, void virNetDevIPAddrFree(virNetDevIPAddrPtr ip) { - VIR_FREE(ip); + g_free(ip); } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2deefe6589..ed677193af 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -563,11 +563,11 @@ static void virNetlinkCallbackDataFree(virNetlinkCallbackDataPtr calld) { if (calld) { - VIR_FREE(calld->cr_ifname); - VIR_FREE(calld->virtPortProfile); - VIR_FREE(calld->linkdev); + g_free(calld->cr_ifname); + g_free(calld->virtPortProfile); + g_free(calld->linkdev); } - VIR_FREE(calld); + g_free(calld); } /** diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 154d92497c..339290fe79 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -39,7 +39,7 @@ virNetDevVlanFree(virNetDevVlanPtr vlan) { if (vlan) virNetDevVlanClear(vlan); - VIR_FREE(vlan); + g_free(vlan); } int diff --git a/src/util/virnvme.c b/src/util/virnvme.c index 66b73cd1d1..af297552c1 100644 --- a/src/util/virnvme.c +++ b/src/util/virnvme.c @@ -86,7 +86,7 @@ virNVMeDeviceFree(virNVMeDevicePtr dev) return; virNVMeDeviceUsedByClear(dev); - VIR_FREE(dev); + g_free(dev); } diff --git a/src/util/virobject.c b/src/util/virobject.c index a6305354c3..ce40ffae22 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -632,7 +632,7 @@ virObjectListFree(void *list) for (next = (void **) list; *next; next++) virObjectUnref(*next); - VIR_FREE(list); + g_free(list); } diff --git a/src/util/virpci.c b/src/util/virpci.c index ce6b132688..b8e8422aa0 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1520,11 +1520,11 @@ virPCIDeviceFree(virPCIDevicePtr dev) if (!dev) return; VIR_DEBUG("%s %s: freeing", dev->id, dev->name); - VIR_FREE(dev->name); - VIR_FREE(dev->path); - VIR_FREE(dev->used_by_drvname); - VIR_FREE(dev->used_by_domname); - VIR_FREE(dev); + g_free(dev->name); + g_free(dev->path); + g_free(dev->used_by_drvname); + g_free(dev->used_by_domname); + g_free(dev); } /** @@ -2819,13 +2819,13 @@ virPCIEDeviceInfoFree(virPCIEDeviceInfoPtr dev) if (!dev) return; - VIR_FREE(dev->link_cap); - VIR_FREE(dev->link_sta); - VIR_FREE(dev); + g_free(dev->link_cap); + g_free(dev->link_sta); + g_free(dev); } void virPCIDeviceAddressFree(virPCIDeviceAddressPtr address) { - VIR_FREE(address); + g_free(address); } diff --git a/src/util/virperf.c b/src/util/virperf.c index 7f260d2da6..f6b9a3824b 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -394,5 +394,5 @@ virPerfFree(virPerfPtr perf) virPerfEventDisable(perf, i); } - VIR_FREE(perf); + g_free(perf); } diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 76c6e43726..d694d53b5e 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -117,8 +117,8 @@ virPortAllocatorRangeFree(virPortAllocatorRangePtr range) if (!range) return; - VIR_FREE(range->name); - VIR_FREE(range); + g_free(range->name); + g_free(range); } static int diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 67a921b44b..4ee95aa232 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -232,7 +232,7 @@ virResctrlInfoMonFree(virResctrlInfoMonPtr mon) return; g_strfreev(mon->features); - VIR_FREE(mon); + g_free(mon); } @@ -2752,6 +2752,6 @@ virResctrlMonitorStatsFree(virResctrlMonitorStatsPtr stat) return; g_strfreev(stat->features); - VIR_FREE(stat->vals); - VIR_FREE(stat); + g_free(stat->vals); + g_free(stat); } diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 9f1ef17c3e..718578765f 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -80,7 +80,7 @@ virRotatingFileWriterEntryFree(virRotatingFileWriterEntryPtr entry) return; VIR_FORCE_CLOSE(entry->fd); - VIR_FREE(entry); + g_free(entry); } @@ -90,9 +90,9 @@ virRotatingFileReaderEntryFree(virRotatingFileReaderEntryPtr entry) if (!entry) return; - VIR_FREE(entry->path); + g_free(entry->path); VIR_FORCE_CLOSE(entry->fd); - VIR_FREE(entry); + g_free(entry); } @@ -610,8 +610,8 @@ virRotatingFileWriterFree(virRotatingFileWriterPtr file) return; virRotatingFileWriterEntryFree(file->entry); - VIR_FREE(file->basepath); - VIR_FREE(file); + g_free(file->basepath); + g_free(file); } @@ -631,6 +631,6 @@ virRotatingFileReaderFree(virRotatingFileReaderPtr file) for (i = 0; i < file->nentries; i++) virRotatingFileReaderEntryFree(file->entries[i]); - VIR_FREE(file->entries); - VIR_FREE(file); + g_free(file->entries); + g_free(file); } diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 22d4679368..0c753c075e 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -222,9 +222,9 @@ virSCSIDeviceNew(const char *sysfs_prefix, static void virSCSIDeviceUsedByInfoFree(virUsedByInfoPtr used_by) { - VIR_FREE(used_by->drvname); - VIR_FREE(used_by->domname); - VIR_FREE(used_by); + g_free(used_by->drvname); + g_free(used_by->domname); + g_free(used_by); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(virUsedByInfo, virSCSIDeviceUsedByInfoFree); @@ -236,13 +236,13 @@ virSCSIDeviceFree(virSCSIDevicePtr dev) if (!dev) return; - VIR_FREE(dev->id); - VIR_FREE(dev->name); - VIR_FREE(dev->sg_path); + g_free(dev->id); + g_free(dev->name); + g_free(dev->sg_path); for (i = 0; i < dev->n_used_by; i++) virSCSIDeviceUsedByInfoFree(dev->used_by[i]); - VIR_FREE(dev->used_by); - VIR_FREE(dev); + g_free(dev->used_by); + g_free(dev); } int diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index a2bf9a446f..5907edbc7e 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -268,9 +268,9 @@ virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev) if (!dev) return; VIR_DEBUG("%s: freeing", dev->name); - VIR_FREE(dev->name); - VIR_FREE(dev->path); - VIR_FREE(dev->used_by_drvname); - VIR_FREE(dev->used_by_domname); - VIR_FREE(dev); + g_free(dev->name); + g_free(dev->path); + g_free(dev->used_by_drvname); + g_free(dev->used_by_domname); + g_free(dev); } diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c index 174f344a8b..3dc2b74a9c 100644 --- a/src/util/virseclabel.c +++ b/src/util/virseclabel.c @@ -34,11 +34,11 @@ virSecurityLabelDefFree(virSecurityLabelDefPtr def) { if (!def) return; - VIR_FREE(def->model); - VIR_FREE(def->label); - VIR_FREE(def->imagelabel); - VIR_FREE(def->baselabel); - VIR_FREE(def); + g_free(def->model); + g_free(def->label); + g_free(def->imagelabel); + g_free(def->baselabel); + g_free(def); } @@ -47,9 +47,9 @@ virSecurityDeviceLabelDefFree(virSecurityDeviceLabelDefPtr def) { if (!def) return; - VIR_FREE(def->model); - VIR_FREE(def->label); - VIR_FREE(def); + g_free(def->model); + g_free(def->label); + g_free(def); } diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 65aaa632c7..8ac0ab5f5a 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1307,5 +1307,5 @@ virSocketAddrPTRDomain(const virSocketAddr *addr, void virSocketAddrFree(virSocketAddrPtr addr) { - VIR_FREE(addr); + g_free(addr); } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 28f7104145..995650334c 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -68,11 +68,11 @@ void virSysinfoBIOSDefFree(virSysinfoBIOSDefPtr def) if (def == NULL) return; - VIR_FREE(def->vendor); - VIR_FREE(def->version); - VIR_FREE(def->date); - VIR_FREE(def->release); - VIR_FREE(def); + g_free(def->vendor); + g_free(def->version); + g_free(def->date); + g_free(def->release); + g_free(def); } void virSysinfoSystemDefFree(virSysinfoSystemDefPtr def) @@ -80,14 +80,14 @@ void virSysinfoSystemDefFree(virSysinfoSystemDefPtr def) if (def == NULL) return; - VIR_FREE(def->manufacturer); - VIR_FREE(def->product); - VIR_FREE(def->version); - VIR_FREE(def->serial); - VIR_FREE(def->uuid); - VIR_FREE(def->sku); - VIR_FREE(def->family); - VIR_FREE(def); + g_free(def->manufacturer); + g_free(def->product); + g_free(def->version); + g_free(def->serial); + g_free(def->uuid); + g_free(def->sku); + g_free(def->family); + g_free(def); } void virSysinfoBaseBoardDefClear(virSysinfoBaseBoardDefPtr def) @@ -109,12 +109,12 @@ void virSysinfoChassisDefFree(virSysinfoChassisDefPtr def) if (def == NULL) return; - VIR_FREE(def->manufacturer); - VIR_FREE(def->version); - VIR_FREE(def->serial); - VIR_FREE(def->asset); - VIR_FREE(def->sku); - VIR_FREE(def); + g_free(def->manufacturer); + g_free(def->version); + g_free(def->serial); + g_free(def->asset); + g_free(def->sku); + g_free(def); } @@ -126,10 +126,10 @@ void virSysinfoOEMStringsDefFree(virSysinfoOEMStringsDefPtr def) return; for (i = 0; i < def->nvalues; i++) - VIR_FREE(def->values[i]); - VIR_FREE(def->values); + g_free(def->values[i]); + g_free(def->values); - VIR_FREE(def); + g_free(def); } @@ -164,45 +164,45 @@ void virSysinfoDefFree(virSysinfoDefPtr def) for (i = 0; i < def->nbaseBoard; i++) virSysinfoBaseBoardDefClear(def->baseBoard + i); - VIR_FREE(def->baseBoard); + g_free(def->baseBoard); virSysinfoChassisDefFree(def->chassis); for (i = 0; i < def->nprocessor; i++) { - VIR_FREE(def->processor[i].processor_socket_destination); - VIR_FREE(def->processor[i].processor_type); - VIR_FREE(def->processor[i].processor_family); - VIR_FREE(def->processor[i].processor_manufacturer); - VIR_FREE(def->processor[i].processor_signature); - VIR_FREE(def->processor[i].processor_version); - VIR_FREE(def->processor[i].processor_external_clock); - VIR_FREE(def->processor[i].processor_max_speed); - VIR_FREE(def->processor[i].processor_status); - VIR_FREE(def->processor[i].processor_serial_number); - VIR_FREE(def->processor[i].processor_part_number); + g_free(def->processor[i].processor_socket_destination); + g_free(def->processor[i].processor_type); + g_free(def->processor[i].processor_family); + g_free(def->processor[i].processor_manufacturer); + g_free(def->processor[i].processor_signature); + g_free(def->processor[i].processor_version); + g_free(def->processor[i].processor_external_clock); + g_free(def->processor[i].processor_max_speed); + g_free(def->processor[i].processor_status); + g_free(def->processor[i].processor_serial_number); + g_free(def->processor[i].processor_part_number); } - VIR_FREE(def->processor); + g_free(def->processor); for (i = 0; i < def->nmemory; i++) { - VIR_FREE(def->memory[i].memory_size); - VIR_FREE(def->memory[i].memory_form_factor); - VIR_FREE(def->memory[i].memory_locator); - VIR_FREE(def->memory[i].memory_bank_locator); - VIR_FREE(def->memory[i].memory_type); - VIR_FREE(def->memory[i].memory_type_detail); - VIR_FREE(def->memory[i].memory_speed); - VIR_FREE(def->memory[i].memory_manufacturer); - VIR_FREE(def->memory[i].memory_serial_number); - VIR_FREE(def->memory[i].memory_part_number); + g_free(def->memory[i].memory_size); + g_free(def->memory[i].memory_form_factor); + g_free(def->memory[i].memory_locator); + g_free(def->memory[i].memory_bank_locator); + g_free(def->memory[i].memory_type); + g_free(def->memory[i].memory_type_detail); + g_free(def->memory[i].memory_speed); + g_free(def->memory[i].memory_manufacturer); + g_free(def->memory[i].memory_serial_number); + g_free(def->memory[i].memory_part_number); } - VIR_FREE(def->memory); + g_free(def->memory); virSysinfoOEMStringsDefFree(def->oemStrings); for (i = 0; i < def->nfw_cfgs; i++) virSysinfoFWCfgDefClear(&def->fw_cfgs[i]); - VIR_FREE(def->fw_cfgs); + g_free(def->fw_cfgs); - VIR_FREE(def); + g_free(def); } diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index edd29f0fdd..3f689365e4 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -640,8 +640,8 @@ virSystemdActivationEntryFree(void *data) VIR_FORCE_CLOSE(ent->fds[i]); } - VIR_FREE(ent->fds); - VIR_FREE(ent); + g_free(ent->fds); + g_free(ent); } @@ -1048,5 +1048,5 @@ virSystemdActivationFree(virSystemdActivationPtr act) virHashFree(act->fds); - VIR_FREE(act); + g_free(act); } diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 3942633431..942cfa48b1 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -305,14 +305,14 @@ void virThreadPoolFree(virThreadPoolPtr pool) virMutexLock(&pool->mutex); virThreadPoolDrainLocked(pool); - VIR_FREE(pool->workers); + g_free(pool->workers); virMutexUnlock(&pool->mutex); virMutexDestroy(&pool->mutex); virCondDestroy(&pool->quit_cond); virCondDestroy(&pool->cond); - VIR_FREE(pool->prioWorkers); + g_free(pool->prioWorkers); virCondDestroy(&pool->prioCond); - VIR_FREE(pool); + g_free(pool); } diff --git a/src/util/virtypedparam-public.c b/src/util/virtypedparam-public.c index 0ddb618dbf..91603cfe1c 100644 --- a/src/util/virtypedparam-public.c +++ b/src/util/virtypedparam-public.c @@ -880,5 +880,5 @@ virTypedParamsFree(virTypedParameterPtr params, int nparams) { virTypedParamsClear(params, nparams); - VIR_FREE(params); + g_free(params); } diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index 43af4a7c56..f9ab6f6042 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -485,11 +485,11 @@ virTypedParamsRemoteFree(virTypedParameterRemotePtr remote_params_val, return; for (i = 0; i < remote_params_len; i++) { - VIR_FREE(remote_params_val[i].field); + g_free(remote_params_val[i].field); if (remote_params_val[i].value.type == VIR_TYPED_PARAM_STRING) - VIR_FREE(remote_params_val[i].value.remote_typed_param_value.s); + g_free(remote_params_val[i].value.remote_typed_param_value.s); } - VIR_FREE(remote_params_val); + g_free(remote_params_val); } @@ -724,7 +724,7 @@ virTypedParamListFree(virTypedParamListPtr list) return; virTypedParamsFree(list->par, list->npar); - VIR_FREE(list); + g_free(list); } diff --git a/src/util/viruri.c b/src/util/viruri.c index ef5ab363d6..0aafd49d6d 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -279,20 +279,20 @@ void virURIFree(virURIPtr uri) if (!uri) return; - VIR_FREE(uri->scheme); - VIR_FREE(uri->server); - VIR_FREE(uri->user); - VIR_FREE(uri->path); - VIR_FREE(uri->query); - VIR_FREE(uri->fragment); + g_free(uri->scheme); + g_free(uri->server); + g_free(uri->user); + g_free(uri->path); + g_free(uri->query); + g_free(uri->fragment); for (i = 0; i < uri->paramsCount; i++) { - VIR_FREE(uri->params[i].name); - VIR_FREE(uri->params[i].value); + g_free(uri->params[i].name); + g_free(uri->params[i].value); } - VIR_FREE(uri->params); + g_free(uri->params); - VIR_FREE(uri); + g_free(uri); } diff --git a/src/util/virusb.c b/src/util/virusb.c index a8afd6e6f0..ae400de656 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -354,10 +354,10 @@ virUSBDeviceFree(virUSBDevicePtr dev) if (!dev) return; VIR_DEBUG("%s %s: freeing", dev->id, dev->name); - VIR_FREE(dev->path); - VIR_FREE(dev->used_by_drvname); - VIR_FREE(dev->used_by_domname); - VIR_FREE(dev); + g_free(dev->path); + g_free(dev->used_by_drvname); + g_free(dev->used_by_domname); + g_free(dev); } int diff --git a/src/util/virxml.c b/src/util/virxml.c index 7df50e4b4d..0354251941 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1312,12 +1312,12 @@ virXMLValidatorFree(virXMLValidatorPtr validator) if (!validator) return; - VIR_FREE(validator->schemafile); + g_free(validator->schemafile); virBufferFreeAndReset(&validator->buf); xmlRelaxNGFreeParserCtxt(validator->rngParser); xmlRelaxNGFreeValidCtxt(validator->rngValid); xmlRelaxNGFree(validator->rng); - VIR_FREE(validator); + g_free(validator); } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/bhyve/bhyve_conf.c | 6 +++--- src/bhyve/bhyve_domain.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c index f3e2ebf7c7..9012eb8b5f 100644 --- a/src/bhyve/bhyve_conf.c +++ b/src/bhyve/bhyve_conf.c @@ -109,8 +109,8 @@ bhyveDomainCmdlineDefFree(bhyveDomainCmdlineDefPtr def) return; for (i = 0; i < def->num_args; i++) - VIR_FREE(def->args[i]); + g_free(def->args[i]); - VIR_FREE(def->args); - VIR_FREE(def); + g_free(def->args); + g_free(def); } diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index f0e553113f..1d99ba6c96 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -50,7 +50,7 @@ bhyveDomainObjPrivateFree(void *data) virDomainPCIAddressSetFree(priv->pciaddrs); - VIR_FREE(priv); + g_free(priv); } virDomainXMLPrivateDataCallbacks virBhyveDriverPrivateDataCallbacks = { -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_migration.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 380f7e0b56..3bcd369d12 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -239,7 +239,7 @@ libxlDomainObjPrivateFree(void *data) { libxlDomainObjPrivatePtr priv = data; - VIR_FREE(priv->lockState); + g_free(priv->lockState); virObjectUnref(priv); } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f480f8067e..2e002b2930 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -127,7 +127,7 @@ libxlDomainManagedSaveLoad(virDomainObjPtr vm, static void libxlOSEventHookInfoFree(void *obj) { - VIR_FREE(obj); + g_free(obj); } static void diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 2925aaaa6d..72b6cb32cb 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -82,9 +82,9 @@ libxlMigrationCookieFree(libxlMigrationCookiePtr mig) if (!mig) return; - VIR_FREE(mig->srcHostname); - VIR_FREE(mig->name); - VIR_FREE(mig); + g_free(mig->srcHostname); + g_free(mig->name); + g_free(mig); } static libxlMigrationCookiePtr -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/qemu/qemu_block.c | 36 ++++++++++++------------ src/qemu/qemu_capabilities.c | 8 +++--- src/qemu/qemu_cgroup.c | 4 +-- src/qemu/qemu_conf.c | 6 ++-- src/qemu/qemu_domain.c | 14 +++++----- src/qemu/qemu_firmware.c | 10 +++---- src/qemu/qemu_migration_params.c | 4 +-- src/qemu/qemu_monitor.c | 48 ++++++++++++++++---------------- src/qemu/qemu_monitor_json.c | 22 +++++++-------- src/qemu/qemu_process.c | 24 ++++++++-------- src/qemu/qemu_saveimage.c | 6 ++-- src/qemu/qemu_slirp.c | 2 +- src/qemu/qemu_vhost_user.c | 8 +++--- 13 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 0b8ca2a3f5..3d88e701b2 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -77,17 +77,17 @@ qemuBlockNodeNameBackingChainDataFree(qemuBlockNodeNameBackingChainDataPtr data) if (!data) return; - VIR_FREE(data->nodeformat); - VIR_FREE(data->nodestorage); + g_free(data->nodeformat); + g_free(data->nodestorage); - VIR_FREE(data->qemufilename); + g_free(data->qemufilename); - VIR_FREE(data->drvformat); - VIR_FREE(data->drvstorage); + g_free(data->drvformat); + g_free(data->drvstorage); qemuBlockNodeNameBackingChainDataFree(data->backing); - VIR_FREE(data); + g_free(data); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNodeNameBackingChainData, @@ -1635,16 +1635,16 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data) virJSONValueFree(data->encryptsecretProps); virJSONValueFree(data->tlsProps); virJSONValueFree(data->tlsKeySecretProps); - VIR_FREE(data->tlsAlias); - VIR_FREE(data->tlsKeySecretAlias); - VIR_FREE(data->authsecretAlias); - VIR_FREE(data->encryptsecretAlias); - VIR_FREE(data->httpcookiesecretAlias); - VIR_FREE(data->driveCmd); - VIR_FREE(data->driveAlias); - VIR_FREE(data->chardevAlias); - VIR_FREE(data->chardevCmd); - VIR_FREE(data); + g_free(data->tlsAlias); + g_free(data->tlsKeySecretAlias); + g_free(data->authsecretAlias); + g_free(data->encryptsecretAlias); + g_free(data->httpcookiesecretAlias); + g_free(data->driveCmd); + g_free(data->driveAlias); + g_free(data->chardevAlias); + g_free(data->chardevCmd); + g_free(data); } @@ -1960,8 +1960,8 @@ qemuBlockStorageSourceChainDataFree(qemuBlockStorageSourceChainDataPtr data) for (i = 0; i < data->nsrcdata; i++) qemuBlockStorageSourceAttachDataFree(data->srcdata[i]); - VIR_FREE(data->srcdata); - VIR_FREE(data); + g_free(data->srcdata); + g_free(data); } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 109a7ed9de..c57864f602 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4112,10 +4112,10 @@ virQEMUCapsCachePrivFree(void *privData) { virQEMUCapsCachePrivPtr priv = privData; - VIR_FREE(priv->libDir); - VIR_FREE(priv->kernelVersion); - VIR_FREE(priv->hostCPUSignature); - VIR_FREE(priv); + g_free(priv->libDir); + g_free(priv->kernelVersion); + g_free(priv->hostCPUSignature); + g_free(priv); } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index cb8112ea90..39c83d1478 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1215,8 +1215,8 @@ qemuCgroupEmulatorAllNodesDataFree(qemuCgroupEmulatorAllNodesDataPtr data) return; virCgroupFree(data->emulatorCgroup); - VIR_FREE(data->emulatorMemMask); - VIR_FREE(data); + g_free(data->emulatorMemMask); + g_free(data); } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 151bea01eb..eae94bb5a2 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1579,9 +1579,9 @@ qemuSharedDeviceEntryFree(void *payload) return; for (i = 0; i < entry->ref; i++) - VIR_FREE(entry->domains[i]); - VIR_FREE(entry->domains); - VIR_FREE(entry); + g_free(entry->domains[i]); + g_free(entry->domains); + g_free(entry); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a970de619e..6ab8a94b73 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1803,8 +1803,8 @@ qemuDomainObjPrivateFree(void *data) virObjectUnref(priv->monConfig); qemuDomainObjClearJob(&priv->job); - VIR_FREE(priv->lockState); - VIR_FREE(priv->origname); + g_free(priv->lockState); + g_free(priv->origname); virChrdevFree(priv->devs); @@ -1817,7 +1817,7 @@ qemuDomainObjPrivateFree(void *data) VIR_ERROR(_("Unexpected QEMU agent still active during domain deletion")); qemuAgentClose(priv->agent); } - VIR_FREE(priv->cleanupCallbacks); + g_free(priv->cleanupCallbacks); g_clear_pointer(&priv->migSecinfo, qemuDomainSecretInfoFree); qemuDomainMasterKeyFree(priv); @@ -1830,7 +1830,7 @@ qemuDomainObjPrivateFree(void *data) g_object_unref(priv->eventThread); } - VIR_FREE(priv); + g_free(priv); } @@ -3238,7 +3238,7 @@ qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def) virStringListFreeCount(def->capsadd, def->ncapsadd); virStringListFreeCount(def->capsdel, def->ncapsdel); - VIR_FREE(def); + g_free(def); } @@ -10845,7 +10845,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_BLOCK_JOB: case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED: - VIR_FREE(event->data); + g_free(event->data); break; case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE: virObjectUnref(event->data); @@ -10854,7 +10854,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_LAST: break; } - VIR_FREE(event); + g_free(event); } diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 639cff7459..fe30db4f79 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -180,7 +180,7 @@ struct _qemuFirmware { static void qemuFirmwareOSInterfaceFree(qemuFirmwareOSInterface *interfaces) { - VIR_FREE(interfaces); + g_free(interfaces); } @@ -245,7 +245,7 @@ qemuFirmwareTargetFree(qemuFirmwareTargetPtr target) virStringListFreeCount(target->machines, target->nmachines); - VIR_FREE(target); + g_free(target); } @@ -255,7 +255,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareTarget, qemuFirmwareTargetFree); static void qemuFirmwareFeatureFree(qemuFirmwareFeature *features) { - VIR_FREE(features); + g_free(features); } @@ -274,10 +274,10 @@ qemuFirmwareFree(qemuFirmwarePtr fw) qemuFirmwareMappingFree(fw->mapping); for (i = 0; i < fw->ntargets; i++) qemuFirmwareTargetFree(fw->targets[i]); - VIR_FREE(fw->targets); + g_free(fw->targets); qemuFirmwareFeatureFree(fw->features); - VIR_FREE(fw); + g_free(fw); } diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 8c019bf2ce..510dad783a 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -261,11 +261,11 @@ qemuMigrationParamsFree(qemuMigrationParamsPtr migParams) for (i = 0; i < QEMU_MIGRATION_PARAM_LAST; i++) { if (qemuMigrationParamTypes[i] == QEMU_MIGRATION_PARAM_TYPE_STRING) - VIR_FREE(migParams->params[i].value.s); + g_free(migParams->params[i].value.s); } virBitmapFree(migParams->caps); - VIR_FREE(migParams); + g_free(migParams); } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 990519252e..2d9c9754d1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1674,7 +1674,7 @@ qemuMonitorCPUInfoFree(qemuMonitorCPUInfoPtr cpus, qemuMonitorCPUInfoClear(cpus, ncpus); - VIR_FREE(cpus); + g_free(cpus); } void @@ -1687,9 +1687,9 @@ qemuMonitorQueryCpusFree(struct qemuMonitorQueryCpusEntry *entries, return; for (i = 0; i < nentries; i++) - VIR_FREE(entries[i].qom_path); + g_free(entries[i].qom_path); - VIR_FREE(entries); + g_free(entries); } @@ -2085,8 +2085,8 @@ qemuDomainDiskInfoFree(void *value) { struct qemuDomainDiskInfo *info = value; - VIR_FREE(info->nodename); - VIR_FREE(info); + g_free(info->nodename); + g_free(info); } @@ -2871,8 +2871,8 @@ qemuMonitorChardevInfoFree(void *data) { qemuMonitorChardevInfoPtr info = data; - VIR_FREE(info->ptyPath); - VIR_FREE(info); + g_free(info->ptyPath); + g_free(info); } @@ -3603,11 +3603,11 @@ qemuMonitorMachineInfoFree(qemuMonitorMachineInfoPtr machine) { if (!machine) return; - VIR_FREE(machine->name); - VIR_FREE(machine->alias); - VIR_FREE(machine->defaultCPU); - VIR_FREE(machine->defaultRAMid); - VIR_FREE(machine); + g_free(machine->name); + g_free(machine->alias); + g_free(machine->defaultCPU); + g_free(machine->defaultRAMid); + g_free(machine); } @@ -3735,14 +3735,14 @@ qemuMonitorCPUModelInfoFree(qemuMonitorCPUModelInfoPtr model_info) return; for (i = 0; i < model_info->nprops; i++) { - VIR_FREE(model_info->props[i].name); + g_free(model_info->props[i].name); if (model_info->props[i].type == QEMU_MONITOR_CPU_PROPERTY_STRING) - VIR_FREE(model_info->props[i].value.string); + g_free(model_info->props[i].value.string); } - VIR_FREE(model_info->props); - VIR_FREE(model_info->name); - VIR_FREE(model_info); + g_free(model_info->props); + g_free(model_info->name); + g_free(model_info); } @@ -4378,7 +4378,7 @@ qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfoPtr info) switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - VIR_FREE(info->data.s390.reason); + g_free(info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: @@ -4386,7 +4386,7 @@ qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfoPtr info) break; } - VIR_FREE(info); + g_free(info); } @@ -4396,8 +4396,8 @@ qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidStatusPtr info) if (!info) return; - VIR_FREE(info->netdev); - VIR_FREE(info); + g_free(info->netdev); + g_free(info); } @@ -4588,9 +4588,9 @@ qemuMonitorJobInfoFree(qemuMonitorJobInfoPtr job) if (!job) return; - VIR_FREE(job->id); - VIR_FREE(job->error); - VIR_FREE(job); + g_free(job->id); + g_free(job->error); + g_free(job); } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 97c5e5b36c..a02d29d52a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -591,11 +591,11 @@ qemuMonitorJSONParseKeywordsFree(int nkeywords, { size_t i; for (i = 0; i < nkeywords; i++) { - VIR_FREE(keywords[i]); - VIR_FREE(values[i]); + g_free(keywords[i]); + g_free(values[i]); } - VIR_FREE(keywords); - VIR_FREE(values); + g_free(keywords); + g_free(values); } @@ -6561,9 +6561,9 @@ void qemuMonitorJSONListPathFree(qemuMonitorJSONListPathPtr paths) { if (!paths) return; - VIR_FREE(paths->name); - VIR_FREE(paths->type); - VIR_FREE(paths); + g_free(paths->name); + g_free(paths->type); + g_free(paths); } @@ -8573,13 +8573,13 @@ qemuMonitorQueryHotpluggableCpusFree(struct qemuMonitorQueryHotpluggableCpusEntr for (i = 0; i < nentries; i++) { entry = entries + i; - VIR_FREE(entry->type); - VIR_FREE(entry->qom_path); - VIR_FREE(entry->alias); + g_free(entry->type); + g_free(entry->qom_path); + g_free(entry->alias); virJSONValueFree(entry->props); } - VIR_FREE(entries); + g_free(entries); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f87a3c0f60..30cfa4d485 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4604,10 +4604,10 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDefPtr inc) if (!inc) return; - VIR_FREE(inc->address); - VIR_FREE(inc->launchURI); - VIR_FREE(inc->deferredURI); - VIR_FREE(inc); + g_free(inc->address); + g_free(inc->launchURI); + g_free(inc->deferredURI); + g_free(inc); } @@ -8713,14 +8713,14 @@ qemuProcessQMPFree(qemuProcessQMPPtr proc) g_object_unref(proc->eventThread); - VIR_FREE(proc->binary); - VIR_FREE(proc->libDir); - VIR_FREE(proc->uniqDir); - VIR_FREE(proc->monpath); - VIR_FREE(proc->monarg); - VIR_FREE(proc->pidfile); - VIR_FREE(proc->stdErr); - VIR_FREE(proc); + g_free(proc->binary); + g_free(proc->libDir); + g_free(proc->uniqDir); + g_free(proc->monpath); + g_free(proc->monarg); + g_free(proc->pidfile); + g_free(proc->stdErr); + g_free(proc); } diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 0e588d463d..de2d63dd9a 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -83,9 +83,9 @@ virQEMUSaveDataFree(virQEMUSaveDataPtr data) if (!data) return; - VIR_FREE(data->xml); - VIR_FREE(data->cookie); - VIR_FREE(data); + g_free(data->xml); + g_free(data->cookie); + g_free(data); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUSaveData, virQEMUSaveDataFree); diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 4c4949f88b..62a6665679 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -58,7 +58,7 @@ qemuSlirpFree(qemuSlirpPtr slirp) VIR_FORCE_CLOSE(slirp->fd[0]); VIR_FORCE_CLOSE(slirp->fd[1]); virBitmapFree(slirp->features); - VIR_FREE(slirp); + g_free(slirp); } diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 0a69d690ca..5ceefbe456 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -113,7 +113,7 @@ struct _qemuVhostUser { static void qemuVhostUserGPUFeatureFree(qemuVhostUserGPUFeature *features) { - VIR_FREE(features); + g_free(features); } @@ -127,11 +127,11 @@ qemuVhostUserFree(qemuVhostUserPtr vu) return; if (vu->type == QEMU_VHOST_USER_TYPE_GPU) - VIR_FREE(vu->capabilities.gpu.features); + g_free(vu->capabilities.gpu.features); - VIR_FREE(vu->binary); + g_free(vu->binary); - VIR_FREE(vu); + g_free(vu); } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/test/test_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 29c4c86b1d..bca1297d1d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -198,8 +198,8 @@ testDomainDefNamespaceFree(void *data) for (i = 0; i < nsdata->num_snap_nodes; i++) xmlFreeNode(nsdata->snap_nodes[i]); - VIR_FREE(nsdata->snap_nodes); - VIR_FREE(nsdata); + g_free(nsdata->snap_nodes); + g_free(nsdata); } static int @@ -428,7 +428,7 @@ static void testDomainObjPrivateFree(void *data) { testDomainObjPrivatePtr priv = data; - VIR_FREE(priv); + g_free(priv); } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/vbox/vbox_snapshot_conf.c | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index cb201e777e..f1cae3039a 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -502,14 +502,14 @@ virVboxSnapshotConfHardDiskFree(virVBoxSnapshotConfHardDiskPtr disk) if (!disk) return; - VIR_FREE(disk->uuid); - VIR_FREE(disk->location); - VIR_FREE(disk->format); - VIR_FREE(disk->type); + g_free(disk->uuid); + g_free(disk->location); + g_free(disk->format); + g_free(disk->type); for (i = 0; i < disk->nchildren; i++) virVboxSnapshotConfHardDiskFree(disk->children[i]); - VIR_FREE(disk->children); - VIR_FREE(disk); + g_free(disk->children); + g_free(disk); } @@ -523,11 +523,11 @@ virVBoxSnapshotConfMediaRegistryFree(virVBoxSnapshotConfMediaRegistryPtr mediaRe for (i = 0; i < mediaRegistry->ndisks; i++) virVboxSnapshotConfHardDiskFree(mediaRegistry->disks[i]); - VIR_FREE(mediaRegistry->disks); + g_free(mediaRegistry->disks); for (i = 0; i < mediaRegistry->notherMedia; i++) - VIR_FREE(mediaRegistry->otherMedia[i]); - VIR_FREE(mediaRegistry->otherMedia); - VIR_FREE(mediaRegistry); + g_free(mediaRegistry->otherMedia[i]); + g_free(mediaRegistry->otherMedia); + g_free(mediaRegistry); } void @@ -538,16 +538,16 @@ virVBoxSnapshotConfSnapshotFree(virVBoxSnapshotConfSnapshotPtr snapshot) if (!snapshot) return; - VIR_FREE(snapshot->uuid); - VIR_FREE(snapshot->name); - VIR_FREE(snapshot->timeStamp); - VIR_FREE(snapshot->description); - VIR_FREE(snapshot->hardware); - VIR_FREE(snapshot->storageController); + g_free(snapshot->uuid); + g_free(snapshot->name); + g_free(snapshot->timeStamp); + g_free(snapshot->description); + g_free(snapshot->hardware); + g_free(snapshot->storageController); for (i = 0; i < snapshot->nchildren; i++) virVBoxSnapshotConfSnapshotFree(snapshot->children[i]); - VIR_FREE(snapshot->children); - VIR_FREE(snapshot); + g_free(snapshot->children); + g_free(snapshot); } void @@ -556,17 +556,17 @@ virVBoxSnapshotConfMachineFree(virVBoxSnapshotConfMachinePtr machine) if (!machine) return; - VIR_FREE(machine->uuid); - VIR_FREE(machine->name); - VIR_FREE(machine->currentSnapshot); - VIR_FREE(machine->snapshotFolder); - VIR_FREE(machine->lastStateChange); + g_free(machine->uuid); + g_free(machine->name); + g_free(machine->currentSnapshot); + g_free(machine->snapshotFolder); + g_free(machine->lastStateChange); virVBoxSnapshotConfMediaRegistryFree(machine->mediaRegistry); - VIR_FREE(machine->hardware); - VIR_FREE(machine->extraData); + g_free(machine->hardware); + g_free(machine->extraData); virVBoxSnapshotConfSnapshotFree(machine->snapshot); - VIR_FREE(machine->storageController); - VIR_FREE(machine); + g_free(machine->storageController); + g_free(machine); } #define VBOX_SETTINGS_NS "http://www.innotek.de/VirtualBox-settings" -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/vmx/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 56318fc8b2..db535ba260 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -650,10 +650,10 @@ virVMXDomainDefNamespaceFree(void *nsdata) struct virVMXDomainDefNamespaceData *data = nsdata; if (data) { - VIR_FREE(data->datacenterPath); - VIR_FREE(data->moref); + g_free(data->datacenterPath); + g_free(data->moref); } - VIR_FREE(data); + g_free(data); } static int -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/vz/vz_driver.c | 8 ++++---- src/vz/vz_utils.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index b60e99d4f5..0ebcb06234 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2729,10 +2729,10 @@ vzMigrationCookieFree(vzMigrationCookiePtr mig) if (!mig) return; - VIR_FREE(mig->session_uuid); - VIR_FREE(mig->uuid); - VIR_FREE(mig->name); - VIR_FREE(mig); + g_free(mig->session_uuid); + g_free(mig->uuid); + g_free(mig->name); + g_free(mig); } static int diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 4a79b55f3e..e5106619b6 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -582,7 +582,7 @@ vzDomObjFree(void* p) PrlHandle_Free(pdom->sdkdom); PrlHandle_Free(pdom->stats); virCondDestroy(&pdom->job.cond); - VIR_FREE(pdom); + g_free(pdom); }; #define VZ_JOB_WAIT_TIME (1000 * 30) -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/admin/admin_server_dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c index 0efb4485d4..57e8904f4c 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -57,7 +57,7 @@ remoteAdmClientFree(void *data) virMutexDestroy(&priv->lock); virObjectUnref(priv->dmn); - VIR_FREE(priv); + g_free(priv); } void * -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/locking/lock_daemon.c | 6 +++--- src/locking/lock_daemon_config.c | 6 +++--- src/locking/lock_driver_lockd.c | 10 +++++----- src/locking/lock_driver_sanlock.c | 6 +++--- src/locking/lock_manager.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 851e9fc6f0..94fe374df6 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -92,7 +92,7 @@ virLockDaemonFree(virLockDaemonPtr lockd) virHashFree(lockd->lockspaces); virLockSpaceFree(lockd->defaultLockspace); - VIR_FREE(lockd); + g_free(lockd); } static inline void @@ -435,8 +435,8 @@ virLockDaemonClientFree(void *opaque) } g_mutex_clear(&priv->lock); - VIR_FREE(priv->ownerName); - VIR_FREE(priv); + g_free(priv->ownerName); + g_free(priv); } diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index 6346703715..f693911997 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -71,10 +71,10 @@ virLockDaemonConfigFree(virLockDaemonConfigPtr data) if (!data) return; - VIR_FREE(data->log_filters); - VIR_FREE(data->log_outputs); + g_free(data->log_filters); + g_free(data->log_outputs); - VIR_FREE(data); + g_free(data); } static int diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 5ebefa48d0..a1deb55788 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -369,13 +369,13 @@ virLockManagerLockDaemonPrivateFree(virLockManagerLockDaemonPrivatePtr priv) return; for (i = 0; i < priv->nresources; i++) { - VIR_FREE(priv->resources[i].lockspace); - VIR_FREE(priv->resources[i].name); + g_free(priv->resources[i].lockspace); + g_free(priv->resources[i].name); } - VIR_FREE(priv->resources); + g_free(priv->resources); - VIR_FREE(priv->name); - VIR_FREE(priv); + g_free(priv->name); + g_free(priv); } static void virLockManagerLockDaemonFree(virLockManagerPtr lock) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7319f56819..aaffe30e6f 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -513,10 +513,10 @@ static void virLockManagerSanlockFree(virLockManagerPtr lock) if (!priv) return; - VIR_FREE(priv->vm_name); + g_free(priv->vm_name); for (i = 0; i < priv->res_count; i++) - VIR_FREE(priv->res_args[i]); - VIR_FREE(priv); + g_free(priv->res_args[i]); + g_free(priv); lock->privateData = NULL; } diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index d83a192bf6..db724eb30f 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -387,7 +387,7 @@ int virLockManagerFree(virLockManagerPtr lock) lock->driver->drvFree(lock); - VIR_FREE(lock); + g_free(lock); return 0; } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/logging/log_daemon.c | 4 ++-- src/logging/log_daemon_config.c | 6 +++--- src/logging/log_handler.c | 6 +++--- src/logging/log_manager.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 6b8f3b6fe5..770f6dd273 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -89,7 +89,7 @@ virLogDaemonFree(virLogDaemonPtr logd) g_mutex_clear(&logd->lock); virObjectUnref(logd->dmn); - VIR_FREE(logd); + g_free(logd); } @@ -314,7 +314,7 @@ virLogDaemonClientFree(void *opaque) (unsigned long long)priv->clientPid); g_mutex_clear(&priv->lock); - VIR_FREE(priv); + g_free(priv); } diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c index 5577991b13..075cf766ec 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -74,10 +74,10 @@ virLogDaemonConfigFree(virLogDaemonConfigPtr data) if (!data) return; - VIR_FREE(data->log_filters); - VIR_FREE(data->log_outputs); + g_free(data->log_filters); + g_free(data->log_outputs); - VIR_FREE(data); + g_free(data); } static int diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 95d909b44e..45a4763525 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -98,9 +98,9 @@ virLogHandlerLogFileFree(virLogHandlerLogFilePtr file) if (file->watch != -1) virEventRemoveHandle(file->watch); - VIR_FREE(file->driver); - VIR_FREE(file->domname); - VIR_FREE(file); + g_free(file->driver); + g_free(file->domname); + g_free(file); } diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index 57be340a2d..56927c1d6d 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -137,7 +137,7 @@ virLogManagerFree(virLogManagerPtr mgr) virObjectUnref(mgr->program); virObjectUnref(mgr->client); - VIR_FREE(mgr); + g_free(mgr); } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/remote/remote_daemon_config.c | 48 ++++++++++++++--------------- src/remote/remote_daemon_dispatch.c | 4 +-- src/remote/remote_driver.c | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index f0cca42925..b354dc4cc0 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -173,53 +173,53 @@ daemonConfigFree(struct daemonConfig *data) return; #ifdef WITH_IP - VIR_FREE(data->listen_addr); - VIR_FREE(data->tls_port); - VIR_FREE(data->tcp_port); + g_free(data->listen_addr); + g_free(data->tls_port); + g_free(data->tcp_port); #endif /* ! WITH_IP */ tmp = data->access_drivers; while (tmp && *tmp) { - VIR_FREE(*tmp); + g_free(*tmp); tmp++; } - VIR_FREE(data->access_drivers); + g_free(data->access_drivers); - VIR_FREE(data->unix_sock_admin_perms); - VIR_FREE(data->unix_sock_ro_perms); - VIR_FREE(data->unix_sock_rw_perms); - VIR_FREE(data->unix_sock_group); - VIR_FREE(data->unix_sock_dir); + g_free(data->unix_sock_admin_perms); + g_free(data->unix_sock_ro_perms); + g_free(data->unix_sock_rw_perms); + g_free(data->unix_sock_group); + g_free(data->unix_sock_dir); tmp = data->sasl_allowed_username_list; while (tmp && *tmp) { - VIR_FREE(*tmp); + g_free(*tmp); tmp++; } - VIR_FREE(data->sasl_allowed_username_list); + g_free(data->sasl_allowed_username_list); #ifdef WITH_IP tmp = data->tls_allowed_dn_list; while (tmp && *tmp) { - VIR_FREE(*tmp); + g_free(*tmp); tmp++; } - VIR_FREE(data->tls_allowed_dn_list); + g_free(data->tls_allowed_dn_list); - VIR_FREE(data->tls_priority); + g_free(data->tls_priority); - VIR_FREE(data->key_file); - VIR_FREE(data->ca_file); - VIR_FREE(data->cert_file); - VIR_FREE(data->crl_file); + g_free(data->key_file); + g_free(data->ca_file); + g_free(data->cert_file); + g_free(data->crl_file); #endif /* ! WITH_IP */ - VIR_FREE(data->host_uuid); - VIR_FREE(data->host_uuid_source); - VIR_FREE(data->log_filters); - VIR_FREE(data->log_outputs); + g_free(data->host_uuid); + g_free(data->host_uuid_source); + g_free(data->log_filters); + g_free(data->log_outputs); - VIR_FREE(data); + g_free(data); } static int diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 46683aa4a7..b7ef1f4b26 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -150,7 +150,7 @@ remoteEventCallbackFree(void *opaque) return; virObjectUnref(callback->program); virObjectUnref(callback->client); - VIR_FREE(callback); + g_free(callback); } @@ -1742,7 +1742,7 @@ void remoteClientFree(void *data) if (priv->storageConn) virConnectClose(priv->storageConn); - VIR_FREE(priv); + g_free(priv); } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 1b784e61c7..8d6790ccf2 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5614,7 +5614,7 @@ static void remoteStreamCallbackFree(void *opaque) (cbdata->ff)(cbdata->opaque); virObjectUnref(cbdata->st); - VIR_FREE(opaque); + g_free(opaque); } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/rpc/virnetmessage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index b728e73f4f..9f7334ae4c 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -88,7 +88,7 @@ void virNetMessageFree(virNetMessagePtr msg) msg->cb(msg, msg->opaque); virNetMessageClearPayload(msg); - VIR_FREE(msg); + g_free(msg); } void virNetMessageQueuePush(virNetMessagePtr *queue, virNetMessagePtr msg) -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/security/security_dac.c | 8 ++++---- src/security/security_selinux.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 389d1dac51..00eeae0d27 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -141,12 +141,12 @@ virSecurityDACChownListFree(void *opaque) return; for (i = 0; i < list->nItems; i++) { - VIR_FREE(list->items[i]->path); - VIR_FREE(list->items[i]); + g_free(list->items[i]->path); + g_free(list->items[i]); } - VIR_FREE(list->items); + g_free(list->items); virObjectUnref(list->manager); - VIR_FREE(list); + g_free(list); } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 8cc30a0e72..1d1d9edfff 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -108,9 +108,9 @@ virSecuritySELinuxContextItemFree(virSecuritySELinuxContextItemPtr item) if (!item) return; - VIR_FREE(item->path); - VIR_FREE(item->tcon); - VIR_FREE(item); + g_free(item->path); + g_free(item->tcon); + g_free(item); } static int @@ -152,9 +152,9 @@ virSecuritySELinuxContextListFree(void *opaque) for (i = 0; i < list->nItems; i++) virSecuritySELinuxContextItemFree(list->items[i]); - VIR_FREE(list->items); + g_free(list->items); virObjectUnref(list->manager); - VIR_FREE(list); + g_free(list); } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- tools/virsh-checkpoint.c | 6 +++--- tools/virsh-domain-monitor.c | 4 ++-- tools/virsh-domain.c | 2 +- tools/virsh-interface.c | 4 ++-- tools/virsh-network.c | 8 ++++---- tools/virsh-nodedev.c | 4 ++-- tools/virsh-nwfilter.c | 8 ++++---- tools/virsh-pool.c | 4 ++-- tools/virsh-secret.c | 4 ++-- tools/virsh-snapshot.c | 6 +++--- tools/virsh-volume.c | 4 ++-- tools/vsh-table.c | 10 +++++----- tools/vsh.c | 6 +++--- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index f6396d16eb..6e68ba66ff 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -552,11 +552,11 @@ virshCheckpointListFree(virshCheckpointListPtr checkpointlist) if (checkpointlist->chks) { for (i = 0; i < checkpointlist->nchks; i++) { virshDomainCheckpointFree(checkpointlist->chks[i].chk); - VIR_FREE(checkpointlist->chks[i].parent); + g_free(checkpointlist->chks[i].parent); } - VIR_FREE(checkpointlist->chks); + g_free(checkpointlist->chks); } - VIR_FREE(checkpointlist); + g_free(checkpointlist); } diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 5d0a03afa9..02ff1fbd62 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1609,9 +1609,9 @@ virshDomainListFree(virshDomainListPtr domlist) if (domlist && domlist->domains) { for (i = 0; i < domlist->ndomains; i++) virshDomainFree(domlist->domains[i]); - VIR_FREE(domlist->domains); + g_free(domlist->domains); } - VIR_FREE(domlist); + g_free(domlist); } static virshDomainListPtr diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index fb8b4bdb72..98a87dd43c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1796,7 +1796,7 @@ virshBlockJobWaitFree(virshBlockJobWaitDataPtr data) if (data->cb_id2 >= 0) virConnectDomainEventDeregisterAny(priv->conn, data->cb_id2); - VIR_FREE(data); + g_free(data); } diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 858052d341..a11d4ba607 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -176,9 +176,9 @@ virshInterfaceListFree(virshInterfaceListPtr list) if (list->ifaces[i]) virInterfaceFree(list->ifaces[i]); } - VIR_FREE(list->ifaces); + g_free(list->ifaces); } - VIR_FREE(list); + g_free(list); } static virshInterfaceListPtr diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 9e3b31a60c..a203fa64ff 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -459,9 +459,9 @@ virshNetworkListFree(virshNetworkListPtr list) if (list->nets[i]) virNetworkFree(list->nets[i]); } - VIR_FREE(list->nets); + g_free(list->nets); } - VIR_FREE(list); + g_free(list); } static virshNetworkListPtr @@ -1676,9 +1676,9 @@ virshNetworkPortListFree(virshNetworkPortListPtr list) if (list->ports[i]) virNetworkPortFree(list->ports[i]); } - VIR_FREE(list->ports); + g_free(list->ports); } - VIR_FREE(list); + g_free(list); } static virshNetworkPortListPtr diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 69422e20f5..fedc8497f8 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -205,9 +205,9 @@ virshNodeDeviceListFree(virshNodeDeviceListPtr list) if (list->devices[i]) virNodeDeviceFree(list->devices[i]); } - VIR_FREE(list->devices); + g_free(list->devices); } - VIR_FREE(list); + g_free(list); } static virshNodeDeviceListPtr diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 768a96e949..0d09a016bc 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -234,9 +234,9 @@ virshNWFilterListFree(virshNWFilterListPtr list) if (list->filters[i]) virNWFilterFree(list->filters[i]); } - VIR_FREE(list->filters); + g_free(list->filters); } - VIR_FREE(list); + g_free(list); } static virshNWFilterListPtr @@ -654,9 +654,9 @@ virshNWFilterBindingListFree(virshNWFilterBindingListPtr list) if (list->bindings[i]) virNWFilterBindingFree(list->bindings[i]); } - VIR_FREE(list->bindings); + g_free(list->bindings); } - VIR_FREE(list); + g_free(list); } diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 7835fa6d75..5256b50589 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -850,9 +850,9 @@ virshStoragePoolListFree(virshStoragePoolListPtr list) if (list->pools[i]) virStoragePoolFree(list->pools[i]); } - VIR_FREE(list->pools); + g_free(list->pools); } - VIR_FREE(list); + g_free(list); } static virshStoragePoolListPtr diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index fcfbe5fe9e..7ca3e864da 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -410,9 +410,9 @@ virshSecretListFree(virshSecretListPtr list) for (i = 0; i < list->nsecrets; i++) virshSecretFree(list->secrets[i]); - VIR_FREE(list->secrets); + g_free(list->secrets); } - VIR_FREE(list); + g_free(list); } static virshSecretListPtr diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 478657b5b6..1b10ef37e3 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1032,11 +1032,11 @@ virshSnapshotListFree(virshSnapshotListPtr snaplist) if (snaplist->snaps) { for (i = 0; i < snaplist->nsnaps; i++) { virshDomainSnapshotFree(snaplist->snaps[i].snap); - VIR_FREE(snaplist->snaps[i].parent); + g_free(snaplist->snaps[i].parent); } - VIR_FREE(snaplist->snaps); + g_free(snaplist->snaps); } - VIR_FREE(snaplist); + g_free(snaplist); } static int diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index c86abb863f..af2d1d42a3 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1273,9 +1273,9 @@ virshStorageVolListFree(virshStorageVolListPtr list) if (list->vols[i]) virStorageVolFree(list->vols[i]); } - VIR_FREE(list->vols); + g_free(list->vols); } - VIR_FREE(list); + g_free(list); } static virshStorageVolListPtr diff --git a/tools/vsh-table.c b/tools/vsh-table.c index 4471368687..d09cc9e14e 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -52,10 +52,10 @@ vshTableRowFree(vshTableRowPtr row) return; for (i = 0; i < row->ncells; i++) - VIR_FREE(row->cells[i]); + g_free(row->cells[i]); - VIR_FREE(row->cells); - VIR_FREE(row); + g_free(row->cells); + g_free(row); } @@ -69,8 +69,8 @@ vshTableFree(vshTablePtr table) for (i = 0; i < table->nrows; i++) vshTableRowFree(table->rows[i]); - VIR_FREE(table->rows); - VIR_FREE(table); + g_free(table->rows); + g_free(table); } diff --git a/tools/vsh.c b/tools/vsh.c index 0e2d4955b4..202bd564f7 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -719,8 +719,8 @@ vshCommandOptFree(vshCmdOpt * arg) a = a->next; - VIR_FREE(tmp->data); - VIR_FREE(tmp); + g_free(tmp->data); + g_free(tmp); } } @@ -735,7 +735,7 @@ vshCommandFree(vshCmd *cmd) c = c->next; vshCommandOptFree(tmp->opts); - VIR_FREE(tmp); + g_free(tmp); } } -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- tests/nodedevmdevctltest.c | 4 ++-- tests/nwfilterxml2firewalltest.c | 2 +- tests/qemuhotplugtest.c | 12 ++++++------ tests/qemumonitortestutils.c | 28 ++++++++++++++-------------- tests/virnetdaemontest.c | 2 +- tests/virnetserverclienttest.c | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index dab4b487b9..1bad65549b 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -152,8 +152,8 @@ nodedevTestDriverFree(virNodeDeviceDriverStatePtr drv) virNodeDeviceObjListFree(drv->devs); virCondDestroy(&drv->initCond); virMutexDestroy(&drv->lock); - VIR_FREE(drv->stateDir); - VIR_FREE(drv); + g_free(drv->stateDir); + g_free(drv); } /* Add a fake root 'computer' device */ diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 0901250aaf..3e2ab0b0ba 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -174,7 +174,7 @@ virNWFilterRuleInstFree(virNWFilterRuleInstPtr inst) return; virHashFree(inst->vars); - VIR_FREE(inst); + g_free(inst); } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 776fb019f3..df5c9c9059 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -383,12 +383,12 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data) if (!data) return; - VIR_FREE(data->file_xml_dom); - VIR_FREE(data->file_xml_res_live); - VIR_FREE(data->file_xml_res_conf); - VIR_FREE(data->file_json_monitor); + g_free(data->file_xml_dom); + g_free(data->file_xml_res_live); + g_free(data->file_xml_res_conf); + g_free(data->file_json_monitor); - VIR_FREE(data->xml_dom); + g_free(data->xml_dom); if (data->vm) { priv = data->vm->privateData; @@ -402,7 +402,7 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data) virObjectLock(mon); qemuMonitorTestFree(data->mon); } - VIR_FREE(data); + g_free(data); } diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index c4f7082655..ae3fcf9311 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -99,7 +99,7 @@ qemuMonitorTestItemFree(qemuMonitorTestItemPtr item) if (item->freecb) (item->freecb)(item->opaque); - VIR_FREE(item); + g_free(item); } @@ -423,8 +423,8 @@ qemuMonitorTestFree(qemuMonitorTestPtr test) if (timer != -1) virEventRemoveTimeout(timer); - VIR_FREE(test->incoming); - VIR_FREE(test->outgoing); + g_free(test->incoming); + g_free(test->outgoing); for (i = 0; i < test->nitems; i++) { if (!test->allowUnusedCommands) { @@ -435,12 +435,12 @@ qemuMonitorTestFree(qemuMonitorTestPtr test) qemuMonitorTestItemFree(test->items[i]); } - VIR_FREE(test->items); + g_free(test->items); if (test->tmpdir && rmdir(test->tmpdir) < 0) VIR_WARN("Failed to remove tempdir: %s", g_strerror(errno)); - VIR_FREE(test->tmpdir); + g_free(test->tmpdir); if (!test->allowUnusedCommands && test->nitems != 0) { @@ -448,7 +448,7 @@ qemuMonitorTestFree(qemuMonitorTestPtr test) } virMutexDestroy(&test->lock); - VIR_FREE(test); + g_free(test); } @@ -518,16 +518,16 @@ qemuMonitorTestHandlerDataFree(void *opaque) return; for (i = 0; i < data->nargs; i++) { - VIR_FREE(data->args[i].argname); - VIR_FREE(data->args[i].argval); + g_free(data->args[i].argname); + g_free(data->args[i].argval); } - VIR_FREE(data->command_name); - VIR_FREE(data->cmderr); - VIR_FREE(data->response); - VIR_FREE(data->args); - VIR_FREE(data->expectArgs); - VIR_FREE(data); + g_free(data->command_name); + g_free(data->cmderr); + g_free(data->response); + g_free(data->args); + g_free(data->expectArgs); + g_free(data); } diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index a20f351f93..fb40fe9b80 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -76,7 +76,7 @@ testClientNewPostExec(virNetServerClientPtr client, static void testClientFree(void *opaque) { - VIR_FREE(opaque); + g_free(opaque); } diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index a4341c1641..959100ec66 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -41,7 +41,7 @@ testClientNew(virNetServerClientPtr client G_GNUC_UNUSED, static void testClientFree(void *opaque) { - VIR_FREE(opaque); + g_free(opaque); } static int testIdentity(const void *opaque G_GNUC_UNUSED) -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/storage/storage_backend_fs.c | 6 +++--- src/storage/storage_backend_rbd.c | 10 +++++----- src/storage/storage_backend_scsi.c | 4 ++-- src/storage/storage_driver.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index b98d06c644..48924167eb 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -551,10 +551,10 @@ virStoragePoolDefFSNamespaceFree(void *nsdata) return; for (i = 0; i < cmdopts->noptions; i++) - VIR_FREE(cmdopts->options[i]); - VIR_FREE(cmdopts->options); + g_free(cmdopts->options[i]); + g_free(cmdopts->options); - VIR_FREE(cmdopts); + g_free(cmdopts); } diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 007c53f7ac..2804759557 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -68,13 +68,13 @@ virStoragePoolDefRBDNamespaceFree(void *nsdata) return; for (i = 0; i < cmdopts->noptions; i++) { - VIR_FREE(cmdopts->names[i]); - VIR_FREE(cmdopts->values[i]); + g_free(cmdopts->names[i]); + g_free(cmdopts->values[i]); } - VIR_FREE(cmdopts->names); - VIR_FREE(cmdopts->values); + g_free(cmdopts->names); + g_free(cmdopts->values); - VIR_FREE(cmdopts); + g_free(cmdopts); } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 69a01d1a24..9474c60c72 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -95,8 +95,8 @@ virStoragePoolFCRefreshDataFree(void *opaque) { virStoragePoolFCRefreshInfoPtr cbdata = opaque; - VIR_FREE(cbdata->fchost_name); - VIR_FREE(cbdata); + g_free(cbdata->fchost_name); + g_free(cbdata); } /** diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 16bc53aa46..9c5be071df 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2268,8 +2268,8 @@ virStorageVolPoolRefreshDataFree(void *opaque) { virStorageVolStreamInfoPtr cbdata = opaque; - VIR_FREE(cbdata->pool_name); - VIR_FREE(cbdata); + g_free(cbdata->pool_name); + g_free(cbdata); } static int -- 2.29.2
Signed-off-by: Laine Stump <laine@redhat.com> --- src/libvirt-domain.c | 18 +++++++++--------- src/libvirt-network.c | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index c9f8ffdb56..dba89a7d3a 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -7789,8 +7789,8 @@ virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info) if (!info) return; - VIR_FREE(info->cpumap); - VIR_FREE(info); + g_free(info->cpumap); + g_free(info); } @@ -12084,10 +12084,10 @@ virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats) for (next = stats; *next; next++) { virTypedParamsFree((*next)->params, (*next)->nparams); virDomainFree((*next)->dom); - VIR_FREE(*next); + g_free(*next); } - VIR_FREE(stats); + g_free(stats); } @@ -12281,14 +12281,14 @@ virDomainInterfaceFree(virDomainInterfacePtr iface) if (!iface) return; - VIR_FREE(iface->name); - VIR_FREE(iface->hwaddr); + g_free(iface->name); + g_free(iface->hwaddr); for (i = 0; i < iface->naddrs; i++) - VIR_FREE(iface->addrs[i].addr); - VIR_FREE(iface->addrs); + g_free(iface->addrs[i].addr); + g_free(iface->addrs); - VIR_FREE(iface); + g_free(iface); } diff --git a/src/libvirt-network.c b/src/libvirt-network.c index f691b672c7..92bdbacbff 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -1240,13 +1240,13 @@ virNetworkDHCPLeaseFree(virNetworkDHCPLeasePtr lease) { if (!lease) return; - VIR_FREE(lease->iface); - VIR_FREE(lease->mac); - VIR_FREE(lease->iaid); - VIR_FREE(lease->ipaddr); - VIR_FREE(lease->hostname); - VIR_FREE(lease->clientid); - VIR_FREE(lease); + g_free(lease->iface); + g_free(lease->mac); + g_free(lease->iaid); + g_free(lease->ipaddr); + g_free(lease->hostname); + g_free(lease->clientid); + g_free(lease); } -- 2.29.2
dhcpHostFree() and addnHostFree() don't follow the normal pattern of *Free functions in the rest of libvirt code - they are actually more similar to the *Dispose() functions, in that they free all subordinate objects, but not the object pointed to by the argument itself. However, the arguments aren't virObjects, so it wouldn't be proper to name them *Dispose() either. They *currently* behave similar to a *Clear() function, in that they free all the subordinate objects and nullify the pointers of those objects. HOWEVER, we don't actually need or want that behavior - the two functions in question are only called as part of a higher level *Free() function, and the pointers are not referenced in any way between the time they are freed and when the parent object is freed. So, since the current name isn't correct, nor is *Dispose(), and we want to change the behavior in such a way that *Clear() also wouldn't be correct, lets name the functions *FreeContent(), which is an accurate description of what the functions do, and what we *want* them to do. And since it's such a small patch, we can go ahead and change that behavior - replacing the VIR_FREEs with g_free. Signed-off-by: Laine Stump <laine@redhat.com> --- src/util/virdnsmasq.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index c21819c981..653d46bef9 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -50,20 +50,20 @@ VIR_LOG_INIT("util.dnsmasq"); #define DNSMASQ_ADDNHOSTSFILE_SUFFIX "addnhosts" static void -dhcphostFree(dnsmasqDhcpHost *host) +dhcphostFreeContent(dnsmasqDhcpHost *host) { - VIR_FREE(host->host); + g_free(host->host); } static void -addnhostFree(dnsmasqAddnHost *host) +addnhostFreeContent(dnsmasqAddnHost *host) { size_t i; for (i = 0; i < host->nhostnames; i++) - VIR_FREE(host->hostnames[i]); - VIR_FREE(host->hostnames); - VIR_FREE(host->ip); + g_free(host->hostnames[i]); + g_free(host->hostnames); + g_free(host->ip); } static void @@ -73,7 +73,7 @@ addnhostsFree(dnsmasqAddnHostsfile *addnhostsfile) if (addnhostsfile->hosts) { for (i = 0; i < addnhostsfile->nhosts; i++) - addnhostFree(&addnhostsfile->hosts[i]); + addnhostFreeContent(&addnhostsfile->hosts[i]); g_free(addnhostsfile->hosts); @@ -270,7 +270,7 @@ hostsfileFree(dnsmasqHostsfile *hostsfile) if (hostsfile->hosts) { for (i = 0; i < hostsfile->nhosts; i++) - dhcphostFree(&hostsfile->hosts[i]); + dhcphostFreeContent(&hostsfile->hosts[i]); g_free(hostsfile->hosts); -- 2.29.2
Several functions had the names virFirmware[something]Free(), but they aren't taking a pointer to some object and freeing it. Instead, they are making a copy of the content of an entire object, then Freeing the objects pointed to by that content. As a first step in a too-complicated cleanup just to eliminate a few occurrences of VIR_FREE(), this patch renames those functions to more accurately reflect what they do - they Free the *Content* of their arguments. Signed-off-by: Laine Stump <laine@redhat.com> --- src/qemu/qemu_firmware.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index fe30db4f79..c22b1f1e9c 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -188,7 +188,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFr static void -qemuFirmwareFlashFileFree(qemuFirmwareFlashFile flash) +qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile flash) { VIR_FREE(flash.filename); VIR_FREE(flash.format); @@ -196,39 +196,39 @@ qemuFirmwareFlashFileFree(qemuFirmwareFlashFile flash) static void -qemuFirmwareMappingFlashFree(qemuFirmwareMappingFlash flash) +qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlash flash) { - qemuFirmwareFlashFileFree(flash.executable); - qemuFirmwareFlashFileFree(flash.nvram_template); + qemuFirmwareFlashFileFreeContent(flash.executable); + qemuFirmwareFlashFileFreeContent(flash.nvram_template); } static void -qemuFirmwareMappingKernelFree(qemuFirmwareMappingKernel kernel) +qemuFirmwareMappingKernelFreeContent(qemuFirmwareMappingKernel kernel) { VIR_FREE(kernel.filename); } static void -qemuFirmwareMappingMemoryFree(qemuFirmwareMappingMemory memory) +qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemory memory) { VIR_FREE(memory.filename); } static void -qemuFirmwareMappingFree(qemuFirmwareMapping mapping) +qemuFirmwareMappingFreeContent(qemuFirmwareMapping mapping) { switch (mapping.device) { case QEMU_FIRMWARE_DEVICE_FLASH: - qemuFirmwareMappingFlashFree(mapping.data.flash); + qemuFirmwareMappingFlashFreeContent(mapping.data.flash); break; case QEMU_FIRMWARE_DEVICE_KERNEL: - qemuFirmwareMappingKernelFree(mapping.data.kernel); + qemuFirmwareMappingKernelFreeContent(mapping.data.kernel); break; case QEMU_FIRMWARE_DEVICE_MEMORY: - qemuFirmwareMappingMemoryFree(mapping.data.memory); + qemuFirmwareMappingMemoryFreeContent(mapping.data.memory); break; case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: @@ -271,7 +271,7 @@ qemuFirmwareFree(qemuFirmwarePtr fw) return; qemuFirmwareOSInterfaceFree(fw->interfaces); - qemuFirmwareMappingFree(fw->mapping); + qemuFirmwareMappingFreeContent(fw->mapping); for (i = 0; i < fw->ntargets; i++) qemuFirmwareTargetFree(fw->targets[i]); g_free(fw->targets); -- 2.29.2
These functions all cooperate to free memory pointed to by a single object that contains (doesn't *point to*, but acutally contains) several sub-objects. They were written to send copies of these sub-objects to subordinate functions, rather than just sending pointers to the sub-objects. Let's change these functions to just send pointers to the objects they're cleaning out rather than all the wasteful and pointless copying. Signed-off-by: Laine Stump <laine@redhat.com> --- src/qemu/qemu_firmware.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index c22b1f1e9c..aad39ee038 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -188,47 +188,47 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFr static void -qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile flash) +qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFilePtr flash) { - VIR_FREE(flash.filename); - VIR_FREE(flash.format); + VIR_FREE(flash->filename); + VIR_FREE(flash->format); } static void -qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlash flash) +qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlashPtr flash) { - qemuFirmwareFlashFileFreeContent(flash.executable); - qemuFirmwareFlashFileFreeContent(flash.nvram_template); + qemuFirmwareFlashFileFreeContent(&flash->executable); + qemuFirmwareFlashFileFreeContent(&flash->nvram_template); } static void -qemuFirmwareMappingKernelFreeContent(qemuFirmwareMappingKernel kernel) +qemuFirmwareMappingKernelFreeContent(qemuFirmwareMappingKernelPtr kernel) { - VIR_FREE(kernel.filename); + VIR_FREE(kernel->filename); } static void -qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemory memory) +qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemoryPtr memory) { - VIR_FREE(memory.filename); + VIR_FREE(memory->filename); } static void -qemuFirmwareMappingFreeContent(qemuFirmwareMapping mapping) +qemuFirmwareMappingFreeContent(qemuFirmwareMappingPtr mapping) { - switch (mapping.device) { + switch (mapping->device) { case QEMU_FIRMWARE_DEVICE_FLASH: - qemuFirmwareMappingFlashFreeContent(mapping.data.flash); + qemuFirmwareMappingFlashFreeContent(&mapping->data.flash); break; case QEMU_FIRMWARE_DEVICE_KERNEL: - qemuFirmwareMappingKernelFreeContent(mapping.data.kernel); + qemuFirmwareMappingKernelFreeContent(&mapping->data.kernel); break; case QEMU_FIRMWARE_DEVICE_MEMORY: - qemuFirmwareMappingMemoryFreeContent(mapping.data.memory); + qemuFirmwareMappingMemoryFreeContent(&mapping->data.memory); break; case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: @@ -271,7 +271,7 @@ qemuFirmwareFree(qemuFirmwarePtr fw) return; qemuFirmwareOSInterfaceFree(fw->interfaces); - qemuFirmwareMappingFreeContent(fw->mapping); + qemuFirmwareMappingFreeContent(&fw->mapping); for (i = 0; i < fw->ntargets; i++) qemuFirmwareTargetFree(fw->targets[i]); g_free(fw->targets); -- 2.29.2
On 2/4/21 12:57 AM, Laine Stump wrote:
These functions all cooperate to free memory pointed to by a single object that contains (doesn't *point to*, but acutally contains)
s/acutally/actually
several sub-objects. They were written to send copies of these sub-objects to subordinate functions, rather than just sending pointers to the sub-objects.
Let's change these functions to just send pointers to the objects they're cleaning out rather than all the wasteful and pointless copying.
Signed-off-by: Laine Stump <laine@redhat.com> --- src/qemu/qemu_firmware.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index c22b1f1e9c..aad39ee038 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -188,47 +188,47 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFr
static void -qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile flash) +qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFilePtr flash) { - VIR_FREE(flash.filename); - VIR_FREE(flash.format); + VIR_FREE(flash->filename); + VIR_FREE(flash->format); }
static void -qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlash flash) +qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlashPtr flash) { - qemuFirmwareFlashFileFreeContent(flash.executable); - qemuFirmwareFlashFileFreeContent(flash.nvram_template); + qemuFirmwareFlashFileFreeContent(&flash->executable); + qemuFirmwareFlashFileFreeContent(&flash->nvram_template); }
static void -qemuFirmwareMappingKernelFreeContent(qemuFirmwareMappingKernel kernel) +qemuFirmwareMappingKernelFreeContent(qemuFirmwareMappingKernelPtr kernel) { - VIR_FREE(kernel.filename); + VIR_FREE(kernel->filename); }
static void -qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemory memory) +qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemoryPtr memory) { - VIR_FREE(memory.filename); + VIR_FREE(memory->filename); }
static void -qemuFirmwareMappingFreeContent(qemuFirmwareMapping mapping) +qemuFirmwareMappingFreeContent(qemuFirmwareMappingPtr mapping) { - switch (mapping.device) { + switch (mapping->device) { case QEMU_FIRMWARE_DEVICE_FLASH: - qemuFirmwareMappingFlashFreeContent(mapping.data.flash); + qemuFirmwareMappingFlashFreeContent(&mapping->data.flash); break; case QEMU_FIRMWARE_DEVICE_KERNEL: - qemuFirmwareMappingKernelFreeContent(mapping.data.kernel); + qemuFirmwareMappingKernelFreeContent(&mapping->data.kernel); break; case QEMU_FIRMWARE_DEVICE_MEMORY: - qemuFirmwareMappingMemoryFreeContent(mapping.data.memory); + qemuFirmwareMappingMemoryFreeContent(&mapping->data.memory); break; case QEMU_FIRMWARE_DEVICE_NONE: case QEMU_FIRMWARE_DEVICE_LAST: @@ -271,7 +271,7 @@ qemuFirmwareFree(qemuFirmwarePtr fw) return;
qemuFirmwareOSInterfaceFree(fw->interfaces); - qemuFirmwareMappingFreeContent(fw->mapping); + qemuFirmwareMappingFreeContent(&fw->mapping); for (i = 0; i < fw->ntargets; i++) qemuFirmwareTargetFree(fw->targets[i]); g_free(fw->targets);
These functions are all only called as a part of qemuFirmwareFree(), which frees the qemuFirmware object before return, so we can be sure none of the pointers is referenced after freeing (and thus there is no need to clear any of them). Signed-off-by: Laine Stump <laine@redhat.com> --- src/qemu/qemu_firmware.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index aad39ee038..e6541d505e 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -190,8 +190,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFr static void qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFilePtr flash) { - VIR_FREE(flash->filename); - VIR_FREE(flash->format); + g_free(flash->filename); + g_free(flash->format); } @@ -206,14 +206,14 @@ qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlashPtr flash) static void qemuFirmwareMappingKernelFreeContent(qemuFirmwareMappingKernelPtr kernel) { - VIR_FREE(kernel->filename); + g_free(kernel->filename); } static void qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemoryPtr memory) { - VIR_FREE(memory->filename); + g_free(memory->filename); } -- 2.29.2
This is another *Free() function that doesn't free the object it is passed. Instead it frees and clears some parts of the object. In this case, the function is actually called from two places, and one of them (virNetSSHSessionAuthReset) appears to be assuming that the pointers actually *will* be cleared. So the proper thing to do here (?) is to rename the function to virNetSSHSesionAuthMethodsClear(). (NB: virNetSSHSessionAuthReset is seemingly never called from anywhere. Is this one of those functions that actually *is* called by some strange MACRO invocation? Or it is truly one of those "written-but-never-used" functions that can be deleted? (if the latter is the case, then I would rather move the contents of virNetSessionAuthMethodsFree() into its only other caller, virNetSSHSessionDispose(), so that the VIR_FREEs could be replaced with g_free.) Signed-off-by: Laine Stump <laine@redhat.com> --- src/rpc/virnetsshsession.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 4b56363fa0..5bfe311544 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -113,7 +113,7 @@ struct _virNetSSHSession { }; static void -virNetSSHSessionAuthMethodsFree(virNetSSHSessionPtr sess) +virNetSSHSessionAuthMethodsClear(virNetSSHSessionPtr sess) { size_t i; @@ -149,7 +149,7 @@ virNetSSHSessionDispose(void *obj) libssh2_session_free(sess->session); } - virNetSSHSessionAuthMethodsFree(sess); + virNetSSHSessionAuthMethodsClear(sess); VIR_FREE(sess->channelCommand); VIR_FREE(sess->hostname); @@ -971,7 +971,7 @@ void virNetSSHSessionAuthReset(virNetSSHSessionPtr sess) { virObjectLock(sess); - virNetSSHSessionAuthMethodsFree(sess); + virNetSSHSessionAuthMethodsClear(sess); virObjectUnlock(sess); } -- 2.29.2
On 2/4/21 12:57 AM, Laine Stump wrote:
When I sent a patch to convert (what I thought was) all of the VIR_FREEs in any *Free() function in the conf directory to g_free (with the justification that it was trivial to verify that the pointers weren't being referenced after they had been freed), there were two responses that stuck in my mind:
1) Daniel said that this was a reasonable class of uses to change and a reasonable way to arrive at the desired end result.
2) Peter justifiably expressing concern over the amount of churn in the code, and also said that he'd rather not have things "halfway" for an indeterminate time.
The combination of those two comments (ignoring the part about "concern for churn" :-) let me to sit down last night and make this patch series that eliminates all uses of VIR_FREE from any function whose name ends in "Free" (or eliminate/rename the function, just for completeness' sake)
In the vast majority of cases, this was done by replacing the VIR_FREEs in the functions with g_free (while verifying that everything being g_freed was actually something pointed to by the parent object that was sent to the *Free() function, and that the parent object itself was subsequently freed).
But there were a a couple of cases where this wasn't quite the right thing to do:
* in patch 20, two functions ending with Free() don't actually free the pointer they're sent. They instead behave like a *Clear() function, VIR_FREEing their components. Since we can see that these functions aren't actually be used as *Clear() functions (and never will be used that way), but don't want to promote confusion by leaving them misnamed, the patch renames them to *FreeContent() (more accurate name) and changes their VIR_FREEs to g_frees (it takes more than just looking at one function, but it's very easy to verify that the pointers are never referenced after they're freed).
* In Patch 21-23, several *Free() functions were actually being passed a full copy of an object, and then VIR_FREEing all the pointers in the copied object. So the name was misleading, the function was inefficiently copying entire objects, and was unnecessarily NULLing the pointers that were then tossed out when the function returned. So I renamed the functions (21), changed the calling sequences to use pointers instead of copied objects (22), and (of course) changed the VIR_FREEs into g_free (23).
* in Patch 24, a *Free() function actually appears to be used as a Clear() function. So I left the VIR_FREEs in place, but renamed the function to *Clear(). However, its one use as a *Clear() is when being called from a "Reset" function that (as far as I can see) is never used. If we could get rid of that Reset function, I could just fold the *Clear() function into its one remaining caller, and eliminate the VIR_FREEs. If someone knows more about the function virNetSSHSessionAuthReset() (which is in a section of the file labeled "Public API") please enlighten me.
**
The last time I ran wc over the diffs of these patches, it showed they are eliminating 542 uses of VIR_FREE, which is > 13% of the 4k remaining.
There is a companion series that eliminates VIR_FREE from all *Dispose() functions, but I'm sending it separately since the two series are completely independent, and I didn't want to scare anyone off. (Really, most of these can be very mechanically reviewed - just verify that all the items being g_freed are subordinates of the main argument to the function, and that that object is freed before return)
Laine Stump (24): conf: replace remaining straggler VIR_FREE with g_free in vir*Free() util: replace VIR_FREE with g_free in all vir*Free() functions bhyve: replace VIR_FREE with g_free in all vir*Free() functions libxl: replace VIR_FREE with g_free in all vir*Free() functions qemu: replace VIR_FREE with g_free in all vir*Free() functions test_driver: replace VIR_FREE with g_free in all vir*Free() functions vbox: replace VIR_FREE with g_free in all vir*Free() functions vmx: replace VIR_FREE with g_free in all vir*Free() functions vz: replace VIR_FREE with g_free in all vir*Free() functions admin: replace VIR_FREE with g_free in all vir*Free() functions locking: replace VIR_FREE with g_free in all vir*Free() functions logging: replace VIR_FREE with g_free in all vir*Free() functions remote: replace VIR_FREE with g_free in all vir*Free() functions rpc: replace VIR_FREE with g_free in all vir*Free() functions security: replace VIR_FREE with g_free in all vir*Free() functions tools: replace VIR_FREE with g_free in all vir*Free() functions tests: replace VIR_FREE with g_free in all vir*Free() functions storage: replace VIR_FREE with g_free in all vir*Free() functions libvirtd: replace straggler VIR_FREE with g_free in all vir*Free() functions util: rename two *Free() functions while changing VIR_FREE to g_free qemu: rename virFirmware*Free() functions to have more accurate names qemu: pass pointers instead of copying objects for qemuFirmware*FreeContent() qemu: replace VIR_FREE with g_free in qemuFirmware*FreeContent() rpc: rename virNetSessionAuthMethodsFree to virNetSessionAuthMethodsClear
src/admin/admin_server_dispatch.c | 2 +- src/bhyve/bhyve_conf.c | 6 +- src/bhyve/bhyve_domain.c | 2 +- src/conf/domain_conf.c | 6 +- src/conf/numa_conf.c | 10 +-- src/conf/storage_encryption_conf.c | 2 +- src/conf/virchrdev.c | 6 +- src/libvirt-domain.c | 18 +++--- src/libvirt-network.c | 14 ++--- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_migration.c | 6 +- src/locking/lock_daemon.c | 6 +- src/locking/lock_daemon_config.c | 6 +- src/locking/lock_driver_lockd.c | 10 +-- src/locking/lock_driver_sanlock.c | 6 +- src/locking/lock_manager.c | 2 +- src/logging/log_daemon.c | 4 +- src/logging/log_daemon_config.c | 6 +- src/logging/log_handler.c | 6 +- src/logging/log_manager.c | 2 +- src/qemu/qemu_block.c | 36 +++++------ src/qemu/qemu_capabilities.c | 8 +-- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_conf.c | 6 +- src/qemu/qemu_domain.c | 14 ++--- src/qemu/qemu_firmware.c | 42 ++++++------- src/qemu/qemu_migration_params.c | 4 +- src/qemu/qemu_monitor.c | 48 +++++++-------- src/qemu/qemu_monitor_json.c | 22 +++---- src/qemu/qemu_process.c | 24 ++++---- src/qemu/qemu_saveimage.c | 6 +- src/qemu/qemu_slirp.c | 2 +- src/qemu/qemu_vhost_user.c | 8 +-- src/remote/remote_daemon_config.c | 48 +++++++-------- src/remote/remote_daemon_dispatch.c | 4 +- src/remote/remote_driver.c | 2 +- src/rpc/virnetmessage.c | 2 +- src/rpc/virnetsshsession.c | 6 +- src/security/security_dac.c | 8 +-- src/security/security_selinux.c | 10 +-- src/storage/storage_backend_fs.c | 6 +- src/storage/storage_backend_rbd.c | 10 +-- src/storage/storage_backend_scsi.c | 4 +- src/storage/storage_driver.c | 4 +- src/test/test_driver.c | 6 +- src/util/virarptable.c | 8 +-- src/util/virauthconfig.c | 4 +- src/util/virbitmap.c | 4 +- src/util/vircgroup.c | 12 ++-- src/util/vircommand.c | 24 ++++---- src/util/virconf.c | 10 +-- src/util/virdnsmasq.c | 32 +++++----- src/util/virebtables.c | 4 +- src/util/virfdstream.c | 10 +-- src/util/virfile.c | 4 +- src/util/virfirewall.c | 16 ++--- src/util/virfirmware.c | 8 +-- src/util/virjson.c | 12 ++-- src/util/virlockspace.c | 12 ++-- src/util/virlog.c | 12 ++-- src/util/virmacaddr.c | 2 +- src/util/virmdev.c | 16 ++--- src/util/virnetdev.c | 12 ++-- src/util/virnetdevbandwidth.c | 6 +- src/util/virnetdevip.c | 6 +- src/util/virnetdevmacvlan.c | 8 +-- src/util/virnetdevvlan.c | 2 +- src/util/virnvme.c | 2 +- src/util/virobject.c | 2 +- src/util/virpci.c | 18 +++--- src/util/virperf.c | 2 +- src/util/virportallocator.c | 4 +- src/util/virresctrl.c | 6 +- src/util/virrotatingfile.c | 14 ++--- src/util/virscsi.c | 16 ++--- src/util/virscsivhost.c | 10 +-- src/util/virseclabel.c | 16 ++--- src/util/virsocketaddr.c | 2 +- src/util/virsysinfo.c | 96 ++++++++++++++--------------- src/util/virsystemd.c | 6 +- src/util/virthreadpool.c | 6 +- src/util/virtypedparam-public.c | 2 +- src/util/virtypedparam.c | 8 +-- src/util/viruri.c | 20 +++--- src/util/virusb.c | 8 +-- src/util/virxml.c | 4 +- src/vbox/vbox_snapshot_conf.c | 54 ++++++++-------- src/vmx/vmx.c | 6 +- src/vz/vz_driver.c | 8 +-- src/vz/vz_utils.c | 2 +- tests/nodedevmdevctltest.c | 4 +- tests/nwfilterxml2firewalltest.c | 2 +- tests/qemuhotplugtest.c | 12 ++-- tests/qemumonitortestutils.c | 28 ++++----- tests/virnetdaemontest.c | 2 +- tests/virnetserverclienttest.c | 2 +- tools/virsh-checkpoint.c | 6 +- tools/virsh-domain-monitor.c | 4 +- tools/virsh-domain.c | 2 +- tools/virsh-interface.c | 4 +- tools/virsh-network.c | 8 +-- tools/virsh-nodedev.c | 4 +- tools/virsh-nwfilter.c | 8 +-- tools/virsh-pool.c | 4 +- tools/virsh-secret.c | 4 +- tools/virsh-snapshot.c | 6 +- tools/virsh-volume.c | 4 +- tools/vsh-table.c | 10 +-- tools/vsh.c | 6 +- 110 files changed, 557 insertions(+), 557 deletions(-)
All patches: Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
participants (2)
-
Daniel Henrique Barboza -
Laine Stump