conf: Don't require 'def' in virDomainDiskDefParse

In some use cases (mostly in tests) it is not required to check the
seclabel definition validity. Add possibility to call
virDomainDiskDefParse without the domain definition.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e2bad48cc887003c4241da75318bdf5077ca5724..ac3a3d9966f0679126066fa646c5d4e0b35bb6d5 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15873,6 +15873,8 @@ virDomainDiskDefParse(const char *xmlStr,
     xmlDocPtr xml;
     xmlXPathContextPtr ctxt = NULL;
     virDomainDiskDefPtr disk = NULL;
+    virSecurityLabelDefPtr *seclabels = NULL;
+    size_t nseclabels = 0;
 
     if (!(xml = virXMLParseStringCtxt(xmlStr, _("(disk_definition)"), &ctxt)))
         goto cleanup;
@@ -15884,10 +15886,13 @@ virDomainDiskDefParse(const char *xmlStr,
         goto cleanup;
     }
 
+    if (def) {
+        seclabels = def->seclabels;
+        nseclabels = def->nseclabels;
+    }
+
     disk = virDomainDiskDefParseXML(xmlopt, ctxt->node, ctxt,
-                                    NULL, def->seclabels,
-                                    def->nseclabels,
-                                    flags);
+                                    NULL, seclabels, nseclabels, flags);
 
  cleanup:
     xmlFreeDoc(xml);