ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-i386: Move setting defaults out of cpu_x86_parse_featurestr() 

No functional change, needed for simplifying conversion to properties.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2013-01-11 03:10:15 +01:00 committed by Andreas Färber
parent 07ca59450c
commit 077c68c328
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-i386/cpu.c
View File

@ -1343,15 +1343,11 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features)
unsigned int i; unsigned int i;
char *featurestr; /* Single 'key=value" string being parsed */ char *featurestr; /* Single 'key=value" string being parsed */
/* Features to be added */ /* Features to be added */
FeatureWordArray plus_features = { FeatureWordArray plus_features = { 0 };
[FEAT_KVM] = kvm_default_features,
};
/* Features to be removed */ /* Features to be removed */
FeatureWordArray minus_features = { 0 }; FeatureWordArray minus_features = { 0 };
uint32_t numvalue; uint32_t numvalue;
add_flagname_to_bitmaps("hypervisor", plus_features);
featurestr = features ? strtok(features, ",") : NULL; featurestr = features ? strtok(features, ",") : NULL;
while (featurestr) { while (featurestr) {
@ -1607,6 +1603,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
goto error; goto error;
} }
def->kvm_features |= kvm_default_features;
def->ext_features |= CPUID_EXT_HYPERVISOR;
if (cpu_x86_parse_featurestr(def, features) < 0) { if (cpu_x86_parse_featurestr(def, features) < 0) {
goto error; goto error;
} }