External/libvirt
1
0
Fork 0
Code

qemu: Remove cleanup in qemuDomainObjPrivateXMLParseJobNBDSource

Browse Source 
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-20 17:10:11 +01:00
parent e1899a2490
commit ef5ed42655
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_domain.c
View File

@ -2716,42 +2716,39 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
VIR_AUTOFREE(char *) format = NULL; VIR_AUTOFREE(char *) format = NULL;
VIR_AUTOFREE(char *) type = NULL; VIR_AUTOFREE(char *) type = NULL;
int ret = -1;
VIR_AUTOUNREF(virStorageSourcePtr) migrSource = NULL; VIR_AUTOUNREF(virStorageSourcePtr) migrSource = NULL;
xmlNodePtr sourceNode; xmlNodePtr sourceNode;
ctxt->node = node; ctxt->node = node;
if (!(ctxt->node = virXPathNode("./migrationSource", ctxt))) { if (!(ctxt->node = virXPathNode("./migrationSource", ctxt)))
ret = 0; return 0;
goto cleanup;
}
if (!(migrSource = virStorageSourceNew())) if (!(migrSource = virStorageSourceNew()))
goto cleanup; return -1;
if (!(type = virXMLPropString(ctxt->node, "type"))) { if (!(type = virXMLPropString(ctxt->node, "type"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing storage source type")); _("missing storage source type"));
goto cleanup; return -1;
} }
if (!(format = virXMLPropString(ctxt->node, "format"))) { if (!(format = virXMLPropString(ctxt->node, "format"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing storage source format")); _("missing storage source format"));
goto cleanup; return -1;
} }
if ((migrSource->type = virStorageTypeFromString(type)) <= 0) { if ((migrSource->type = virStorageTypeFromString(type)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown storage source type '%s'"), type); _("unknown storage source type '%s'"), type);
goto cleanup; return -1;
} }
if ((migrSource->format = virStorageFileFormatTypeFromString(format)) <= 0) { if ((migrSource->format = virStorageFileFormatTypeFromString(format)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown storage source format '%s'"), format); _("unknown storage source format '%s'"), format);
goto cleanup; return -1;
} }
/* newer libvirt uses the <source> subelement instead of formatting the /* newer libvirt uses the <source> subelement instead of formatting the
@ -2761,17 +2758,14 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource,
VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0) VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0)
goto cleanup; return -1;
if ((ctxt->node = virXPathNode("./privateData", ctxt)) && if ((ctxt->node = virXPathNode("./privateData", ctxt)) &&
qemuStorageSourcePrivateDataParse(ctxt, migrSource) < 0) qemuStorageSourcePrivateDataParse(ctxt, migrSource) < 0)
goto cleanup; return -1;
VIR_STEAL_PTR(diskPriv->migrSource, migrSource); VIR_STEAL_PTR(diskPriv->migrSource, migrSource);
ret = 0; return 0;
cleanup:
return ret;
} }