[PATCH 04/24] testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities: refactor cleanup
Use automatic memory freeing to remove the 'cleanup:' label and 'ret'
variable.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemumonitorjsontest.c | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 954a074f15..5a3926bb11 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2217,11 +2217,10 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const
void *opaque)
{
const testGenericData *data = opaque;
virDomainXMLOptionPtr xmlopt = data->xmlopt;
- int ret = -1;
const char *cap;
- char **caps = NULL;
- virBitmapPtr bitmap = NULL;
- virJSONValuePtr json = NULL;
+ g_auto(GStrv) caps = NULL;
+ g_autoptr(virBitmap) bitmap = NULL;
+ g_autoptr(virJSONValue) json = NULL;
const char *reply =
"{"
" \"return\": ["
@@ -2240,32 +2239,26 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const
void *opaque)
if (qemuMonitorTestAddItem(test, "query-migrate-capabilities", reply) <
0 ||
qemuMonitorTestAddItem(test, "migrate-set-capabilities",
"{\"return\":{}}") < 0)
- goto cleanup;
+ return -1;
if (qemuMonitorGetMigrationCapabilities(qemuMonitorTestGetMonitor(test),
&caps) < 0)
- goto cleanup;
+ return -1;
cap = qemuMigrationCapabilityTypeToString(QEMU_MIGRATION_CAP_XBZRLE);
if (!virStringListHasString((const char **) caps, cap)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"Expected capability %s is missing", cap);
- goto cleanup;
+ return -1;
}
bitmap = virBitmapNew(QEMU_MIGRATION_CAP_LAST);
ignore_value(virBitmapSetBit(bitmap, QEMU_MIGRATION_CAP_XBZRLE));
if (!(json = qemuMigrationCapsToJSON(bitmap, bitmap)))
- goto cleanup;
-
- ret = qemuMonitorJSONSetMigrationCapabilities(qemuMonitorTestGetMonitor(test),
- &json);
+ return -1;
- cleanup:
- virJSONValueFree(json);
- g_strfreev(caps);
- virBitmapFree(bitmap);
- return ret;
+ return qemuMonitorJSONSetMigrationCapabilities(qemuMonitorTestGetMonitor(test),
+ &json);
}
static int
--
2.28.0