[libvirt PATCH 05/15] qemu: replace VIR_FREE with g_free in all *Dispose() functions
Laine Stump
laine at redhat.com
Thu Feb 4 04:38:24 UTC 2021
Signed-off-by: Laine Stump <laine at redhat.com>
---
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_capabilities.c | 10 +--
src/qemu/qemu_conf.c | 122 +++++++++++++++++------------------
src/qemu/qemu_domain.c | 10 +--
src/qemu/qemu_monitor.c | 4 +-
5 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index af0397e6e2..51cc00c618 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -177,7 +177,7 @@ static void qemuAgentDispose(void *obj)
if (agent->cb && agent->cb->destroy)
(agent->cb->destroy)(agent, agent->vm);
virCondDestroy(&agent->notify);
- VIR_FREE(agent->buffer);
+ g_free(agent->buffer);
g_main_context_unref(agent->context);
virResetError(&agent->lastError);
}
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c57864f602..d41b4a4753 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1982,12 +1982,12 @@ void virQEMUCapsDispose(void *obj)
virBitmapFree(qemuCaps->flags);
- VIR_FREE(qemuCaps->package);
- VIR_FREE(qemuCaps->kernelVersion);
- VIR_FREE(qemuCaps->binary);
- VIR_FREE(qemuCaps->hostCPUSignature);
+ g_free(qemuCaps->package);
+ g_free(qemuCaps->kernelVersion);
+ g_free(qemuCaps->binary);
+ g_free(qemuCaps->hostCPUSignature);
- VIR_FREE(qemuCaps->gicCapabilities);
+ g_free(qemuCaps->gicCapabilities);
virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index eae94bb5a2..35d0b6515c 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -306,78 +306,78 @@ static void virQEMUDriverConfigDispose(void *obj)
virBitmapFree(cfg->namespaces);
g_strfreev(cfg->cgroupDeviceACL);
- VIR_FREE(cfg->uri);
-
- VIR_FREE(cfg->configBaseDir);
- VIR_FREE(cfg->configDir);
- VIR_FREE(cfg->autostartDir);
- VIR_FREE(cfg->logDir);
- VIR_FREE(cfg->swtpmLogDir);
- VIR_FREE(cfg->stateDir);
- VIR_FREE(cfg->swtpmStateDir);
- VIR_FREE(cfg->slirpStateDir);
- VIR_FREE(cfg->dbusStateDir);
-
- VIR_FREE(cfg->libDir);
- VIR_FREE(cfg->cacheDir);
- VIR_FREE(cfg->saveDir);
- VIR_FREE(cfg->snapshotDir);
- VIR_FREE(cfg->checkpointDir);
- VIR_FREE(cfg->channelTargetDir);
- VIR_FREE(cfg->nvramDir);
-
- VIR_FREE(cfg->defaultTLSx509certdir);
- VIR_FREE(cfg->defaultTLSx509secretUUID);
-
- VIR_FREE(cfg->vncTLSx509certdir);
- VIR_FREE(cfg->vncTLSx509secretUUID);
- VIR_FREE(cfg->vncListen);
- VIR_FREE(cfg->vncPassword);
- VIR_FREE(cfg->vncSASLdir);
-
- VIR_FREE(cfg->spiceTLSx509certdir);
- VIR_FREE(cfg->spiceListen);
- VIR_FREE(cfg->spicePassword);
- VIR_FREE(cfg->spiceSASLdir);
-
- VIR_FREE(cfg->chardevTLSx509certdir);
- VIR_FREE(cfg->chardevTLSx509secretUUID);
-
- VIR_FREE(cfg->vxhsTLSx509certdir);
- VIR_FREE(cfg->vxhsTLSx509secretUUID);
-
- VIR_FREE(cfg->nbdTLSx509certdir);
- VIR_FREE(cfg->nbdTLSx509secretUUID);
-
- VIR_FREE(cfg->migrateTLSx509certdir);
- VIR_FREE(cfg->migrateTLSx509secretUUID);
-
- VIR_FREE(cfg->backupTLSx509certdir);
- VIR_FREE(cfg->backupTLSx509secretUUID);
+ g_free(cfg->uri);
+
+ g_free(cfg->configBaseDir);
+ g_free(cfg->configDir);
+ g_free(cfg->autostartDir);
+ g_free(cfg->logDir);
+ g_free(cfg->swtpmLogDir);
+ g_free(cfg->stateDir);
+ g_free(cfg->swtpmStateDir);
+ g_free(cfg->slirpStateDir);
+ g_free(cfg->dbusStateDir);
+
+ g_free(cfg->libDir);
+ g_free(cfg->cacheDir);
+ g_free(cfg->saveDir);
+ g_free(cfg->snapshotDir);
+ g_free(cfg->checkpointDir);
+ g_free(cfg->channelTargetDir);
+ g_free(cfg->nvramDir);
+
+ g_free(cfg->defaultTLSx509certdir);
+ g_free(cfg->defaultTLSx509secretUUID);
+
+ g_free(cfg->vncTLSx509certdir);
+ g_free(cfg->vncTLSx509secretUUID);
+ g_free(cfg->vncListen);
+ g_free(cfg->vncPassword);
+ g_free(cfg->vncSASLdir);
+
+ g_free(cfg->spiceTLSx509certdir);
+ g_free(cfg->spiceListen);
+ g_free(cfg->spicePassword);
+ g_free(cfg->spiceSASLdir);
+
+ g_free(cfg->chardevTLSx509certdir);
+ g_free(cfg->chardevTLSx509secretUUID);
+
+ g_free(cfg->vxhsTLSx509certdir);
+ g_free(cfg->vxhsTLSx509secretUUID);
+
+ g_free(cfg->nbdTLSx509certdir);
+ g_free(cfg->nbdTLSx509secretUUID);
+
+ g_free(cfg->migrateTLSx509certdir);
+ g_free(cfg->migrateTLSx509secretUUID);
+
+ g_free(cfg->backupTLSx509certdir);
+ g_free(cfg->backupTLSx509secretUUID);
while (cfg->nhugetlbfs) {
cfg->nhugetlbfs--;
- VIR_FREE(cfg->hugetlbfs[cfg->nhugetlbfs].mnt_dir);
+ g_free(cfg->hugetlbfs[cfg->nhugetlbfs].mnt_dir);
}
- VIR_FREE(cfg->hugetlbfs);
- VIR_FREE(cfg->bridgeHelperName);
- VIR_FREE(cfg->prHelperName);
- VIR_FREE(cfg->slirpHelperName);
- VIR_FREE(cfg->dbusDaemonName);
+ g_free(cfg->hugetlbfs);
+ g_free(cfg->bridgeHelperName);
+ g_free(cfg->prHelperName);
+ g_free(cfg->slirpHelperName);
+ g_free(cfg->dbusDaemonName);
- VIR_FREE(cfg->saveImageFormat);
- VIR_FREE(cfg->dumpImageFormat);
- VIR_FREE(cfg->snapshotImageFormat);
- VIR_FREE(cfg->autoDumpPath);
+ g_free(cfg->saveImageFormat);
+ g_free(cfg->dumpImageFormat);
+ g_free(cfg->snapshotImageFormat);
+ g_free(cfg->autoDumpPath);
g_strfreev(cfg->securityDriverNames);
- VIR_FREE(cfg->lockManagerName);
+ g_free(cfg->lockManagerName);
virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares);
- VIR_FREE(cfg->memoryBackingDir);
- VIR_FREE(cfg->swtpmStorageDir);
+ g_free(cfg->memoryBackingDir);
+ g_free(cfg->swtpmStorageDir);
g_strfreev(cfg->capabilityfilters);
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 6ab8a94b73..0f09e321fb 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -681,8 +681,8 @@ qemuDomainDiskPrivateDispose(void *obj)
qemuDomainDiskPrivatePtr priv = obj;
virObjectUnref(priv->migrSource);
- VIR_FREE(priv->qomName);
- VIR_FREE(priv->nodeCopyOnRead);
+ g_free(priv->qomName);
+ g_free(priv->nodeCopyOnRead);
virObjectUnref(priv->blockjob);
}
@@ -771,8 +771,8 @@ qemuDomainVcpuPrivateDispose(void *obj)
{
qemuDomainVcpuPrivatePtr priv = obj;
- VIR_FREE(priv->type);
- VIR_FREE(priv->alias);
+ g_free(priv->type);
+ g_free(priv->alias);
virJSONValueFree(priv->props);
return;
}
@@ -890,7 +890,7 @@ qemuDomainGraphicsPrivateDispose(void *obj)
{
qemuDomainGraphicsPrivatePtr priv = obj;
- VIR_FREE(priv->tlsAlias);
+ g_free(priv->tlsAlias);
g_clear_pointer(&priv->secinfo, qemuDomainSecretInfoFree);
}
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 2d9c9754d1..14966d4096 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -236,8 +236,8 @@ qemuMonitorDispose(void *obj)
g_main_context_unref(mon->context);
virResetError(&mon->lastError);
virCondDestroy(&mon->notify);
- VIR_FREE(mon->buffer);
- VIR_FREE(mon->balloonpath);
+ g_free(mon->buffer);
+ g_free(mon->balloonpath);
}
--
2.29.2
More information about the libvir-list
mailing list