qemu: Drop qemuFeatureNoEffect

We already have virQEMUCapsCPUFilterFeatures for filtering features
which QEMU does not know about. Let's move osxsave and ospke from
qemuFeatureNoEffect there.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d0fdd1da9fd8edc127263abd52b0bfac5caae1e0..5f989a2613cc0b9d7676784912972b276d0f91b4 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2823,6 +2823,11 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCapsPtr qemuCaps,
 }
 
 
+/*
+ * Filter for features which should never be passed to QEMU. Either because
+ * QEMU never supported them or they were dropped as they never did anything
+ * useful.
+ */
 bool
 virQEMUCapsCPUFilterFeatures(const char *name,
                              void *opaque)
@@ -2834,7 +2839,9 @@ virQEMUCapsCPUFilterFeatures(const char *name,
 
     if (STREQ(name, "cmt") ||
         STREQ(name, "mbm_total") ||
-        STREQ(name, "mbm_local"))
+        STREQ(name, "mbm_local") ||
+        STREQ(name, "osxsave") ||
+        STREQ(name, "ospke"))
         return false;
 
     return true;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 59dc13478508bdd44c4949e714489760c6072101..6cc165a11848df053e28c66892a14fdf8f793f27 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7038,27 +7038,6 @@ qemuBuildGlobalControllerCommandLine(virCommandPtr cmd,
     return 0;
 }
 
-/**
- * qemuFeatureNoEffect:
- * @feature: CPU Feature
- *
- * Returns true, if the feature is known to have (never had) an effect on QEMU.
- * Those features might be dropped in qemu without a longer deprecation cycle
- * and must therefore be known e.g. to no more define them on command line.
- */
-static bool
-qemuFeatureNoEffect(virCPUFeatureDefPtr feature)
-{
-    if (!feature->name)
-        return false;
-
-    if (STREQ(feature->name, "osxsave"))
-        return true;
-    if (STREQ(feature->name, "ospke"))
-        return true;
-
-    return false;
-}
 
 static int
 qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
@@ -7127,7 +7106,8 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
         virBufferAsprintf(buf, ",vendor=%s", cpu->vendor_id);
 
     for (i = 0; i < cpu->nfeatures; i++) {
-        if (qemuFeatureNoEffect(&(cpu->features[i])))
+        if (!virQEMUCapsCPUFilterFeatures(cpu->features[i].name,
+                                          (virArch *)&def->os.arch))
             continue;
         switch ((virCPUFeaturePolicy) cpu->features[i].policy) {
         case VIR_CPU_FEATURE_FORCE: