NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virDomainFeaturesHyperVDefParse: 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:44 +02:00 committed by Michal Privoznik
parent 7b82efcf46
commit 70a4ac857c
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/conf/domain_conf.c
View File

@ -17288,32 +17288,27 @@ virDomainResourceDefParse(xmlNodePtr node,
static int static int
virDomainFeaturesHyperVDefParse(virDomainDef *def, virDomainFeaturesHyperVDefParse(virDomainDef *def,
xmlXPathContext *ctxt) xmlNodePtr node)
{ {
g_autofree xmlNodePtr *nodes = NULL;
size_t i;
int n;
def->features[VIR_DOMAIN_FEATURE_HYPERV] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_HYPERV] = VIR_TRISTATE_SWITCH_ON;
if (def->features[VIR_DOMAIN_FEATURE_HYPERV] == VIR_TRISTATE_SWITCH_ON) { if (def->features[VIR_DOMAIN_FEATURE_HYPERV] == VIR_TRISTATE_SWITCH_ON) {
int feature; int feature;
virTristateSwitch value; virTristateSwitch value;
if ((n = virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) < 0)
return -1;
for (i = 0; i < n; i++) { node = xmlFirstElementChild(node);
while (node != NULL) {
xmlNodePtr child; xmlNodePtr child;
feature = virDomainHypervTypeFromString((const char *)nodes[i]->name); feature = virDomainHypervTypeFromString((const char *)node->name);
if (feature < 0) { if (feature < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported HyperV Enlightenment feature: %s"), _("unsupported HyperV Enlightenment feature: %s"),
nodes[i]->name); node->name);
return -1; return -1;
} }
if (virXMLPropTristateSwitch(nodes[i], "state", if (virXMLPropTristateSwitch(node, "state",
VIR_XML_PROP_REQUIRED, &value) < 0) VIR_XML_PROP_REQUIRED, &value) < 0)
return -1; return -1;
@ -17337,7 +17332,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
if (value != VIR_TRISTATE_SWITCH_ON) if (value != VIR_TRISTATE_SWITCH_ON)
break; break;
child = xmlFirstElementChild(nodes[i]); child = xmlFirstElementChild(node);
while (child) { while (child) {
if (STRNEQ((const char *)child->name, "direct")) { if (STRNEQ((const char *)child->name, "direct")) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -17359,7 +17354,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
if (value != VIR_TRISTATE_SWITCH_ON) if (value != VIR_TRISTATE_SWITCH_ON)
break; break;
if (virXMLPropUInt(nodes[i], "retries", 0, if (virXMLPropUInt(node, "retries", 0,
VIR_XML_PROP_REQUIRED, VIR_XML_PROP_REQUIRED,
&def->hyperv_spinlocks) < 0) &def->hyperv_spinlocks) < 0)
return -1; return -1;
@ -17376,7 +17371,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
if (value != VIR_TRISTATE_SWITCH_ON) if (value != VIR_TRISTATE_SWITCH_ON)
break; break;
if (!(def->hyperv_vendor_id = virXMLPropString(nodes[i], if (!(def->hyperv_vendor_id = virXMLPropString(node,
"value"))) { "value"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing 'value' attribute for " _("missing 'value' attribute for "
@ -17403,6 +17398,8 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
case VIR_DOMAIN_HYPERV_LAST: case VIR_DOMAIN_HYPERV_LAST:
break; break;
} }
node = xmlNextElementSibling(node);
} }
} }
@ -17454,7 +17451,7 @@ virDomainFeaturesDefParse(virDomainDef *def,
break; break;
case VIR_DOMAIN_FEATURE_HYPERV: case VIR_DOMAIN_FEATURE_HYPERV:
if (virDomainFeaturesHyperVDefParse(def, ctxt) < 0) if (virDomainFeaturesHyperVDefParse(def, nodes[i]) < 0)
return -1; return -1;
break; break;