External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: replace VIR_FREE with g_free in all vir*Free() functions

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Laine Stump 2021-02-03 14:36:01 -05:00
parent 3ebaa1bff3
commit 674719afe6
13 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/qemu/qemu_block.c
View File

@ -77,17 +77,17 @@ qemuBlockNodeNameBackingChainDataFree(qemuBlockNodeNameBackingChainDataPtr data)
if (!data) if (!data)
return; return;
VIR_FREE(data->nodeformat); g_free(data->nodeformat);
VIR_FREE(data->nodestorage); g_free(data->nodestorage);
VIR_FREE(data->qemufilename); g_free(data->qemufilename);
VIR_FREE(data->drvformat); g_free(data->drvformat);
VIR_FREE(data->drvstorage); g_free(data->drvstorage);
qemuBlockNodeNameBackingChainDataFree(data->backing); qemuBlockNodeNameBackingChainDataFree(data->backing);
VIR_FREE(data); g_free(data);
} }
G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNodeNameBackingChainData, G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNodeNameBackingChainData,
@ -1635,16 +1635,16 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data)
virJSONValueFree(data->encryptsecretProps); virJSONValueFree(data->encryptsecretProps);
virJSONValueFree(data->tlsProps); virJSONValueFree(data->tlsProps);
virJSONValueFree(data->tlsKeySecretProps); virJSONValueFree(data->tlsKeySecretProps);
VIR_FREE(data->tlsAlias); g_free(data->tlsAlias);
VIR_FREE(data->tlsKeySecretAlias); g_free(data->tlsKeySecretAlias);
VIR_FREE(data->authsecretAlias); g_free(data->authsecretAlias);
VIR_FREE(data->encryptsecretAlias); g_free(data->encryptsecretAlias);
VIR_FREE(data->httpcookiesecretAlias); g_free(data->httpcookiesecretAlias);
VIR_FREE(data->driveCmd); g_free(data->driveCmd);
VIR_FREE(data->driveAlias); g_free(data->driveAlias);
VIR_FREE(data->chardevAlias); g_free(data->chardevAlias);
VIR_FREE(data->chardevCmd); g_free(data->chardevCmd);
VIR_FREE(data); g_free(data);
} }
@ -1960,8 +1960,8 @@ qemuBlockStorageSourceChainDataFree(qemuBlockStorageSourceChainDataPtr data)
for (i = 0; i < data->nsrcdata; i++) for (i = 0; i < data->nsrcdata; i++)
qemuBlockStorageSourceAttachDataFree(data->srcdata[i]); qemuBlockStorageSourceAttachDataFree(data->srcdata[i]);
VIR_FREE(data->srcdata); g_free(data->srcdata);
VIR_FREE(data); g_free(data);
} }

8
src/qemu/qemu_capabilities.c
View File

@ -4112,10 +4112,10 @@ virQEMUCapsCachePrivFree(void *privData)
{ {
virQEMUCapsCachePrivPtr priv = privData; virQEMUCapsCachePrivPtr priv = privData;
VIR_FREE(priv->libDir); g_free(priv->libDir);
VIR_FREE(priv->kernelVersion); g_free(priv->kernelVersion);
VIR_FREE(priv->hostCPUSignature); g_free(priv->hostCPUSignature);
VIR_FREE(priv); g_free(priv);
} }

4
src/qemu/qemu_cgroup.c
View File

@ -1215,8 +1215,8 @@ qemuCgroupEmulatorAllNodesDataFree(qemuCgroupEmulatorAllNodesDataPtr data)
return; return;
virCgroupFree(data->emulatorCgroup); virCgroupFree(data->emulatorCgroup);
VIR_FREE(data->emulatorMemMask); g_free(data->emulatorMemMask);
VIR_FREE(data); g_free(data);
} }

6
src/qemu/qemu_conf.c
View File

@ -1579,9 +1579,9 @@ qemuSharedDeviceEntryFree(void *payload)
return; return;
for (i = 0; i < entry->ref; i++) for (i = 0; i < entry->ref; i++)
VIR_FREE(entry->domains[i]); g_free(entry->domains[i]);
VIR_FREE(entry->domains); g_free(entry->domains);
VIR_FREE(entry); g_free(entry);
} }

14
src/qemu/qemu_domain.c
View File

@ -1803,8 +1803,8 @@ qemuDomainObjPrivateFree(void *data)
virObjectUnref(priv->monConfig); virObjectUnref(priv->monConfig);
qemuDomainObjClearJob(&priv->job); qemuDomainObjClearJob(&priv->job);
VIR_FREE(priv->lockState); g_free(priv->lockState);
VIR_FREE(priv->origname); g_free(priv->origname);
virChrdevFree(priv->devs); virChrdevFree(priv->devs);
@ -1817,7 +1817,7 @@ qemuDomainObjPrivateFree(void *data)
VIR_ERROR(_("Unexpected QEMU agent still active during domain deletion")); VIR_ERROR(_("Unexpected QEMU agent still active during domain deletion"));
qemuAgentClose(priv->agent); qemuAgentClose(priv->agent);
} }
VIR_FREE(priv->cleanupCallbacks); g_free(priv->cleanupCallbacks);
g_clear_pointer(&priv->migSecinfo, qemuDomainSecretInfoFree); g_clear_pointer(&priv->migSecinfo, qemuDomainSecretInfoFree);
qemuDomainMasterKeyFree(priv); qemuDomainMasterKeyFree(priv);
@ -1830,7 +1830,7 @@ qemuDomainObjPrivateFree(void *data)
g_object_unref(priv->eventThread); 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->capsadd, def->ncapsadd);
virStringListFreeCount(def->capsdel, def->ncapsdel); 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_BLOCK_JOB:
case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_MONITOR_EOF:
case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED: case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED:
VIR_FREE(event->data); g_free(event->data);
break; break;
case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE: case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE:
virObjectUnref(event->data); virObjectUnref(event->data);
@ -10854,7 +10854,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event)
case QEMU_PROCESS_EVENT_LAST: case QEMU_PROCESS_EVENT_LAST:
break; break;
} }
VIR_FREE(event); g_free(event);
} }

10
src/qemu/qemu_firmware.c
View File

@ -180,7 +180,7 @@ struct _qemuFirmware {
static void static void
qemuFirmwareOSInterfaceFree(qemuFirmwareOSInterface *interfaces) qemuFirmwareOSInterfaceFree(qemuFirmwareOSInterface *interfaces)
{ {
VIR_FREE(interfaces); g_free(interfaces);
} }
@ -245,7 +245,7 @@ qemuFirmwareTargetFree(qemuFirmwareTargetPtr target)
virStringListFreeCount(target->machines, target->nmachines); virStringListFreeCount(target->machines, target->nmachines);
VIR_FREE(target); g_free(target);
} }
@ -255,7 +255,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareTarget, qemuFirmwareTargetFree);
static void static void
qemuFirmwareFeatureFree(qemuFirmwareFeature *features) qemuFirmwareFeatureFree(qemuFirmwareFeature *features)
{ {
VIR_FREE(features); g_free(features);
} }
@ -274,10 +274,10 @@ qemuFirmwareFree(qemuFirmwarePtr fw)
qemuFirmwareMappingFree(fw->mapping); qemuFirmwareMappingFree(fw->mapping);
for (i = 0; i < fw->ntargets; i++) for (i = 0; i < fw->ntargets; i++)
qemuFirmwareTargetFree(fw->targets[i]); qemuFirmwareTargetFree(fw->targets[i]);
VIR_FREE(fw->targets); g_free(fw->targets);
qemuFirmwareFeatureFree(fw->features); qemuFirmwareFeatureFree(fw->features);
VIR_FREE(fw); g_free(fw);
} }

4
src/qemu/qemu_migration_params.c
View File

@ -261,11 +261,11 @@ qemuMigrationParamsFree(qemuMigrationParamsPtr migParams)
for (i = 0; i < QEMU_MIGRATION_PARAM_LAST; i++) { for (i = 0; i < QEMU_MIGRATION_PARAM_LAST; i++) {
if (qemuMigrationParamTypes[i] == QEMU_MIGRATION_PARAM_TYPE_STRING) 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); virBitmapFree(migParams->caps);
VIR_FREE(migParams); g_free(migParams);
} }

48
src/qemu/qemu_monitor.c
View File

@ -1674,7 +1674,7 @@ qemuMonitorCPUInfoFree(qemuMonitorCPUInfoPtr cpus,
qemuMonitorCPUInfoClear(cpus, ncpus); qemuMonitorCPUInfoClear(cpus, ncpus);
VIR_FREE(cpus); g_free(cpus);
} }
void void
@ -1687,9 +1687,9 @@ qemuMonitorQueryCpusFree(struct qemuMonitorQueryCpusEntry *entries,
return; return;
for (i = 0; i < nentries; i++) 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; struct qemuDomainDiskInfo *info = value;
VIR_FREE(info->nodename); g_free(info->nodename);
VIR_FREE(info); g_free(info);
} }
@ -2871,8 +2871,8 @@ qemuMonitorChardevInfoFree(void *data)
{ {
qemuMonitorChardevInfoPtr info = data; qemuMonitorChardevInfoPtr info = data;
VIR_FREE(info->ptyPath); g_free(info->ptyPath);
VIR_FREE(info); g_free(info);
} }
@ -3603,11 +3603,11 @@ qemuMonitorMachineInfoFree(qemuMonitorMachineInfoPtr machine)
{ {
if (!machine) if (!machine)
return; return;
VIR_FREE(machine->name); g_free(machine->name);
VIR_FREE(machine->alias); g_free(machine->alias);
VIR_FREE(machine->defaultCPU); g_free(machine->defaultCPU);
VIR_FREE(machine->defaultRAMid); g_free(machine->defaultRAMid);
VIR_FREE(machine); g_free(machine);
} }
@ -3735,14 +3735,14 @@ qemuMonitorCPUModelInfoFree(qemuMonitorCPUModelInfoPtr model_info)
return; return;
for (i = 0; i < model_info->nprops; i++) { 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) 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); g_free(model_info->props);
VIR_FREE(model_info->name); g_free(model_info->name);
VIR_FREE(model_info); g_free(model_info);
} }
@ -4378,7 +4378,7 @@ qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfoPtr info)
switch (info->type) { switch (info->type) {
case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390:
VIR_FREE(info->data.s390.reason); g_free(info->data.s390.reason);
break; break;
case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE:
case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV:
@ -4386,7 +4386,7 @@ qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfoPtr info)
break; break;
} }
VIR_FREE(info); g_free(info);
} }
@ -4396,8 +4396,8 @@ qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidStatusPtr info)
if (!info) if (!info)
return; return;
VIR_FREE(info->netdev); g_free(info->netdev);
VIR_FREE(info); g_free(info);
} }
@ -4588,9 +4588,9 @@ qemuMonitorJobInfoFree(qemuMonitorJobInfoPtr job)
if (!job) if (!job)
return; return;
VIR_FREE(job->id); g_free(job->id);
VIR_FREE(job->error); g_free(job->error);
VIR_FREE(job); g_free(job);
} }

22
src/qemu/qemu_monitor_json.c
View File

@ -591,11 +591,11 @@ qemuMonitorJSONParseKeywordsFree(int nkeywords,
{ {
size_t i; size_t i;
for (i = 0; i < nkeywords; i++) { for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]); g_free(keywords[i]);
VIR_FREE(values[i]); g_free(values[i]);
} }
VIR_FREE(keywords); g_free(keywords);
VIR_FREE(values); g_free(values);
} }
@ -6561,9 +6561,9 @@ void qemuMonitorJSONListPathFree(qemuMonitorJSONListPathPtr paths)
{ {
if (!paths) if (!paths)
return; return;
VIR_FREE(paths->name); g_free(paths->name);
VIR_FREE(paths->type); g_free(paths->type);
VIR_FREE(paths); g_free(paths);
} }
@ -8576,13 +8576,13 @@ qemuMonitorQueryHotpluggableCpusFree(struct qemuMonitorQueryHotpluggableCpusEntr
for (i = 0; i < nentries; i++) { for (i = 0; i < nentries; i++) {
entry = entries + i; entry = entries + i;
VIR_FREE(entry->type); g_free(entry->type);
VIR_FREE(entry->qom_path); g_free(entry->qom_path);
VIR_FREE(entry->alias); g_free(entry->alias);
virJSONValueFree(entry->props); virJSONValueFree(entry->props);
} }
VIR_FREE(entries); g_free(entries);
} }

24
src/qemu/qemu_process.c
View File

@ -4604,10 +4604,10 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDefPtr inc)
if (!inc) if (!inc)
return; return;
VIR_FREE(inc->address); g_free(inc->address);
VIR_FREE(inc->launchURI); g_free(inc->launchURI);
VIR_FREE(inc->deferredURI); g_free(inc->deferredURI);
VIR_FREE(inc); g_free(inc);
} }
@ -8713,14 +8713,14 @@ qemuProcessQMPFree(qemuProcessQMPPtr proc)
g_object_unref(proc->eventThread); g_object_unref(proc->eventThread);
VIR_FREE(proc->binary); g_free(proc->binary);
VIR_FREE(proc->libDir); g_free(proc->libDir);
VIR_FREE(proc->uniqDir); g_free(proc->uniqDir);
VIR_FREE(proc->monpath); g_free(proc->monpath);
VIR_FREE(proc->monarg); g_free(proc->monarg);
VIR_FREE(proc->pidfile); g_free(proc->pidfile);
VIR_FREE(proc->stdErr); g_free(proc->stdErr);
VIR_FREE(proc); g_free(proc);
} }

6
src/qemu/qemu_saveimage.c
View File

@ -83,9 +83,9 @@ virQEMUSaveDataFree(virQEMUSaveDataPtr data)
if (!data) if (!data)
return; return;
VIR_FREE(data->xml); g_free(data->xml);
VIR_FREE(data->cookie); g_free(data->cookie);
VIR_FREE(data); g_free(data);
} }
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUSaveData, virQEMUSaveDataFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUSaveData, virQEMUSaveDataFree);

2
src/qemu/qemu_slirp.c
View File

@ -58,7 +58,7 @@ qemuSlirpFree(qemuSlirpPtr slirp)
VIR_FORCE_CLOSE(slirp->fd[0]); VIR_FORCE_CLOSE(slirp->fd[0]);
VIR_FORCE_CLOSE(slirp->fd[1]); VIR_FORCE_CLOSE(slirp->fd[1]);
virBitmapFree(slirp->features); virBitmapFree(slirp->features);
VIR_FREE(slirp); g_free(slirp);
} }

8
src/qemu/qemu_vhost_user.c
View File

@ -113,7 +113,7 @@ struct _qemuVhostUser {
static void static void
qemuVhostUserGPUFeatureFree(qemuVhostUserGPUFeature *features) qemuVhostUserGPUFeatureFree(qemuVhostUserGPUFeature *features)
{ {
VIR_FREE(features); g_free(features);
} }
@ -127,11 +127,11 @@ qemuVhostUserFree(qemuVhostUserPtr vu)
return; return;
if (vu->type == QEMU_VHOST_USER_TYPE_GPU) 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);
} }