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

target-i386: Postpone cpuid_level update to realize time 



Delay capping cpuid_level to 7 to realize time so property setters
for cpuid_7_0_ebx_features and "level" could be used in any order/time
between x86_cpu_initfn() and x86_cpu_realize().

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

target-i386/cpu.c

+5 −3
Original line number Diff line number Diff line
@@ -1381,9 +1381,6 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features) 
        if (kvm_check_features_against_host(x86_cpu_def) && enforce_cpuid)

            goto error;

    }

    if (x86_cpu_def->cpuid_7_0_ebx_features && x86_cpu_def->level < 7) {

        x86_cpu_def->level = 7;

    }

    return 0;



error:
@@ -2074,6 +2071,11 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) 
void x86_cpu_realize(Object *obj, Error **errp)

{

    X86CPU *cpu = X86_CPU(obj);

    CPUX86State *env = &cpu->env;



    if (env->cpuid_7_0_ebx_features && env->cpuid_level < 7) {

        env->cpuid_level = 7;

    }



#ifndef CONFIG_USER_ONLY

    qemu_register_reset(x86_cpu_machine_reset_cb, cpu);