Commit 077c68c3 authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

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



No functional change, needed for simplifying conversion to properties.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 07ca5945

target-i386/cpu.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

    }