Extract the firmware features without autoselect check from virDomainDefOSValidate() into a new helper function. No functional change; preparatory for s390x-specific validation in a follow-up. Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> --- src/conf/domain_validate.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 15e3bb29e6..bdd44e42b3 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1726,6 +1726,20 @@ virDomainDefMemtuneValidate(const virDomainDef *def) } +static int +virDomainDefOSValidateFirmwareFeaturesNoAutoselect(const virDomainDef *def) +{ + int *f = def->os.firmwareFeatures; + + if (!f) + return 0; + + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("cannot use feature-based firmware autoselection when firmware autoselection is disabled")); + return -1; +} + + int virDomainDefOSValidate(const virDomainDef *def, virDomainXMLOption *xmlopt) @@ -1751,9 +1765,7 @@ virDomainDefOSValidate(const virDomainDef *def, return -1; } } else { - if (firmwareFeatures) { - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("cannot use feature-based firmware autoselection when firmware autoselection is disabled")); + if (virDomainDefOSValidateFirmwareFeaturesNoAutoselect(def) < 0) { return -1; } -- 2.56.0