External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainFeaturesDefParse: Factor out capabilities parsing into separate function

Browse Source 
Cleanup to follow. This removes the last re-use of `nodes` in this function,
eliminating two VIR_FREEs.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-06-22 14:22:55 +02:00 committed by Michal Privoznik
parent 2c2fe23bef
commit 2afc9fdc82
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/conf/domain_conf.c
View File

@ -17481,6 +17481,51 @@ virDomainFeaturesXENDefParse(virDomainDef *def,
}
static int
virDomainFeaturesCapabilitiesDefParse(virDomainDef *def,
xmlNodePtr node,
xmlXPathContext *ctxt)
{
g_autofree xmlNodePtr *nodes = NULL;
size_t i;
int n;
virDomainCapabilitiesPolicy policy;
if (virXMLPropEnumDefault(node, "policy",
virDomainCapabilitiesPolicyTypeFromString,
VIR_XML_PROP_NONE, &policy,
VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT) < 0)
return -1;
def->features[VIR_DOMAIN_FEATURE_CAPABILITIES] = policy;
if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0)
return -1;
for (i = 0; i < n; i++) {
virTristateSwitch state;
int val = virDomainProcessCapsFeatureTypeFromString((const char *)nodes[i]->name);
if (val < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unexpected capability feature '%s'"), nodes[i]->name);
return -1;
}
if (virXMLPropTristateSwitch(nodes[i], "state", VIR_XML_PROP_NONE,
&state) < 0)
return -1;
if (state == VIR_TRISTATE_SWITCH_ABSENT)
state = VIR_TRISTATE_SWITCH_ON;
def->caps_features[val] = state;
}
return 0;
}
static int
virDomainFeaturesDefParse(virDomainDef *def,
xmlXPathContextPtr ctxt)
@ -17549,15 +17594,8 @@ virDomainFeaturesDefParse(virDomainDef *def,
break;
case VIR_DOMAIN_FEATURE_CAPABILITIES: {
virDomainCapabilitiesPolicy policy;
if (virXMLPropEnumDefault(nodes[i], "policy",
virDomainCapabilitiesPolicyTypeFromString,
VIR_XML_PROP_NONE, &policy,
VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT) < 0)
if (virDomainFeaturesCapabilitiesDefParse(def, nodes[i], ctxt) < 0)
return -1;
def->features[val] = policy;
break;
}
@ -17703,31 +17741,7 @@ virDomainFeaturesDefParse(virDomainDef *def,
break;
}
}
VIR_FREE(nodes);
if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0)
return -1;
for (i = 0; i < n; i++) {
virTristateSwitch state;
int val = virDomainProcessCapsFeatureTypeFromString((const char *)nodes[i]->name);
if (val < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unexpected capability feature '%s'"), nodes[i]->name);
return -1;
}
if (virXMLPropTristateSwitch(nodes[i], "state", VIR_XML_PROP_NONE,
&state) < 0)
return -1;
if (state == VIR_TRISTATE_SWITCH_ABSENT)
state = VIR_TRISTATE_SWITCH_ON;
def->caps_features[val] = state;
}
VIR_FREE(nodes);
return 0;
}