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

testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo: 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:31:31 +02:00
parent efb30a055c
commit 6356ff86ae
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/qemumonitorjsontest.c
View File

@ -1538,7 +1538,6 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque)
virDomainXMLOption *xmlopt = data->xmlopt; virDomainXMLOption *xmlopt = data->xmlopt;
g_autoptr(GHashTable) blockstats = NULL; g_autoptr(GHashTable) blockstats = NULL;
qemuBlockStats *stats; qemuBlockStats *stats;
int ret = -1;
g_autoptr(qemuMonitorTest) test = NULL; g_autoptr(qemuMonitorTest) test = NULL;
const char *reply = const char *reply =
@ -1632,10 +1631,10 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque)
return -1; return -1;
if (!(blockstats = virHashNew(g_free))) if (!(blockstats = virHashNew(g_free)))
goto cleanup; return -1;
if (qemuMonitorTestAddItem(test, "query-blockstats", reply) < 0) if (qemuMonitorTestAddItem(test, "query-blockstats", reply) < 0)
goto cleanup; return -1;
#define CHECK0FULL(var, value, varformat, valformat) \ #define CHECK0FULL(var, value, varformat, valformat) \
if (stats->var != value) { \ if (stats->var != value) { \
@ -1643,7 +1642,7 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque)
"Invalid " #var " value: " varformat \ "Invalid " #var " value: " varformat \
", expected " valformat, \ ", expected " valformat, \
stats->var, value); \ stats->var, value); \
goto cleanup; \ return -1; \
} }
#define CHECK0(var, value) CHECK0FULL(var, value, "%lld", "%d") #define CHECK0(var, value) CHECK0FULL(var, value, "%lld", "%d")
@ -1654,7 +1653,7 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque)
if (!(stats = virHashLookup(blockstats, NAME))) { \ if (!(stats = virHashLookup(blockstats, NAME))) { \
virReportError(VIR_ERR_INTERNAL_ERROR, \ virReportError(VIR_ERR_INTERNAL_ERROR, \
"block stats for device '%s' is missing", NAME); \ "block stats for device '%s' is missing", NAME); \
goto cleanup; \ return -1; \
} \ } \
CHECK0(rd_req, RD_REQ) \ CHECK0(rd_req, RD_REQ) \
CHECK0(rd_bytes, RD_BYTES) \ CHECK0(rd_bytes, RD_BYTES) \
@ -1669,26 +1668,24 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque)
if (qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorTestGetMonitor(test), if (qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorTestGetMonitor(test),
blockstats, false) < 0) blockstats, false) < 0)
goto cleanup; return -1;
if (!blockstats) { if (!blockstats) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"qemuMonitorJSONGetAllBlockStatsInfo didn't return stats"); "qemuMonitorJSONGetAllBlockStatsInfo didn't return stats");
goto cleanup; return -1;
} }
CHECK("virtio-disk0", 1279, 28505088, 640616474, 174, 2845696, 530699221, 0, 0, 5256018944ULL, true) CHECK("virtio-disk0", 1279, 28505088, 640616474, 174, 2845696, 530699221, 0, 0, 5256018944ULL, true)
CHECK("virtio-disk1", 85, 348160, 8232156, 0, 0, 0, 0, 0, 0ULL, true) CHECK("virtio-disk1", 85, 348160, 8232156, 0, 0, 0, 0, 0, 0ULL, true)
CHECK("ide0-1-0", 16, 49250, 1004952, 0, 0, 0, 0, 0, 0ULL, false) CHECK("ide0-1-0", 16, 49250, 1004952, 0, 0, 0, 0, 0, 0ULL, false)
ret = 0; return 0;
#undef CHECK #undef CHECK
#undef CHECK0 #undef CHECK0
#undef CHECK0FULL #undef CHECK0FULL
cleanup:
return ret;
} }