External/libvirt
1
0
Fork 0
Code

virDomainFeaturesKVMDefParse: Remove ctxt

Browse Source 
Iterating over all child elements of a node does not require xpath.
By doing away with xpath for this code, the code can be simplified.

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:47 +02:00 committed by Michal Privoznik
parent 947204c1a2
commit 3c5e607b24
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/conf/domain_conf.c
View File

@ -17400,26 +17400,21 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
static int static int
virDomainFeaturesKVMDefParse(virDomainDef *def, virDomainFeaturesKVMDefParse(virDomainDef *def,
xmlXPathContext *ctxt) xmlNodePtr node)
{ {
g_autofree xmlNodePtr *nodes = NULL;
size_t i;
int n;
def->features[VIR_DOMAIN_FEATURE_KVM] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_KVM] = VIR_TRISTATE_SWITCH_ON;
if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) {
int feature; int feature;
virTristateSwitch value; virTristateSwitch value;
if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0)
return -1;
for (i = 0; i < n; i++) { node = xmlFirstElementChild(node);
feature = virDomainKVMTypeFromString((const char *)nodes[i]->name); while (node) {
feature = virDomainKVMTypeFromString((const char *)node->name);
if (feature < 0) { if (feature < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported KVM feature: %s"), _("unsupported KVM feature: %s"),
nodes[i]->name); node->name);
return -1; return -1;
} }
@ -17427,7 +17422,7 @@ virDomainFeaturesKVMDefParse(virDomainDef *def,
case VIR_DOMAIN_KVM_HIDDEN: case VIR_DOMAIN_KVM_HIDDEN:
case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_DEDICATED:
case VIR_DOMAIN_KVM_POLLCONTROL: case VIR_DOMAIN_KVM_POLLCONTROL:
if (virXMLPropTristateSwitch(nodes[i], "state", if (virXMLPropTristateSwitch(node, "state",
VIR_XML_PROP_REQUIRED, VIR_XML_PROP_REQUIRED,
&value) < 0) &value) < 0)
return -1; return -1;
@ -17438,8 +17433,9 @@ virDomainFeaturesKVMDefParse(virDomainDef *def,
case VIR_DOMAIN_KVM_LAST: case VIR_DOMAIN_KVM_LAST:
break; break;
} }
node = xmlNextElementSibling(node);
} }
VIR_FREE(nodes);
} }
return 0; return 0;
@ -17494,7 +17490,7 @@ virDomainFeaturesDefParse(virDomainDef *def,
break; break;
case VIR_DOMAIN_FEATURE_KVM: case VIR_DOMAIN_FEATURE_KVM:
if (virDomainFeaturesKVMDefParse(def, ctxt) < 0) if (virDomainFeaturesKVMDefParse(def, nodes[i]) < 0)
return -1; return -1;
break; break;