External/libvirt
1
0
Fork 0
Code

virDomainFeaturesHyperVDefParse: Remove tautological "if"

Browse Source 
Fix some line wrapping in the process.

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:45 +02:00 committed by Michal Privoznik
parent 70a4ac857c
commit 95ef93f2a3
1 changed files with 96 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/conf/domain_conf.c
View File

@ -17292,12 +17292,10 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
{
def->features[VIR_DOMAIN_FEATURE_HYPERV] = VIR_TRISTATE_SWITCH_ON;
if (def->features[VIR_DOMAIN_FEATURE_HYPERV] == VIR_TRISTATE_SWITCH_ON) {
int feature;
virTristateSwitch value;
node = xmlFirstElementChild(node);
while (node != NULL) {
int feature;
virTristateSwitch value;
xmlNodePtr child;
feature = virDomainHypervTypeFromString((const char *)node->name);
@ -17308,8 +17306,8 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
return -1;
}
if (virXMLPropTristateSwitch(node, "state",
VIR_XML_PROP_REQUIRED, &value) < 0)
if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_REQUIRED,
&value) < 0)
return -1;
def->hyperv_features[feature] = value;
@ -17341,8 +17339,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
return -1;
}
if (virXMLPropTristateSwitch(child, "state",
VIR_XML_PROP_REQUIRED,
if (virXMLPropTristateSwitch(child, "state", VIR_XML_PROP_REQUIRED,
&def->hyperv_stimer_direct) < 0)
return -1;
@ -17354,15 +17351,13 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
if (value != VIR_TRISTATE_SWITCH_ON)
break;
if (virXMLPropUInt(node, "retries", 0,
VIR_XML_PROP_REQUIRED,
if (virXMLPropUInt(node, "retries", 0, VIR_XML_PROP_REQUIRED,
&def->hyperv_spinlocks) < 0)
return -1;
if (def->hyperv_spinlocks < 0xFFF) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("HyperV spinlock retry count must be "
"at least 4095"));
_("HyperV spinlock retry count must be at least 4095"));
return -1;
}
break;
@ -17371,18 +17366,15 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
if (value != VIR_TRISTATE_SWITCH_ON)
break;
if (!(def->hyperv_vendor_id = virXMLPropString(node,
"value"))) {
if (!(def->hyperv_vendor_id = virXMLPropString(node, "value"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing 'value' attribute for "
"HyperV feature 'vendor_id'"));
_("missing 'value' attribute for HyperV feature 'vendor_id'"));
return -1;
}
if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VENDOR_ID_MAX) {
virReportError(VIR_ERR_XML_ERROR,
_("HyperV vendor_id value must not be more "
"than %d characters."),
_("HyperV vendor_id value must not be more than %d characters."),
VIR_DOMAIN_HYPERV_VENDOR_ID_MAX);
return -1;
}
@ -17401,7 +17393,6 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
node = xmlNextElementSibling(node);
}
}
return 0;
}