From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 21 Mar 2023 15:11:43 +0000 (+0100)
Subject: qemuValidateDomainDefPSeriesFeature: Simplify machine validation logic
X-Git-Tag: v9.3.0-rc1~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f13a45d8a919b1e7d05a8e5a4fe616638760158b;p=thirdparty%2Flibvirt.git

qemuValidateDomainDefPSeriesFeature: Simplify machine validation logic

Return early and reformat the error message.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 890f07ed6c..4ecab67ce0 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -41,8 +41,10 @@ qemuValidateDomainDefPSeriesFeature(const virDomainDef *def,
 {
     const char *str;
 
-    if (def->features[feature] != VIR_TRISTATE_SWITCH_ABSENT &&
-        !qemuDomainIsPSeries(def)) {
+    if (def->features[feature] == VIR_TRISTATE_SWITCH_ABSENT)
+        return 0;
+
+    if (!qemuDomainIsPSeries(def)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("The '%1$s' feature is not supported for architecture '%2$s' or machine type '%3$s'"),
                        virDomainFeatureTypeToString(feature),
@@ -51,9 +53,6 @@ qemuValidateDomainDefPSeriesFeature(const virDomainDef *def,
         return -1;
     }
 
-    if (def->features[feature] == VIR_TRISTATE_SWITCH_ABSENT)
-        return 0;
-
     switch (feature) {
     case VIR_DOMAIN_FEATURE_HPT:
         if (def->features[feature] != VIR_TRISTATE_SWITCH_ON)