From 077c68c32897ea02b88c9a919627d93d3878ef15 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Fri, 11 Jan 2013 03:10:15 +0100 Subject: [PATCH] target-i386: Move setting defaults out of cpu_x86_parse_featurestr() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit No functional change, needed for simplifying conversion to properties. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Signed-off-by: Andreas Färber --- target-i386/cpu.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9a48e3f00..e75b293f0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1343,15 +1343,11 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features) unsigned int i; char *featurestr; /* Single 'key=value" string being parsed */ /* Features to be added */ - FeatureWordArray plus_features = { - [FEAT_KVM] = kvm_default_features, - }; + FeatureWordArray plus_features = { 0 }; /* Features to be removed */ FeatureWordArray minus_features = { 0 }; uint32_t numvalue; - add_flagname_to_bitmaps("hypervisor", plus_features); - featurestr = features ? strtok(features, ",") : NULL; while (featurestr) { @@ -1607,6 +1603,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) goto error; } + def->kvm_features |= kvm_default_features; + def->ext_features |= CPUID_EXT_HYPERVISOR; + if (cpu_x86_parse_featurestr(def, features) < 0) { goto error; } -- 2.39.5