Re: [Qemu-devel] [PATCH] target-i386: Postpone cpuid_level update to realize time

[Andreas Färber]

Am 07.12.2012 19:00, schrieb Eduardo Habkost:
> From: Igor Mammedov <address@hidden>
> 
> 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: Igor Mammedov <address@hidden>
> Reviewed-by: Eduardo Habkost <address@hidden>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
> The patch in the pull request sent by Andreas is not the right one (a
> patch chunk is missing). I'm resending the correct patch.

Igor's patch didn't apply cleanly despite --3way, seems one hunk got
lost. Sorry!

> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index a631ae9..7be3ad8 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
[...]
> @@ -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);

I manually patch'ed in this missing hunk and made you a Signed-off-by.
Pull was updated with new commit hash and stats already.

Thanks,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg