[libvirt] [PATCH v1 51/51] util: conf: separate virDomainDefPostParseInternalInfo from virDomainDefParseXML

xinhua.Cao caoxinhua at huawei.com
Thu Feb 8 06:46:49 UTC 2018


separate virDomainDefPostParseInternalInfo from virDomainDefParseXML
---
 src/conf/domain_conf.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7caff3a..0f2450a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -21064,6 +21064,23 @@ virDomainDefParseNameSpaceInfo(virDomainParseTotalParamPtr param)
     return 0;
 }
 
+
+static int
+virDomainDefPostParseInternalInfo(virDomainParseTotalParamPtr param)
+{
+    /* callback to fill driver specific domain aspects */
+    if (virDomainDefPostParseInternal(param->def,
+                                      param->caps,
+                                      param->flags,
+                                      param->xmlopt,
+                                      param->parseOpaque,
+                                      param->bootHash) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 static virDomainDefPtr
 virDomainDefParseXML(xmlDocPtr xml,
                      xmlNodePtr root,
@@ -21120,6 +21137,7 @@ virDomainDefParseXML(xmlDocPtr xml,
             virDomainDefParseKeyWrapInfo,
             virDomainDefParseMetadataInfo,
             virDomainDefParseNameSpaceInfo,
+            virDomainDefPostParseInternalInfo,
             NULL
     };
 
@@ -21151,11 +21169,6 @@ virDomainDefParseXML(xmlDocPtr xml,
         fun_index++;
     }
 
-    /* callback to fill driver specific domain aspects */
-    if (virDomainDefPostParseInternal(def, caps, flags, xmlopt, parseOpaque,
-                                      bootHash) < 0)
-        goto error;
-
     /* valdiate configuration */
     if (virDomainDefValidate(def, caps, flags, xmlopt) < 0)
         goto error;
-- 
2.8.3





More information about the libvir-list mailing list