[Qemu-devel] [qom-cpu PATCH v3 1/2] target-i386: Use x86_cpu_get_supported_feature_word() for "-cpu host"

[Eduardo Habkost]

This will make "-cpu host" to reuse the feature filtering logic used by
x86_cpu_filter_features() (i.e. TCG support, and the new "migratable"
flag).

This doesn't add "-cpu host" support to TCG mode yet, but that may be
possible eventually.

Signed-off-by: Eduardo Habkost <address@hidden>
---
 target-i386/cpu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index d401a7c..5db0338 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1276,6 +1276,9 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void 
*data)
     dc->props = host_x86_cpu_properties;
 }
 
+static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w,
+                                                   bool migratable_only);
+
 static void host_x86_cpu_initfn(Object *obj)
 {
     X86CPU *cpu = X86_CPU(obj);
@@ -1290,10 +1293,8 @@ static void host_x86_cpu_initfn(Object *obj)
     env->cpuid_xlevel2 = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX);
 
     for (w = 0; w < FEATURE_WORDS; w++) {
-        FeatureWordInfo *wi = &feature_word_info[w];
         env->features[w] =
-            kvm_arch_get_supported_cpuid(s, wi->cpuid_eax, wi->cpuid_ecx,
-                                         wi->cpuid_reg);
+            x86_cpu_get_supported_feature_word(w, cpu->migratable);
     }
     object_property_set_bool(OBJECT(cpu), true, "pmu", &error_abort);
 }
-- 
1.9.3