mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
conf: replace VIR_FREE with g_free in all *Dispose() functions
Signed-off-by: Laine Stump <laine@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
2ca7234d7d
commit
8334440941
@ -232,39 +232,39 @@ virCapsDispose(void *object)
|
|||||||
|
|
||||||
for (i = 0; i < caps->npools; i++)
|
for (i = 0; i < caps->npools; i++)
|
||||||
virCapabilitiesFreeStoragePool(caps->pools[i]);
|
virCapabilitiesFreeStoragePool(caps->pools[i]);
|
||||||
VIR_FREE(caps->pools);
|
g_free(caps->pools);
|
||||||
|
|
||||||
for (i = 0; i < caps->nguests; i++)
|
for (i = 0; i < caps->nguests; i++)
|
||||||
virCapabilitiesFreeGuest(caps->guests[i]);
|
virCapabilitiesFreeGuest(caps->guests[i]);
|
||||||
VIR_FREE(caps->guests);
|
g_free(caps->guests);
|
||||||
|
|
||||||
for (i = 0; i < caps->host.nfeatures; i++)
|
for (i = 0; i < caps->host.nfeatures; i++)
|
||||||
VIR_FREE(caps->host.features[i]);
|
g_free(caps->host.features[i]);
|
||||||
VIR_FREE(caps->host.features);
|
g_free(caps->host.features);
|
||||||
|
|
||||||
if (caps->host.numa)
|
if (caps->host.numa)
|
||||||
virCapabilitiesHostNUMAUnref(caps->host.numa);
|
virCapabilitiesHostNUMAUnref(caps->host.numa);
|
||||||
|
|
||||||
for (i = 0; i < caps->host.nmigrateTrans; i++)
|
for (i = 0; i < caps->host.nmigrateTrans; i++)
|
||||||
VIR_FREE(caps->host.migrateTrans[i]);
|
g_free(caps->host.migrateTrans[i]);
|
||||||
VIR_FREE(caps->host.migrateTrans);
|
g_free(caps->host.migrateTrans);
|
||||||
|
|
||||||
for (i = 0; i < caps->host.nsecModels; i++)
|
for (i = 0; i < caps->host.nsecModels; i++)
|
||||||
virCapabilitiesClearSecModel(&caps->host.secModels[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++)
|
for (i = 0; i < caps->host.cache.nbanks; i++)
|
||||||
virCapsHostCacheBankFree(caps->host.cache.banks[i]);
|
virCapsHostCacheBankFree(caps->host.cache.banks[i]);
|
||||||
virResctrlInfoMonFree(caps->host.cache.monitor);
|
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++)
|
for (i = 0; i < caps->host.memBW.nnodes; i++)
|
||||||
virCapsHostMemBWNodeFree(caps->host.memBW.nodes[i]);
|
virCapsHostMemBWNodeFree(caps->host.memBW.nodes[i]);
|
||||||
virResctrlInfoMonFree(caps->host.memBW.monitor);
|
virResctrlInfoMonFree(caps->host.memBW.monitor);
|
||||||
VIR_FREE(caps->host.memBW.nodes);
|
g_free(caps->host.memBW.nodes);
|
||||||
|
|
||||||
VIR_FREE(caps->host.netprefix);
|
g_free(caps->host.netprefix);
|
||||||
VIR_FREE(caps->host.pagesSize);
|
g_free(caps->host.pagesSize);
|
||||||
virCPUDefFree(caps->host.cpu);
|
virCPUDefFree(caps->host.cpu);
|
||||||
virObjectUnref(caps->host.resctrl);
|
virObjectUnref(caps->host.resctrl);
|
||||||
}
|
}
|
||||||
|
@ -87,7 +87,7 @@ virDomainCheckpointDefDispose(void *obj)
|
|||||||
|
|
||||||
for (i = 0; i < def->ndisks; i++)
|
for (i = 0; i < def->ndisks; i++)
|
||||||
virDomainCheckpointDiskDefClear(&def->disks[i]);
|
virDomainCheckpointDiskDefClear(&def->disks[i]);
|
||||||
VIR_FREE(def->disks);
|
g_free(def->disks);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -84,16 +84,16 @@ virDomainCapsDispose(void *obj)
|
|||||||
virDomainCapsStringValuesPtr values;
|
virDomainCapsStringValuesPtr values;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
VIR_FREE(caps->path);
|
g_free(caps->path);
|
||||||
VIR_FREE(caps->machine);
|
g_free(caps->machine);
|
||||||
virObjectUnref(caps->cpu.custom);
|
virObjectUnref(caps->cpu.custom);
|
||||||
virCPUDefFree(caps->cpu.hostModel);
|
virCPUDefFree(caps->cpu.hostModel);
|
||||||
virSEVCapabilitiesFree(caps->sev);
|
virSEVCapabilitiesFree(caps->sev);
|
||||||
|
|
||||||
values = &caps->os.loader.values;
|
values = &caps->os.loader.values;
|
||||||
for (i = 0; i < values->nvalues; i++)
|
for (i = 0; i < values->nvalues; i++)
|
||||||
VIR_FREE(values->values[i]);
|
g_free(values->values[i]);
|
||||||
VIR_FREE(values->values);
|
g_free(values->values);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -104,11 +104,11 @@ virDomainCapsCPUModelsDispose(void *obj)
|
|||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
for (i = 0; i < cpuModels->nmodels; 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);
|
g_strfreev(cpuModels->models[i].blockers);
|
||||||
}
|
}
|
||||||
|
|
||||||
VIR_FREE(cpuModels->models);
|
g_free(cpuModels->models);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -2699,7 +2699,7 @@ virDomainChrSourceDefDispose(void *obj)
|
|||||||
if (def->seclabels) {
|
if (def->seclabels) {
|
||||||
for (i = 0; i < def->nseclabels; i++)
|
for (i = 0; i < def->nseclabels; i++)
|
||||||
virSecurityDeviceLabelDefFree(def->seclabels[i]);
|
virSecurityDeviceLabelDefFree(def->seclabels[i]);
|
||||||
VIR_FREE(def->seclabels);
|
g_free(def->seclabels);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -387,9 +387,9 @@ virDomainEventIOErrorDispose(void *obj)
|
|||||||
virDomainEventIOErrorPtr event = obj;
|
virDomainEventIOErrorPtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->srcPath);
|
g_free(event->srcPath);
|
||||||
VIR_FREE(event->devAlias);
|
g_free(event->devAlias);
|
||||||
VIR_FREE(event->reason);
|
g_free(event->reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -399,23 +399,23 @@ virDomainEventGraphicsDispose(void *obj)
|
|||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
if (event->local) {
|
if (event->local) {
|
||||||
VIR_FREE(event->local->node);
|
g_free(event->local->node);
|
||||||
VIR_FREE(event->local->service);
|
g_free(event->local->service);
|
||||||
VIR_FREE(event->local);
|
g_free(event->local);
|
||||||
}
|
}
|
||||||
if (event->remote) {
|
if (event->remote) {
|
||||||
VIR_FREE(event->remote->node);
|
g_free(event->remote->node);
|
||||||
VIR_FREE(event->remote->service);
|
g_free(event->remote->service);
|
||||||
VIR_FREE(event->remote);
|
g_free(event->remote);
|
||||||
}
|
}
|
||||||
VIR_FREE(event->authScheme);
|
g_free(event->authScheme);
|
||||||
if (event->subject) {
|
if (event->subject) {
|
||||||
size_t i;
|
size_t i;
|
||||||
for (i = 0; i < event->subject->nidentity; i++) {
|
for (i = 0; i < event->subject->nidentity; i++) {
|
||||||
VIR_FREE(event->subject->identities[i].type);
|
g_free(event->subject->identities[i].type);
|
||||||
VIR_FREE(event->subject->identities[i].name);
|
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;
|
virDomainEventBlockJobPtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->disk);
|
g_free(event->disk);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -434,9 +434,9 @@ virDomainEventDiskChangeDispose(void *obj)
|
|||||||
virDomainEventDiskChangePtr event = obj;
|
virDomainEventDiskChangePtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->oldSrcPath);
|
g_free(event->oldSrcPath);
|
||||||
VIR_FREE(event->newSrcPath);
|
g_free(event->newSrcPath);
|
||||||
VIR_FREE(event->devAlias);
|
g_free(event->devAlias);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -445,7 +445,7 @@ virDomainEventTrayChangeDispose(void *obj)
|
|||||||
virDomainEventTrayChangePtr event = obj;
|
virDomainEventTrayChangePtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->devAlias);
|
g_free(event->devAlias);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -461,7 +461,7 @@ virDomainEventDeviceRemovedDispose(void *obj)
|
|||||||
virDomainEventDeviceRemovedPtr event = obj;
|
virDomainEventDeviceRemovedPtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->devAlias);
|
g_free(event->devAlias);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -470,7 +470,7 @@ virDomainEventDeviceAddedDispose(void *obj)
|
|||||||
virDomainEventDeviceAddedPtr event = obj;
|
virDomainEventDeviceAddedPtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->devAlias);
|
g_free(event->devAlias);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -480,7 +480,7 @@ virDomainEventDeviceRemovalFailedDispose(void *obj)
|
|||||||
virDomainEventDeviceRemovalFailedPtr event = obj;
|
virDomainEventDeviceRemovalFailedPtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->devAlias);
|
g_free(event->devAlias);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -497,8 +497,8 @@ virDomainQemuMonitorEventDispose(void *obj)
|
|||||||
virDomainQemuMonitorEventPtr event = obj;
|
virDomainQemuMonitorEventPtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->event);
|
g_free(event->event);
|
||||||
VIR_FREE(event->details);
|
g_free(event->details);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -540,7 +540,7 @@ virDomainEventMetadataChangeDispose(void *obj)
|
|||||||
virDomainEventMetadataChangePtr event = obj;
|
virDomainEventMetadataChangePtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->nsuri);
|
g_free(event->nsuri);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -550,8 +550,8 @@ virDomainEventBlockThresholdDispose(void *obj)
|
|||||||
virDomainEventBlockThresholdPtr event = obj;
|
virDomainEventBlockThresholdPtr event = obj;
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->dev);
|
g_free(event->dev);
|
||||||
VIR_FREE(event->path);
|
g_free(event->path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,9 +62,9 @@ virDomainMomentDefDispose(void *obj)
|
|||||||
{
|
{
|
||||||
virDomainMomentDefPtr def = obj;
|
virDomainMomentDefPtr def = obj;
|
||||||
|
|
||||||
VIR_FREE(def->name);
|
g_free(def->name);
|
||||||
VIR_FREE(def->description);
|
g_free(def->description);
|
||||||
VIR_FREE(def->parent_name);
|
g_free(def->parent_name);
|
||||||
virDomainDefFree(def->dom);
|
virDomainDefFree(def->dom);
|
||||||
virDomainDefFree(def->inactiveDom);
|
virDomainDefFree(def->inactiveDom);
|
||||||
}
|
}
|
||||||
|
@ -123,8 +123,8 @@ virObjectEventDispose(void *obj)
|
|||||||
|
|
||||||
VIR_DEBUG("obj=%p", event);
|
VIR_DEBUG("obj=%p", event);
|
||||||
|
|
||||||
VIR_FREE(event->meta.name);
|
g_free(event->meta.name);
|
||||||
VIR_FREE(event->meta.key);
|
g_free(event->meta.key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -125,10 +125,10 @@ virDomainSnapshotDefDispose(void *obj)
|
|||||||
virDomainSnapshotDefPtr def = obj;
|
virDomainSnapshotDefPtr def = obj;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
VIR_FREE(def->file);
|
g_free(def->file);
|
||||||
for (i = 0; i < def->ndisks; i++)
|
for (i = 0; i < def->ndisks; i++)
|
||||||
virDomainSnapshotDiskDefClear(&def->disks[i]);
|
virDomainSnapshotDiskDefClear(&def->disks[i]);
|
||||||
VIR_FREE(def->disks);
|
g_free(def->disks);
|
||||||
virObjectUnref(def->cookie);
|
virObjectUnref(def->cookie);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,10 +137,10 @@ virSecretObjDispose(void *opaque)
|
|||||||
if (obj->value) {
|
if (obj->value) {
|
||||||
/* Wipe before free to ensure we don't leave a secret on the heap */
|
/* Wipe before free to ensure we don't leave a secret on the heap */
|
||||||
memset(obj->value, 0, obj->value_size);
|
memset(obj->value, 0, obj->value_size);
|
||||||
VIR_FREE(obj->value);
|
g_free(obj->value);
|
||||||
}
|
}
|
||||||
VIR_FREE(obj->configFile);
|
g_free(obj->configFile);
|
||||||
VIR_FREE(obj->base64File);
|
g_free(obj->base64File);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -378,8 +378,8 @@ virStoragePoolObjDispose(void *opaque)
|
|||||||
virStoragePoolDefFree(obj->def);
|
virStoragePoolDefFree(obj->def);
|
||||||
virStoragePoolDefFree(obj->newDef);
|
virStoragePoolDefFree(obj->newDef);
|
||||||
|
|
||||||
VIR_FREE(obj->configFile);
|
g_free(obj->configFile);
|
||||||
VIR_FREE(obj->autostartLink);
|
g_free(obj->autostartLink);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user