conf: refactor virDomainResourceDefParse

There is no need to error out for empty <partition></partition> element
as we can just simply ignore it. This allows to simplify the function
and prepare it for new sub-elements of <resource>.

It makes the <partition> element optional so we need to reflect the
change in schema as well.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 24420789696fdb6cbfe12a84f526a67402e10f49..9b669d9de5f5e8c0499a33d064da2cc9893e715d 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1172,9 +1172,11 @@
 
   <define name="respartition">
     <element name="resource">
-      <element name="partition">
-        <ref name="absFilePath"/>
-      </element>
+      <optional>
+        <element name="partition">
+          <ref name="absFilePath"/>
+        </element>
+      </optional>
     </element>
   </define>
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e9bdbbfd7426175ad98a217040fd1049d1dc9c1e..7dff6c8beb19fd058c5620815e15cb5648d3efaf 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17284,23 +17284,19 @@ virDomainResourceDefParse(xmlNodePtr node,
 {
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
     virDomainResourceDef *def = NULL;
+    char *partition = NULL;
 
     ctxt->node = node;
 
-    def = g_new0(virDomainResourceDef, 1);
+    partition = virXPathString("string(./partition)", ctxt);
 
-    /* Find out what type of virtualization to use */
-    if (!(def->partition = virXPathString("string(./partition)", ctxt))) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("missing resource partition attribute"));
-        goto error;
-    }
+    if (!partition)
+        return NULL;
 
-    return def;
+    def = g_new0(virDomainResourceDef, 1);
+    def->partition = partition;
 
- error:
-    virDomainResourceDefFree(def);
-    return NULL;
+    return def;
 }