openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

conf: Use virDomainStorageSourceParseBase in virDomainDiskBackingStoreParse 

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 16:31:09 +01:00
parent 18bc52bce0
commit 868be7ce58
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/conf/domain_conf.c
View File

@ -9166,31 +9166,15 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
if (!(ctxt->node = virXPathNode("./backingStore", ctxt))) if (!(ctxt->node = virXPathNode("./backingStore", ctxt)))
return 0; return 0;
if (!(backingStore = virStorageSourceNew()))
return -1;
/* backing store is always read-only */
backingStore->readonly = true;
/* terminator does not have a type */ /* terminator does not have a type */
if (!(type = virXMLPropString(ctxt->node, "type"))) { if (!(type = virXMLPropString(ctxt->node, "type"))) {
VIR_STEAL_PTR(src->backingStore, backingStore); if (!(src->backingStore = virStorageSourceNew()))
return -1;
return 0; return 0;
} }
if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE))
(idx = virXMLPropString(ctxt->node, "index")) && idx = virXMLPropString(ctxt->node, "index");
virStrToLong_uip(idx, NULL, 10, &backingStore->id) < 0) {
virReportError(VIR_ERR_XML_ERROR, _("invalid disk index '%s'"), idx);
return -1;
}
backingStore->type = virStorageTypeFromString(type);
if (backingStore->type <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk backing store type '%s'"), type);
return -1;
}
if (!(format = virXPathString("string(./format/@type)", ctxt))) { if (!(format = virXPathString("string(./format/@type)", ctxt))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
@ -9198,19 +9182,18 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
return -1; return -1;
} }
backingStore->format = virStorageFileFormatTypeFromString(format);
if (backingStore->format <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk backing store format '%s'"), format);
return -1;
}
if (!(source = virXPathNode("./source", ctxt))) { if (!(source = virXPathNode("./source", ctxt))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing disk backing store source")); _("missing disk backing store source"));
return -1; return -1;
} }
if (!(backingStore = virDomainStorageSourceParseBase(type, format, idx)))
return -1;
/* backing store is always read-only */
backingStore->readonly = true;
if (virDomainStorageSourceParse(source, ctxt, backingStore, flags, xmlopt) < 0 || if (virDomainStorageSourceParse(source, ctxt, backingStore, flags, xmlopt) < 0 ||
virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) < 0) virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) < 0)
return -1; return -1;