Re: [Qemu-devel] Reset I32_APIC_BASE on system RESET

[Aurelien Jarno]

On Wed, Aug 27, 2008 at 04:44:48PM +0300, Gleb Natapov wrote:
> 
> Should be done according to spec.
> 
> Signed-off-by: Gleb Natapov <address@hidden>

Applied, thanks.

> diff --git a/hw/apic.c b/hw/apic.c
> index 43d748c..64e75ad 100644
> --- a/hw/apic.c
> +++ b/hw/apic.c
> @@ -869,6 +869,10 @@ static int apic_load(QEMUFile *f, void *opaque, int 
> version_id)
>  static void apic_reset(void *opaque)
>  {
>      APICState *s = opaque;
> +
> +    s->apicbase = 0xfee00000 |
> +        (s->id ? 0 : MSR_IA32_APICBASE_BSP) | MSR_IA32_APICBASE_ENABLE;
> +
>      apic_init_ipi(s);
>  
>      if (s->id == 0) {
> @@ -906,8 +910,6 @@ int apic_init(CPUState *env)
>      s->id = last_apic_id++;
>      env->cpuid_apic_id = s->id;
>      s->cpu_env = env;
> -    s->apicbase = 0xfee00000 |
> -        (s->id ? 0 : MSR_IA32_APICBASE_BSP) | MSR_IA32_APICBASE_ENABLE;
>  
>      apic_reset(s);
>  
> --
>                       Gleb.
> 
> 
> 

-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   address@hidden         | address@hidden
   `-    people.debian.org/~aurel32 | www.aurel32.net