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

[xinhua.Cao]

separate virDomainDefParseClockInfo from virDomainDefParseXML
---
 src/conf/domain_conf.c | 189 +++++++++++++++++++++++++++----------------------
 1 file changed, 104 insertions(+), 85 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 248472b..1e949ea 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19682,6 +19682,109 @@ virDomainDefParsePerfEventInfo(virDomainParseTotalParamPtr param)
 }
 
 
+static int
+virDomainDefParseClockInfo(virDomainParseTotalParamPtr param)
+{
+    virDomainDefPtr def = param->def;
+    xmlXPathContextPtr ctxt = param->ctxt;
+    size_t i;
+    char *tmp = NULL;
+    int ret = -1;
+    xmlNodePtr *nodes = NULL;
+    int n;
+
+    if ((tmp = virXPathString("string(./clock/@offset)", ctxt)) &&
+        (def->clock.offset = virDomainClockOffsetTypeFromString(tmp)) < 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("unknown clock offset '%s'"), tmp);
+        goto cleanup;
+    }
+    VIR_FREE(tmp);
+
+    switch (def->clock.offset) {
+    case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+    case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+        tmp = virXPathString("string(./clock/@adjustment)", ctxt);
+        if (tmp) {
+            if (STREQ(tmp, "reset")) {
+                def->clock.data.utc_reset = true;
+            } else {
+                if (virStrToLong_ll(tmp, NULL, 10,
+                                    &def->clock.data.variable.adjustment) < 0) {
+                    virReportError(VIR_ERR_XML_ERROR,
+                                   _("unknown clock adjustment '%s'"),
+                                   tmp);
+                    goto cleanup;
+                }
+                switch (def->clock.offset) {
+                case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+                    def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_LOCALTIME;
+                    break;
+                case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+                    def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_UTC;
+                    break;
+                }
+                def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE;
+            }
+            VIR_FREE(tmp);
+        } else {
+            def->clock.data.utc_reset = false;
+        }
+        break;
+
+    case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
+        if (virXPathLongLong("number(./clock/@adjustment)", ctxt,
+                             &def->clock.data.variable.adjustment) < 0)
+            def->clock.data.variable.adjustment = 0;
+        if (virXPathLongLong("number(./clock/@adjustment0)", ctxt,
+                             &def->clock.data.variable.adjustment0) < 0)
+            def->clock.data.variable.adjustment0 = 0;
+        tmp = virXPathString("string(./clock/@basis)", ctxt);
+        if (tmp) {
+            if ((def->clock.data.variable.basis = virDomainClockBasisTypeFromString(tmp)) < 0) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("unknown clock basis '%s'"), tmp);
+                goto cleanup;
+            }
+            VIR_FREE(tmp);
+        } else {
+            def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_UTC;
+        }
+        break;
+
+    case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE:
+        def->clock.data.timezone = virXPathString("string(./clock/@timezone)", ctxt);
+        if (!def->clock.data.timezone) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("missing 'timezone' attribute for clock with offset='timezone'"));
+            goto cleanup;
+        }
+        break;
+    }
+
+    if ((n = virXPathNodeSet("./clock/timer", ctxt, &nodes)) < 0)
+        goto cleanup;
+
+    if (n && VIR_ALLOC_N(def->clock.timers, n) < 0)
+        goto cleanup;
+
+    for (i = 0; i < n; i++) {
+        virDomainTimerDefPtr timer = virDomainTimerDefParseXML(nodes[i],
+                                                               ctxt);
+        if (!timer)
+            goto cleanup;
+
+        def->clock.timers[def->clock.ntimers++] = timer;
+    }
+    VIR_FREE(nodes);
+
+    ret = 0;
+
+ cleanup:
+    VIR_FREE(nodes);
+    return ret;
+}
+
 static virDomainDefPtr
 virDomainDefParseXML(xmlDocPtr xml,
                      xmlNodePtr root,
@@ -19738,6 +19841,7 @@ virDomainDefParseXML(xmlDocPtr xml,
             virDomainDefParseEventActionInfo,
             virDomainDefParsePMStateInfo,
             virDomainDefParsePerfEventInfo,
+            virDomainDefParseClockInfo,
             NULL
     };
 
@@ -19765,91 +19869,6 @@ virDomainDefParseXML(xmlDocPtr xml,
         fun_index++;
     }
 
-    if ((tmp = virXPathString("string(./clock/@offset)", ctxt)) &&
-        (def->clock.offset = virDomainClockOffsetTypeFromString(tmp)) < 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown clock offset '%s'"), tmp);
-        goto error;
-    }
-    VIR_FREE(tmp);
-
-    switch (def->clock.offset) {
-    case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
-    case VIR_DOMAIN_CLOCK_OFFSET_UTC:
-        tmp = virXPathString("string(./clock/@adjustment)", ctxt);
-        if (tmp) {
-            if (STREQ(tmp, "reset")) {
-                def->clock.data.utc_reset = true;
-            } else {
-                if (virStrToLong_ll(tmp, NULL, 10,
-                                    &def->clock.data.variable.adjustment) < 0) {
-                    virReportError(VIR_ERR_XML_ERROR,
-                                   _("unknown clock adjustment '%s'"),
-                                   tmp);
-                    goto error;
-                }
-                switch (def->clock.offset) {
-                case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
-                    def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_LOCALTIME;
-                    break;
-                case VIR_DOMAIN_CLOCK_OFFSET_UTC:
-                    def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_UTC;
-                    break;
-                }
-                def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE;
-            }
-            VIR_FREE(tmp);
-        } else {
-            def->clock.data.utc_reset = false;
-        }
-        break;
-
-    case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
-        if (virXPathLongLong("number(./clock/@adjustment)", ctxt,
-                             &def->clock.data.variable.adjustment) < 0)
-            def->clock.data.variable.adjustment = 0;
-        if (virXPathLongLong("number(./clock/@adjustment0)", ctxt,
-                             &def->clock.data.variable.adjustment0) < 0)
-            def->clock.data.variable.adjustment0 = 0;
-        tmp = virXPathString("string(./clock/@basis)", ctxt);
-        if (tmp) {
-            if ((def->clock.data.variable.basis = virDomainClockBasisTypeFromString(tmp)) < 0) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("unknown clock basis '%s'"), tmp);
-                goto error;
-            }
-            VIR_FREE(tmp);
-        } else {
-            def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_UTC;
-        }
-        break;
-
-    case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE:
-        def->clock.data.timezone = virXPathString("string(./clock/@timezone)", ctxt);
-        if (!def->clock.data.timezone) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("missing 'timezone' attribute for clock with offset='timezone'"));
-            goto error;
-        }
-        break;
-    }
-
-    if ((n = virXPathNodeSet("./clock/timer", ctxt, &nodes)) < 0)
-        goto error;
-
-    if (n && VIR_ALLOC_N(def->clock.timers, n) < 0)
-        goto error;
-
-    for (i = 0; i < n; i++) {
-        virDomainTimerDefPtr timer = virDomainTimerDefParseXML(nodes[i],
-                                                               ctxt);
-        if (!timer)
-            goto error;
-
-        def->clock.timers[def->clock.ntimers++] = timer;
-    }
-    VIR_FREE(nodes);
-
     if (virDomainDefParseBootOptions(def, ctxt, &bootHash) < 0)
         goto error;
 
-- 
2.8.3