External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Don't require 'def' in virDomainDiskDefParse

Browse Source 
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>
This commit is contained in:
Peter Krempa 2018-03-16 15:32:09 +01:00
parent 295b128e09
commit 1cb7f41568
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conf/domain_conf.c
View File

@ -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);