External/libvirt
1
0
Fork 0
Code

virDomainFeaturesCapabilitiesDefParse: Use virXMLNodeGetSubelementList

Browse Source 
Rewrite the old-style parser to use virXMLNodeGetSubelementList

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2023-04-26 17:43:12 +02:00
parent 03f7e2a0e5
commit 6d338f2083
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/conf/domain_conf.c
View File

@ -16438,7 +16438,10 @@ static int
virDomainFeaturesCapabilitiesDefParse(virDomainDef *def, virDomainFeaturesCapabilitiesDefParse(virDomainDef *def,
xmlNodePtr node) xmlNodePtr node)
{ {
g_autofree xmlNodePtr *caps = NULL;
size_t ncaps = virXMLNodeGetSubelementList(node, NULL, &caps);
virDomainCapabilitiesPolicy policy; virDomainCapabilitiesPolicy policy;
size_t i;
if (virXMLPropEnumDefault(node, "policy", if (virXMLPropEnumDefault(node, "policy",
virDomainCapabilitiesPolicyTypeFromString, virDomainCapabilitiesPolicyTypeFromString,
@ -16448,25 +16451,23 @@ virDomainFeaturesCapabilitiesDefParse(virDomainDef *def,
def->features[VIR_DOMAIN_FEATURE_CAPABILITIES] = policy; def->features[VIR_DOMAIN_FEATURE_CAPABILITIES] = policy;
node = xmlFirstElementChild(node); for (i = 0; i < ncaps; i++) {
while (node) {
virTristateSwitch state; virTristateSwitch state;
int val = virDomainProcessCapsFeatureTypeFromString((const char *)node->name); int val = virDomainProcessCapsFeatureTypeFromString((const char *)caps[i]->name);
if (val < 0) { if (val < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unexpected capability feature '%1$s'"), node->name); _("unexpected capability feature '%1$s'"), caps[i]->name);
return -1; return -1;
} }
if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_NONE, &state) < 0) if (virXMLPropTristateSwitch(caps[i], "state", VIR_XML_PROP_NONE, &state) < 0)
return -1; return -1;
if (state == VIR_TRISTATE_SWITCH_ABSENT) if (state == VIR_TRISTATE_SWITCH_ABSENT)
state = VIR_TRISTATE_SWITCH_ON; state = VIR_TRISTATE_SWITCH_ON;
def->caps_features[val] = state; def->caps_features[val] = state;
node = xmlNextElementSibling(node);
} }
return 0; return 0;