[PATCH v2 17/29] conf: Use virDomainStorageSourceParseBase in virDomainDiskBackingStoreParse

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/conf/domain_conf.c | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9b64e33ff5..15bb00e800 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9166,31 +9166,15 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
     if (!(ctxt->node = virXPathNode("./backingStore", ctxt)))
         return 0;

-    if (!(backingStore = virStorageSourceNew()))
-        return -1;
-
-    /* backing store is always read-only */
-    backingStore->readonly = true;
-
     /* terminator does not have a type */
     if (!(type = virXMLPropString(ctxt->node, "type"))) {
-        VIR_STEAL_PTR(src->backingStore, backingStore);
+        if (!(src->backingStore = virStorageSourceNew()))
+            return -1;
         return 0;
     }

-    if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
-        (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 (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE))
+        idx = virXMLPropString(ctxt->node, "index");

     if (!(format = virXPathString("string(./format/@type)", ctxt))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -9198,19 +9182,18 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
         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))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("missing disk backing store source"));
         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 ||
         virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) < 0)
         return -1;
-- 
2.20.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list