[libvirt] [PATCH 10/17] conf: move mode parsing of chardev source to separate function

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrd...@redhat.com>
---
 src/conf/domain_conf.c | 60 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index eb576b90ae..e0045eba19 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10886,6 +10886,39 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
 }
 
 
+typedef enum {
+    VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT,
+    VIR_DOMAIN_CHR_SOURCE_MODE_BIND,
+} virDomainChrSourceModeType;
+
+
+/**
+ * virDomainChrSourceDefParseMode:
+ * @source: XML dom node
+ *
+ * Returns: -1 in case of error,
+ *          virDomainChrSourceModeType in case of success
+ */
+static int
+virDomainChrSourceDefParseMode(xmlNodePtr source)
+{
+    char *mode = virXMLPropString(source, "mode");
+    int ret = -1;
+
+    if (!mode || STREQ(mode, "connect")) {
+        ret = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
+    } else if (STREQ(mode, "bind")) {
+        ret = VIR_DOMAIN_CHR_SOURCE_MODE_BIND;
+    } else {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unknown source mode '%s'"), mode);
+    }
+
+    VIR_FREE(mode);
+    return ret;
+}
+
+
 static int
 virDomainChrSourceDefParseProtocol(virDomainChrSourceDefPtr def,
                                    xmlNodePtr protocol)
@@ -10948,12 +10981,12 @@ 
virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
                               int nvmSeclabels)
 {
     int ret = -1;
+    int mode = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
     char *bindHost = NULL;
     char *bindService = NULL;
     char *connectHost = NULL;
     char *connectService = NULL;
     char *path = NULL;
-    char *mode = NULL;
     char *channel = NULL;
     char *master = NULL;
     char *slave = NULL;
@@ -10985,8 +11018,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr 
def,
             }
             sourceParsed++;
 
-            if (!mode)
-                mode = virXMLPropString(cur, "mode");
             if (!haveTLS)
                 haveTLS = virXMLPropString(cur, "tls");
             if (!tlsFromConfig)
@@ -11005,29 +11036,29 @@ 
virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
                     (def->type != VIR_DOMAIN_CHR_TYPE_PTY ||
                      !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)))
                     path = virXMLPropString(cur, "path");
+                if (def->type == VIR_DOMAIN_CHR_TYPE_UNIX) {
+                    if ((mode = virDomainChrSourceDefParseMode(cur)) < 0)
+                        goto error;
+                }
 
                 break;
 
             case VIR_DOMAIN_CHR_TYPE_UDP:
             case VIR_DOMAIN_CHR_TYPE_TCP:
-                if (!mode || STREQ(mode, "connect")) {
+                if ((mode = virDomainChrSourceDefParseMode(cur)) < 0)
+                    goto error;
+                if (mode == VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT) {
                     if (!connectHost)
                         connectHost = virXMLPropString(cur, "host");
                     if (!connectService)
                         connectService = virXMLPropString(cur, "service");
-                } else if (STREQ(mode, "bind")) {
+                } else if (mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND) {
                     if (!bindHost)
                         bindHost = virXMLPropString(cur, "host");
                     if (!bindService)
                         bindService = virXMLPropString(cur, "service");
-                } else {
-                    virReportError(VIR_ERR_INTERNAL_ERROR,
-                                   _("Unknown source mode '%s'"), mode);
-                    goto error;
                 }
 
-                if (def->type == VIR_DOMAIN_CHR_TYPE_UDP)
-                    VIR_FREE(mode);
                 break;
 
             case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
@@ -11137,7 +11168,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr 
def,
         break;
 
     case VIR_DOMAIN_CHR_TYPE_TCP:
-        if (!mode || STREQ(mode, "connect")) {
+        if (mode == VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT) {
             if (!connectHost) {
                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                _("Missing source host attribute for char 
device"));
@@ -11155,7 +11186,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr 
def,
             def->data.tcp.service = connectService;
             connectService = NULL;
             def->data.tcp.listen = false;
-        } else {
+        } else if (mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND) {
             if (!bindHost) {
                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                _("Missing source host attribute for char 
device"));
@@ -11226,7 +11257,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr 
def,
             goto error;
         }
 
-        def->data.nix.listen = mode != NULL && STRNEQ(mode, "connect");
+        def->data.nix.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND;
 
         def->data.nix.path = path;
         path = NULL;
@@ -11250,7 +11281,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr 
def,
 
     ret = 0;
  cleanup:
-    VIR_FREE(mode);
     VIR_FREE(bindHost);
     VIR_FREE(bindService);
     VIR_FREE(connectHost);
-- 
2.13.5

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