shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities: refactor cleanup

Browse Source 
Use automatic memory freeing to remove the 'cleanup:' label and 'ret'
variable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-11-30 15:29:49 +01:00
parent 681006a14b
commit 812b0e9122
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/qemumonitorjsontest.c
View File

@ -2050,11 +2050,10 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *opaque)
{ {
const testGenericData *data = opaque; const testGenericData *data = opaque;
virDomainXMLOptionPtr xmlopt = data->xmlopt; virDomainXMLOptionPtr xmlopt = data->xmlopt;
int ret = -1;
const char *cap; const char *cap;
char **caps = NULL; g_auto(GStrv) caps = NULL;
virBitmapPtr bitmap = NULL; g_autoptr(virBitmap) bitmap = NULL;
virJSONValuePtr json = NULL; g_autoptr(virJSONValue) json = NULL;
const char *reply = const char *reply =
"{" "{"
" \"return\": [" " \"return\": ["
@ -2073,32 +2072,26 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *opaque)
if (qemuMonitorTestAddItem(test, "query-migrate-capabilities", reply) < 0 || if (qemuMonitorTestAddItem(test, "query-migrate-capabilities", reply) < 0 ||
qemuMonitorTestAddItem(test, "migrate-set-capabilities", qemuMonitorTestAddItem(test, "migrate-set-capabilities",
"{\"return\":{}}") < 0) "{\"return\":{}}") < 0)
goto cleanup; return -1;
if (qemuMonitorGetMigrationCapabilities(qemuMonitorTestGetMonitor(test), if (qemuMonitorGetMigrationCapabilities(qemuMonitorTestGetMonitor(test),
&caps) < 0) &caps) < 0)
goto cleanup; return -1;
cap = qemuMigrationCapabilityTypeToString(QEMU_MIGRATION_CAP_XBZRLE); cap = qemuMigrationCapabilityTypeToString(QEMU_MIGRATION_CAP_XBZRLE);
if (!virStringListHasString((const char **) caps, cap)) { if (!virStringListHasString((const char **) caps, cap)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"Expected capability %s is missing", cap); "Expected capability %s is missing", cap);
goto cleanup; return -1;
} }
bitmap = virBitmapNew(QEMU_MIGRATION_CAP_LAST); bitmap = virBitmapNew(QEMU_MIGRATION_CAP_LAST);
ignore_value(virBitmapSetBit(bitmap, QEMU_MIGRATION_CAP_XBZRLE)); ignore_value(virBitmapSetBit(bitmap, QEMU_MIGRATION_CAP_XBZRLE));
if (!(json = qemuMigrationCapsToJSON(bitmap, bitmap))) if (!(json = qemuMigrationCapsToJSON(bitmap, bitmap)))
goto cleanup; return -1;
ret = qemuMonitorJSONSetMigrationCapabilities(qemuMonitorTestGetMonitor(test), return qemuMonitorJSONSetMigrationCapabilities(qemuMonitorTestGetMonitor(test),
&json); &json);
cleanup:
virJSONValueFree(json);
g_strfreev(caps);
virBitmapFree(bitmap);
return ret;
} }
static int static int