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

qemuMonitorJSONGetAllBlockJobInfo: Remove superfluous gotos

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-07-05 16:17:55 +02:00
parent 5b7e88322d
commit 7db3db301c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_monitor_json.c
View File

@ -5074,39 +5074,34 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitor *mon,
virJSONValue *data; virJSONValue *data;
size_t nr_results; size_t nr_results;
size_t i; size_t i;
g_autoptr(GHashTable) blockJobs = NULL; g_autoptr(GHashTable) blockJobs = virHashNew(g_free);
cmd = qemuMonitorJSONMakeCommand("query-block-jobs", NULL); cmd = qemuMonitorJSONMakeCommand("query-block-jobs", NULL);
if (!cmd) if (!cmd)
return NULL; return NULL;
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
goto cleanup; return NULL;
if ((data = virJSONValueObjectGetArray(reply, "return")) == NULL) { if ((data = virJSONValueObjectGetArray(reply, "return")) == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("reply was missing return data")); _("reply was missing return data"));
goto cleanup; return NULL;
} }
nr_results = virJSONValueArraySize(data); nr_results = virJSONValueArraySize(data);
blockJobs = virHashNew(g_free);
for (i = 0; i < nr_results; i++) { for (i = 0; i < nr_results; i++) {
virJSONValue *entry = virJSONValueArrayGet(data, i); virJSONValue *entry = virJSONValueArrayGet(data, i);
if (!entry) { if (!entry) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing array element")); _("missing array element"));
goto error; return NULL;
} }
if (qemuMonitorJSONParseBlockJobInfo(blockJobs, entry, rawjobname) < 0) if (qemuMonitorJSONParseBlockJobInfo(blockJobs, entry, rawjobname) < 0)
goto error; return NULL;
} }
cleanup:
return g_steal_pointer(&blockJobs); return g_steal_pointer(&blockJobs);
error:
return NULL;
} }