The QEMU interface is still in a state of flux, and KVM support
has been pulled shortly after having been merged. Let's not
commit to a stable interface in libvirt just yet.

Reverts: c6c9b5d251de215ed378aa0bc31daa2e1170409e
Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
---
 src/qemu/qemu_validate.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index da76556854..99c7775e9b 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -124,23 +124,14 @@ qemuValidateDomainDefFeatures(const virDomainDef *def,
 
         case VIR_DOMAIN_FEATURE_GIC:
         case VIR_DOMAIN_FEATURE_MTE:
-            if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT) {
-                if (!qemuDomainIsARMVirt(def)) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                   _("The '%1$s' feature is not supported for 
architecture '%2$s' or machine type '%3$s'"),
-                                   featureName,
-                                   virArchToString(def->os.arch),
-                                   def->os.machine);
-                    return -1;
-                }
-
-                if (i == VIR_DOMAIN_FEATURE_MTE &&
-                    !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_VIRT_MTE)) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                   _("The '%1$s' feature is not supported with 
this QEMU binary"),
-                                   featureName);
-                    return -1;
-                }
+            if (def->features[i] == VIR_TRISTATE_SWITCH_ON &&
+                !qemuDomainIsARMVirt(def)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("The '%1$s' feature is not supported for 
architecture '%2$s' or machine type '%3$s'"),
+                               featureName,
+                               virArchToString(def->os.arch),
+                               def->os.machine);
+                return -1;
             }
             break;
 
-- 
2.40.1

Reply via email to