NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Refactor cleanup in qemuMonitorJSONGetOneBlockStatsInfo

Browse Source 
Use VIR_AUTOFREE and get rid of the cleanup label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-09-16 16:19:33 +02:00
parent 280e70ca8d
commit 121911c853
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_monitor_json.c
View File

@ -2601,17 +2601,16 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValuePtr dev,
virHashTablePtr hash, virHashTablePtr hash,
bool backingChain) bool backingChain)
{ {
qemuBlockStatsPtr bstats = NULL; VIR_AUTOFREE(qemuBlockStatsPtr) bstats = NULL;
int ret = -1;
int nstats = 0; int nstats = 0;
const char *qdevname = NULL; const char *qdevname = NULL;
const char *nodename = NULL; const char *nodename = NULL;
char *devicename = NULL; VIR_AUTOFREE(char *) devicename = NULL;
virJSONValuePtr backing; virJSONValuePtr backing;
if (dev_name && if (dev_name &&
!(devicename = qemuDomainStorageAlias(dev_name, depth))) !(devicename = qemuDomainStorageAlias(dev_name, depth)))
goto cleanup; return -1;
qdevname = virJSONValueObjectGetString(dev, "qdev"); qdevname = virJSONValueObjectGetString(dev, "qdev");
nodename = virJSONValueObjectGetString(dev, "node-name"); nodename = virJSONValueObjectGetString(dev, "node-name");
@ -2619,35 +2618,31 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValuePtr dev,
if (!devicename && !qdevname && !nodename) { if (!devicename && !qdevname && !nodename) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("blockstats device entry was not in expected format")); _("blockstats device entry was not in expected format"));
goto cleanup; return -1;
} }
if (!(bstats = qemuMonitorJSONBlockStatsCollectData(dev, &nstats))) if (!(bstats = qemuMonitorJSONBlockStatsCollectData(dev, &nstats)))
goto cleanup; return -1;
if (devicename && if (devicename &&
qemuMonitorJSONAddOneBlockStatsInfo(bstats, devicename, hash) < 0) qemuMonitorJSONAddOneBlockStatsInfo(bstats, devicename, hash) < 0)
goto cleanup; return -1;
if (qdevname && STRNEQ_NULLABLE(qdevname, devicename) && if (qdevname && STRNEQ_NULLABLE(qdevname, devicename) &&
qemuMonitorJSONAddOneBlockStatsInfo(bstats, qdevname, hash) < 0) qemuMonitorJSONAddOneBlockStatsInfo(bstats, qdevname, hash) < 0)
goto cleanup; return -1;
if (nodename && if (nodename &&
qemuMonitorJSONAddOneBlockStatsInfo(bstats, nodename, hash) < 0) qemuMonitorJSONAddOneBlockStatsInfo(bstats, nodename, hash) < 0)
goto cleanup; return -1;
if (backingChain && if (backingChain &&
(backing = virJSONValueObjectGetObject(dev, "backing")) && (backing = virJSONValueObjectGetObject(dev, "backing")) &&
qemuMonitorJSONGetOneBlockStatsInfo(backing, dev_name, depth + 1, qemuMonitorJSONGetOneBlockStatsInfo(backing, dev_name, depth + 1,
hash, true) < 0) hash, true) < 0)
goto cleanup; return -1;
ret = nstats; return nstats;
cleanup:
VIR_FREE(bstats);
VIR_FREE(devicename);
return ret;
} }