External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: use glib allocation apis for qemuAgentFSInfo

Browse Source 
Switch from old VIR_ allocation APIs to glib equivalents.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jonathon Jongsma 2020-01-10 17:32:16 -06:00 committed by Michal Privoznik
parent 9e1a8298cd
commit 9a7d618c79
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_agent.c
View File

@ -1854,10 +1854,10 @@ qemuAgentDiskInfoFree(qemuAgentDiskInfoPtr info)
if (!info)
return;
VIR_FREE(info->serial);
VIR_FREE(info->bus_type);
VIR_FREE(info->devnode);
VIR_FREE(info);
g_free(info->serial);
g_free(info->bus_type);
g_free(info->devnode);
g_free(info);
}
void
@ -1868,15 +1868,15 @@ qemuAgentFSInfoFree(qemuAgentFSInfoPtr info)
if (!info)
return;
VIR_FREE(info->mountpoint);
VIR_FREE(info->name);
VIR_FREE(info->fstype);
g_free(info->mountpoint);
g_free(info->name);
g_free(info->fstype);
for (i = 0; i < info->ndisks; i++)
qemuAgentDiskInfoFree(info->disks[i]);
VIR_FREE(info->disks);
g_free(info->disks);
VIR_FREE(info);
g_free(info);
}
static int
@ -1999,8 +1999,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon,
*info = NULL;
goto cleanup;
}
if (VIR_ALLOC_N(info_ret, ndata) < 0)
goto cleanup;
info_ret = g_new0(qemuAgentFSInfoPtr, ndata);
for (i = 0; i < ndata; i++) {
/* Reverse the order to arrange in mount order */
@ -2017,8 +2016,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon,
goto cleanup;
}
if (VIR_ALLOC(info_ret[i]) < 0)
goto cleanup;
info_ret[i] = g_new0(qemuAgentFSInfo, 1);
if (!(result = virJSONValueObjectGetString(entry, "mountpoint"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -2088,7 +2086,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon,
if (info_ret) {
for (i = 0; i < ndata; i++)
qemuAgentFSInfoFree(info_ret[i]);
VIR_FREE(info_ret);
g_free(info_ret);
}
return ret;
}

2
src/qemu/qemu_driver.c
View File

@ -23246,7 +23246,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
cleanup:
for (i = 0; i < nfs; i++)
qemuAgentFSInfoFree(agentfsinfo[i]);
VIR_FREE(agentfsinfo);
g_free(agentfsinfo);
virDomainObjEndAPI(&vm);
return ret;