[PATCH v5 3/5] qemu: process: refactor deprecated features code

[Collin Walling]

Group up the deprecated features code into a single block to keep things
clean; only check if the deprecated_features attribute is present
once and then do relevent work.

Signed-off-by: Collin Walling <wall...@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiu...@linux.ibm.com>
---
 src/qemu/qemu_process.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index e6124b670a..7155742d13 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6448,18 +6448,17 @@ qemuProcessUpdateGuestCPU(virDomainDef *def,
                                 &def->os.arch) < 0)
         return -1;
 
-    if (def->cpu->deprecated_feats &&
-        !virQEMUCapsGet(qemuCaps, 
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("toggling deprecated features for CPU model is 
unsupported"));
-        return -1;
-    }
-
     if (def->cpu->deprecated_feats) {
         virCPUFeaturePolicy policy = VIR_CPU_FEATURE_REQUIRE;
         if (def->cpu->deprecated_feats == VIR_TRISTATE_SWITCH_OFF)
             policy = VIR_CPU_FEATURE_DISABLE;
 
+        if (!virQEMUCapsGet(qemuCaps, 
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("toggling deprecated features for CPU model is 
unsupported"));
+            return -1;
+        }
+
         virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType,
                                                def->cpu, policy);
     }
-- 
2.49.0