libvirt/virDomainFeaturesKVMDefParse-Remove-tautological-if.patch

From 73d21e001e964d7d86f4659ef9cdee95a90ec97c Mon Sep 17 00:00:00 2001
From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 22 Jun 2021 14:22:49 +0200
Subject: [PATCH] virDomainFeaturesKVMDefParse: Remove tautological "if"

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Shaokun Wei <weishaokun@kylinos.cn>
---
 src/conf/domain_conf.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index dca49b6a55..e884d94ef7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -20598,28 +20598,26 @@ virDomainFeaturesKVMDefParse(virDomainDef *def,
 {
     def->features[VIR_DOMAIN_FEATURE_KVM] = VIR_TRISTATE_SWITCH_ON;
 
-    if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) {
+    node = xmlFirstElementChild(node);
+    while (node) {
         int feature;
         virTristateSwitch value;
 
-        node = xmlFirstElementChild(node);
-        while (node) {
-            feature = virDomainKVMTypeFromString((const char *)node->name);
-            if (feature < 0) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("unsupported KVM feature: %s"),
-                               node->name);
-                return -1;
-            }
+        feature = virDomainKVMTypeFromString((const char *)node->name);
+        if (feature < 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unsupported KVM feature: %s"),
+                           node->name);
+            return -1;
+        }
 
-            if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_REQUIRED,
-                                         &value) < 0)
-                return -1;
+        if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_REQUIRED,
+                                     &value) < 0)
+            return -1;
 
-            def->kvm_features[feature] = value;
+        def->kvm_features[feature] = value;
 
-            node = xmlNextElementSibling(node);
-        }
+        node = xmlNextElementSibling(node);
     }
 
     return 0;
-- 
2.27.0