shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

lxc: Rework lxcDomainDefNamespaceParse()

Browse Source 
While fixing our schema for <lxc:namespace/> I've looked into the
parser and realized it could use some treating.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Michal Privoznik 2020-12-15 20:06:22 +01:00
parent 6ac44c6334
commit fe983e4c50
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/lxc/lxc_domain.c
View File

@ -208,26 +208,31 @@ static int
lxcDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
void **data)
{
lxcDomainDefPtr lxcDef = g_new0(lxcDomainDef, 1);
lxcDomainDefPtr lxcDef = NULL;
g_autofree xmlNodePtr *nodes = NULL;
bool uses_lxc_ns = false;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
int feature;
int n;
size_t i;
int ret = -1;
if ((n = virXPathNodeSet("./lxc:namespace/*", ctxt, &nodes)) < 0)
goto error;
uses_lxc_ns |= n > 0;
return -1;
if (n == 0)
return 0;
lxcDef = g_new0(lxcDomainDef, 1);
for (i = 0; i < n; i++) {
g_autofree char *tmp = NULL;
int feature;
if ((feature = virLXCDomainNamespaceTypeFromString(
(const char *)nodes[i]->name)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported Namespace feature: %s"),
nodes[i]->name);
goto error;
_("unsupported Namespace feature: %s"),
nodes[i]->name);
goto cleanup;
}
ctxt->node = nodes[i];
@ -235,31 +240,30 @@ lxcDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
if (!(tmp = virXMLPropString(nodes[i], "type"))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("No lxc environment type specified"));
goto error;
goto cleanup;
}
if ((lxcDef->ns_source[feature] =
virLXCDomainNamespaceSourceTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown LXC namespace source '%s'"),
tmp);
goto error;
goto cleanup;
}
if (!(lxcDef->ns_val[feature] =
virXMLPropString(nodes[i], "value"))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("No lxc environment type specified"));
goto error;
goto cleanup;
}
}
if (uses_lxc_ns)
*data = lxcDef;
else
g_free(lxcDef);
return 0;
error:
*data = g_steal_pointer(&lxcDef);
ret = 0;
cleanup:
lxcDomainDefNamespaceFree(lxcDef);
return -1;
return ret;
}