External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-04 08:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Refactor control flow in testBackingXMLjsonXML

Browse Source 
Get rid of the 'cleanup' label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-03-08 16:11:20 +01:00
parent 5f13df4cf4
commit 4885e9fdd9
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/qemublocktest.c
View File

@ -51,7 +51,6 @@ testBackingXMLjsonXML(const void *args)
VIR_AUTOFREE(char *) propsstr = NULL; VIR_AUTOFREE(char *) propsstr = NULL;
VIR_AUTOFREE(char *) protocolwrapper = NULL; VIR_AUTOFREE(char *) protocolwrapper = NULL;
VIR_AUTOFREE(char *) actualxml = NULL; VIR_AUTOFREE(char *) actualxml = NULL;
int ret = -1;
VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc = NULL; VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc = NULL;
VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc = NULL; VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc = NULL;
@ -61,36 +60,36 @@ testBackingXMLjsonXML(const void *args)
xmlsrc->type = data->type; xmlsrc->type = data->type;
if (!(xml = virXMLParseStringCtxt(data->xml, "(test storage source XML)", &ctxt))) if (!(xml = virXMLParseStringCtxt(data->xml, "(test storage source XML)", &ctxt)))
goto cleanup; return -1;
if (virDomainDiskSourceParse(ctxt->node, ctxt, xmlsrc, 0, NULL) < 0) { if (virDomainDiskSourceParse(ctxt->node, ctxt, xmlsrc, 0, NULL) < 0) {
fprintf(stderr, "failed to parse disk source xml\n"); fprintf(stderr, "failed to parse disk source xml\n");
goto cleanup; return -1;
} }
if (!(backendprops = qemuBlockStorageSourceGetBackendProps(xmlsrc, true))) { if (!(backendprops = qemuBlockStorageSourceGetBackendProps(xmlsrc, true))) {
fprintf(stderr, "failed to format disk source json\n"); fprintf(stderr, "failed to format disk source json\n");
goto cleanup; return -1;
} }
if (virJSONValueObjectCreate(&wrapper, "a:file", &backendprops, NULL) < 0) if (virJSONValueObjectCreate(&wrapper, "a:file", &backendprops, NULL) < 0)
goto cleanup; return -1;
if (!(propsstr = virJSONValueToString(wrapper, false))) if (!(propsstr = virJSONValueToString(wrapper, false)))
goto cleanup; return -1;
if (virAsprintf(&protocolwrapper, "json:%s", propsstr) < 0) if (virAsprintf(&protocolwrapper, "json:%s", propsstr) < 0)
goto cleanup; return -1;
if (!(jsonsrc = virStorageSourceNewFromBackingAbsolute(protocolwrapper))) { if (!(jsonsrc = virStorageSourceNewFromBackingAbsolute(protocolwrapper))) {
fprintf(stderr, "failed to parse disk json\n"); fprintf(stderr, "failed to parse disk json\n");
goto cleanup; return -1;
} }
if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, 0, NULL) < 0 || if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, 0, NULL) < 0 ||
!(actualxml = virBufferContentAndReset(&buf))) { !(actualxml = virBufferContentAndReset(&buf))) {
fprintf(stderr, "failed to format disk source xml\n"); fprintf(stderr, "failed to format disk source xml\n");
goto cleanup; return -1;
} }
if (STRNEQ(actualxml, data->xml)) { if (STRNEQ(actualxml, data->xml)) {
@ -98,13 +97,10 @@ testBackingXMLjsonXML(const void *args)
"actual storage source xml:\n%s\n" "actual storage source xml:\n%s\n"
"intermediate json:\n%s\n", "intermediate json:\n%s\n",
data->xml, actualxml, protocolwrapper); data->xml, actualxml, protocolwrapper);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }