Refactoring virDomainVideoDriverDefParseXML() to use XPath

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 8cceb055c0ee547958c921669c55ec82652929c0..82581a318c32ae5fafe76e4db16da5f6eee9fcfd 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14313,34 +14313,24 @@ virDomainVideoResolutionDefParseXML(xmlNodePtr node)
 
 static virDomainVideoDriverDef *
 virDomainVideoDriverDefParseXML(xmlNodePtr node,
-                                xmlXPathContextPtr ctxt G_GNUC_UNUSED)
+                                xmlXPathContextPtr ctxt)
 {
-    xmlNodePtr cur;
     virDomainVideoDriverDef *def;
-    int val;
-    g_autofree char *vgaconf = NULL;
+    unsigned int val;
+    xmlNodePtr driver = NULL;
+    VIR_XPATH_NODE_AUTORESTORE(ctxt)
 
-    cur = node->children;
-    while (cur != NULL) {
-        if (cur->type == XML_ELEMENT_NODE) {
-            if (!vgaconf &&
-                virXMLNodeNameEqual(cur, "driver")) {
-                vgaconf = virXMLPropString(cur, "vgaconf");
-            }
-        }
-        cur = cur->next;
-    }
+    ctxt->node = node;
 
-    if (!vgaconf)
+    if (!(driver = virXPathNode("./driver", ctxt)))
         return NULL;
 
-    def = g_new0(virDomainVideoDriverDef, 1);
+    if (virXMLPropEnum(driver, "vgaconf",
+                       virDomainVideoVGAConfTypeFromString,
+                       VIR_XML_PROP_NONZERO, &val) < 0)
+        return NULL;
 
-    if ((val = virDomainVideoVGAConfTypeFromString(vgaconf)) <= 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown vgaconf value '%s'"), vgaconf);
-        return def;
-    }
+    def = g_new0(virDomainVideoDriverDef, 1);
     def->vgaconf = val;
 
     return def;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 0874c9007f322c8836accef2e972960f53eb40d7..95d051627910d44d53eacdfeb1259f66a6de173d 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1665,7 +1665,7 @@ struct _virDomainVideoResolutionDef {
 };
 
 struct _virDomainVideoDriverDef {
-   virDomainVideoVGAConf vgaconf;
+    virDomainVideoVGAConf vgaconf;
     char *vhost_user_binary;
 };