[PATCH v2 05/10] conf: Extract name-parsing into its own function

[Martin Kletzander <mkletzan@xxxxxxxxxx>]

Create virDomainDefParseName that parses only the name from XML
definition.  This will be used in future patches.

Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx>
---
 src/conf/domain_conf.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d21e8cbd9d11..de6853a4dbd0 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14446,6 +14446,19 @@ virDomainVcpuParse(virDomainDefPtr def,
     return ret;
 }

+static int
+virDomainDefParseName(virDomainDefPtr def,
+                      xmlXPathContextPtr ctxt)
+{
+    if (!(def->name = virXPathString("string(./name[1])", ctxt))) {
+        virReportError(VIR_ERR_NO_NAME, NULL);
+        return -1;
+    }
+
+    return 0;
+}
+
+
 static virDomainDefPtr
 virDomainDefParseXML(xmlDocPtr xml,
                      xmlNodePtr root,
@@ -14571,11 +14584,8 @@ virDomainDefParseXML(xmlDocPtr xml,
         VIR_FREE(capsdata);
     }

-    /* Extract domain name */
-    if (!(def->name = virXPathString("string(./name[1])", ctxt))) {
-        virReportError(VIR_ERR_NO_NAME, NULL);
+    if (virDomainDefParseName(def, ctxt) < 0)
         goto error;
-    }

     /* Extract domain uuid. If both uuid and sysinfo/system/entry/uuid
      * exist, they must match; and if only the latter exists, it can
-- 
2.6.3

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