mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-21 20:15:17 +00:00
qemuMonitorJSONGetAllBlockJobInfo: Remove superfluous goto
s
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
5b7e88322d
commit
7db3db301c
@ -5074,39 +5074,34 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitor *mon,
|
||||
virJSONValue *data;
|
||||
size_t nr_results;
|
||||
size_t i;
|
||||
g_autoptr(GHashTable) blockJobs = NULL;
|
||||
g_autoptr(GHashTable) blockJobs = virHashNew(g_free);
|
||||
|
||||
cmd = qemuMonitorJSONMakeCommand("query-block-jobs", NULL);
|
||||
if (!cmd)
|
||||
return NULL;
|
||||
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
|
||||
goto cleanup;
|
||||
return NULL;
|
||||
|
||||
if ((data = virJSONValueObjectGetArray(reply, "return")) == NULL) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("reply was missing return data"));
|
||||
goto cleanup;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
nr_results = virJSONValueArraySize(data);
|
||||
blockJobs = virHashNew(g_free);
|
||||
|
||||
for (i = 0; i < nr_results; i++) {
|
||||
virJSONValue *entry = virJSONValueArrayGet(data, i);
|
||||
if (!entry) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("missing array element"));
|
||||
goto error;
|
||||
return NULL;
|
||||
}
|
||||
if (qemuMonitorJSONParseBlockJobInfo(blockJobs, entry, rawjobname) < 0)
|
||||
goto error;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
return g_steal_pointer(&blockJobs);
|
||||
|
||||
error:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user