External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

testQemuMonitorJSONqemuMonitorJSONGetBlockInfo: 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:35:09 +02:00
parent cca44e5298
commit 92c35f5590
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/qemumonitorjsontest.c
View File

@ -1460,7 +1460,6 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque)
{ {
const testGenericData *data = opaque; const testGenericData *data = opaque;
virDomainXMLOption *xmlopt = data->xmlopt; virDomainXMLOption *xmlopt = data->xmlopt;
int ret = -1;
g_autoptr(GHashTable) blockDevices = NULL; g_autoptr(GHashTable) blockDevices = NULL;
g_autoptr(GHashTable) expectedBlockDevices = NULL; g_autoptr(GHashTable) expectedBlockDevices = NULL;
struct qemuDomainDiskInfo *info; struct qemuDomainDiskInfo *info;
@ -1471,14 +1470,14 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque)
if (!(blockDevices = virHashNew(g_free)) || if (!(blockDevices = virHashNew(g_free)) ||
!(expectedBlockDevices = virHashNew(g_free))) !(expectedBlockDevices = virHashNew(g_free)))
goto cleanup; return -1;
info = g_new0(struct qemuDomainDiskInfo, 1); info = g_new0(struct qemuDomainDiskInfo, 1);
if (virHashAddEntry(expectedBlockDevices, "virtio-disk0", info) < 0) { if (virHashAddEntry(expectedBlockDevices, "virtio-disk0", info) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"Unable to create expectedBlockDevices hash table"); "Unable to create expectedBlockDevices hash table");
goto cleanup; return -1;
} }
info = g_new0(struct qemuDomainDiskInfo, 1); info = g_new0(struct qemuDomainDiskInfo, 1);
@ -1486,7 +1485,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque)
if (virHashAddEntry(expectedBlockDevices, "virtio-disk1", info) < 0) { if (virHashAddEntry(expectedBlockDevices, "virtio-disk1", info) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"Unable to create expectedBlockDevices hash table"); "Unable to create expectedBlockDevices hash table");
goto cleanup; return -1;
} }
info = g_new0(struct qemuDomainDiskInfo, 1); info = g_new0(struct qemuDomainDiskInfo, 1);
@ -1497,7 +1496,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque)
if (virHashAddEntry(expectedBlockDevices, "ide0-1-0", info) < 0) { if (virHashAddEntry(expectedBlockDevices, "ide0-1-0", info) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"Unable to create expectedBlockDevices hash table"); "Unable to create expectedBlockDevices hash table");
goto cleanup; return -1;
} }
info = g_new0(struct qemuDomainDiskInfo, 1); info = g_new0(struct qemuDomainDiskInfo, 1);
@ -1509,24 +1508,22 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque)
if (virHashAddEntry(expectedBlockDevices, "ide0-1-1", info) < 0) { if (virHashAddEntry(expectedBlockDevices, "ide0-1-1", info) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"Unable to create expectedBlockDevices hash table"); "Unable to create expectedBlockDevices hash table");
goto cleanup; return -1;
} }
if (qemuMonitorTestAddItem(test, "query-block", queryBlockReply) < 0) if (qemuMonitorTestAddItem(test, "query-block", queryBlockReply) < 0)
goto cleanup; return -1;
if (qemuMonitorJSONGetBlockInfo(qemuMonitorTestGetMonitor(test), blockDevices) < 0) if (qemuMonitorJSONGetBlockInfo(qemuMonitorTestGetMonitor(test), blockDevices) < 0)
goto cleanup; return -1;
if (!virHashEqual(blockDevices, expectedBlockDevices, testHashEqualQemuDomainDiskInfo)) { if (!virHashEqual(blockDevices, expectedBlockDevices, testHashEqualQemuDomainDiskInfo)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"Hashtable is different to the expected one"); "Hashtable is different to the expected one");
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
static int static int