4:57 a.m.
Signed-off-by: Laine Stump <laine(a)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