[libvirt PATCH 13/15] conf: replace VIR_FREE with g_free in all *Dispose() functions
Laine Stump
laine at redhat.com
Thu Feb 4 04:38:32 UTC 2021
Signed-off-by: Laine Stump <laine at redhat.com>
---
src/conf/capabilities.c | 22 +++++++-------
src/conf/checkpoint_conf.c | 2 +-
src/conf/domain_capabilities.c | 12 ++++----
src/conf/domain_conf.c | 2 +-
src/conf/domain_event.c | 52 +++++++++++++++++-----------------
src/conf/moment_conf.c | 6 ++--
src/conf/object_event.c | 4 +--
src/conf/snapshot_conf.c | 4 +--
src/conf/virsecretobj.c | 6 ++--
src/conf/virstorageobj.c | 4 +--
10 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 02fbf60b02..dd3321db9a 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -232,39 +232,39 @@ virCapsDispose(void *object)
for (i = 0; i < caps->npools; i++)
virCapabilitiesFreeStoragePool(caps->pools[i]);
- VIR_FREE(caps->pools);
+ g_free(caps->pools);
for (i = 0; i < caps->nguests; i++)
virCapabilitiesFreeGuest(caps->guests[i]);
- VIR_FREE(caps->guests);
+ g_free(caps->guests);
for (i = 0; i < caps->host.nfeatures; i++)
- VIR_FREE(caps->host.features[i]);
- VIR_FREE(caps->host.features);
+ g_free(caps->host.features[i]);
+ g_free(caps->host.features);
if (caps->host.numa)
virCapabilitiesHostNUMAUnref(caps->host.numa);
for (i = 0; i < caps->host.nmigrateTrans; i++)
- VIR_FREE(caps->host.migrateTrans[i]);
- VIR_FREE(caps->host.migrateTrans);
+ g_free(caps->host.migrateTrans[i]);
+ g_free(caps->host.migrateTrans);
for (i = 0; i < caps->host.nsecModels; i++)
virCapabilitiesClearSecModel(&caps->host.secModels[i]);
- VIR_FREE(caps->host.secModels);
+ g_free(caps->host.secModels);
for (i = 0; i < caps->host.cache.nbanks; i++)
virCapsHostCacheBankFree(caps->host.cache.banks[i]);
virResctrlInfoMonFree(caps->host.cache.monitor);
- VIR_FREE(caps->host.cache.banks);
+ g_free(caps->host.cache.banks);
for (i = 0; i < caps->host.memBW.nnodes; i++)
virCapsHostMemBWNodeFree(caps->host.memBW.nodes[i]);
virResctrlInfoMonFree(caps->host.memBW.monitor);
- VIR_FREE(caps->host.memBW.nodes);
+ g_free(caps->host.memBW.nodes);
- VIR_FREE(caps->host.netprefix);
- VIR_FREE(caps->host.pagesSize);
+ g_free(caps->host.netprefix);
+ g_free(caps->host.pagesSize);
virCPUDefFree(caps->host.cpu);
virObjectUnref(caps->host.resctrl);
}
diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index 16fb138a3e..f8704852e0 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -87,7 +87,7 @@ virDomainCheckpointDefDispose(void *obj)
for (i = 0; i < def->ndisks; i++)
virDomainCheckpointDiskDefClear(&def->disks[i]);
- VIR_FREE(def->disks);
+ g_free(def->disks);
}
static int
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 407cf0348a..8605216cf7 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -84,16 +84,16 @@ virDomainCapsDispose(void *obj)
virDomainCapsStringValuesPtr values;
size_t i;
- VIR_FREE(caps->path);
- VIR_FREE(caps->machine);
+ g_free(caps->path);
+ g_free(caps->machine);
virObjectUnref(caps->cpu.custom);
virCPUDefFree(caps->cpu.hostModel);
virSEVCapabilitiesFree(caps->sev);
values = &caps->os.loader.values;
for (i = 0; i < values->nvalues; i++)
- VIR_FREE(values->values[i]);
- VIR_FREE(values->values);
+ g_free(values->values[i]);
+ g_free(values->values);
}
@@ -104,11 +104,11 @@ virDomainCapsCPUModelsDispose(void *obj)
size_t i;
for (i = 0; i < cpuModels->nmodels; i++) {
- VIR_FREE(cpuModels->models[i].name);
+ g_free(cpuModels->models[i].name);
g_strfreev(cpuModels->models[i].blockers);
}
- VIR_FREE(cpuModels->models);
+ g_free(cpuModels->models);
}
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3f71297283..07e6f39256 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2699,7 +2699,7 @@ virDomainChrSourceDefDispose(void *obj)
if (def->seclabels) {
for (i = 0; i < def->nseclabels; i++)
virSecurityDeviceLabelDefFree(def->seclabels[i]);
- VIR_FREE(def->seclabels);
+ g_free(def->seclabels);
}
}
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 0fde3481ed..726a792dae 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -387,9 +387,9 @@ virDomainEventIOErrorDispose(void *obj)
virDomainEventIOErrorPtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->srcPath);
- VIR_FREE(event->devAlias);
- VIR_FREE(event->reason);
+ g_free(event->srcPath);
+ g_free(event->devAlias);
+ g_free(event->reason);
}
static void
@@ -399,23 +399,23 @@ virDomainEventGraphicsDispose(void *obj)
VIR_DEBUG("obj=%p", event);
if (event->local) {
- VIR_FREE(event->local->node);
- VIR_FREE(event->local->service);
- VIR_FREE(event->local);
+ g_free(event->local->node);
+ g_free(event->local->service);
+ g_free(event->local);
}
if (event->remote) {
- VIR_FREE(event->remote->node);
- VIR_FREE(event->remote->service);
- VIR_FREE(event->remote);
+ g_free(event->remote->node);
+ g_free(event->remote->service);
+ g_free(event->remote);
}
- VIR_FREE(event->authScheme);
+ g_free(event->authScheme);
if (event->subject) {
size_t i;
for (i = 0; i < event->subject->nidentity; i++) {
- VIR_FREE(event->subject->identities[i].type);
- VIR_FREE(event->subject->identities[i].name);
+ g_free(event->subject->identities[i].type);
+ g_free(event->subject->identities[i].name);
}
- VIR_FREE(event->subject);
+ g_free(event->subject);
}
}
@@ -425,7 +425,7 @@ virDomainEventBlockJobDispose(void *obj)
virDomainEventBlockJobPtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->disk);
+ g_free(event->disk);
}
static void
@@ -434,9 +434,9 @@ virDomainEventDiskChangeDispose(void *obj)
virDomainEventDiskChangePtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->oldSrcPath);
- VIR_FREE(event->newSrcPath);
- VIR_FREE(event->devAlias);
+ g_free(event->oldSrcPath);
+ g_free(event->newSrcPath);
+ g_free(event->devAlias);
}
static void
@@ -445,7 +445,7 @@ virDomainEventTrayChangeDispose(void *obj)
virDomainEventTrayChangePtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->devAlias);
+ g_free(event->devAlias);
}
static void
@@ -461,7 +461,7 @@ virDomainEventDeviceRemovedDispose(void *obj)
virDomainEventDeviceRemovedPtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->devAlias);
+ g_free(event->devAlias);
}
static void
@@ -470,7 +470,7 @@ virDomainEventDeviceAddedDispose(void *obj)
virDomainEventDeviceAddedPtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->devAlias);
+ g_free(event->devAlias);
}
@@ -480,7 +480,7 @@ virDomainEventDeviceRemovalFailedDispose(void *obj)
virDomainEventDeviceRemovalFailedPtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->devAlias);
+ g_free(event->devAlias);
}
@@ -497,8 +497,8 @@ virDomainQemuMonitorEventDispose(void *obj)
virDomainQemuMonitorEventPtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->event);
- VIR_FREE(event->details);
+ g_free(event->event);
+ g_free(event->details);
}
static void
@@ -540,7 +540,7 @@ virDomainEventMetadataChangeDispose(void *obj)
virDomainEventMetadataChangePtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->nsuri);
+ g_free(event->nsuri);
}
@@ -550,8 +550,8 @@ virDomainEventBlockThresholdDispose(void *obj)
virDomainEventBlockThresholdPtr event = obj;
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->dev);
- VIR_FREE(event->path);
+ g_free(event->dev);
+ g_free(event->path);
}
diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c
index fb6f7824cb..c643cbf6d6 100644
--- a/src/conf/moment_conf.c
+++ b/src/conf/moment_conf.c
@@ -62,9 +62,9 @@ virDomainMomentDefDispose(void *obj)
{
virDomainMomentDefPtr def = obj;
- VIR_FREE(def->name);
- VIR_FREE(def->description);
- VIR_FREE(def->parent_name);
+ g_free(def->name);
+ g_free(def->description);
+ g_free(def->parent_name);
virDomainDefFree(def->dom);
virDomainDefFree(def->inactiveDom);
}
diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index 907aa6d06a..5d7d45355e 100644
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -123,8 +123,8 @@ virObjectEventDispose(void *obj)
VIR_DEBUG("obj=%p", event);
- VIR_FREE(event->meta.name);
- VIR_FREE(event->meta.key);
+ g_free(event->meta.name);
+ g_free(event->meta.key);
}
/**
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index df88a0bc72..36ce1a08ca 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -125,10 +125,10 @@ virDomainSnapshotDefDispose(void *obj)
virDomainSnapshotDefPtr def = obj;
size_t i;
- VIR_FREE(def->file);
+ g_free(def->file);
for (i = 0; i < def->ndisks; i++)
virDomainSnapshotDiskDefClear(&def->disks[i]);
- VIR_FREE(def->disks);
+ g_free(def->disks);
virObjectUnref(def->cookie);
}
diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index a1b750fb05..fd27bb1f01 100644
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -137,10 +137,10 @@ virSecretObjDispose(void *opaque)
if (obj->value) {
/* Wipe before free to ensure we don't leave a secret on the heap */
memset(obj->value, 0, obj->value_size);
- VIR_FREE(obj->value);
+ g_free(obj->value);
}
- VIR_FREE(obj->configFile);
- VIR_FREE(obj->base64File);
+ g_free(obj->configFile);
+ g_free(obj->base64File);
}
diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 9fe8b3f28e..6a8874b1fb 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -378,8 +378,8 @@ virStoragePoolObjDispose(void *opaque)
virStoragePoolDefFree(obj->def);
virStoragePoolDefFree(obj->newDef);
- VIR_FREE(obj->configFile);
- VIR_FREE(obj->autostartLink);
+ g_free(obj->configFile);
+ g_free(obj->autostartLink);
}
--
2.29.2
More information about the libvir-list
mailing list