Re: [patch 4/4] QEMU/KVM: dont read any bits from userspace APIC emulation if its done in-kernel

[Avi Kivity <avi@qumranet.com>]

Marcelo Tosatti wrote:
> Fixes loadvm/savem on SMP.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>
> Index: kvm-userspace.io/qemu/hw/apic.c
> ===================================================================
> --- kvm-userspace.io.orig/qemu/hw/apic.c
> +++ kvm-userspace.io/qemu/hw/apic.c
> @@ -248,8 +248,11 @@ void cpu_set_apic_base(CPUState *env, ui
>  #ifdef DEBUG_APIC
>      printf("cpu_set_apic_base: %016" PRIx64 "\n", val);
>  #endif
> -    s->apicbase = (val & 0xfffff000) |
> -        (s->apicbase & (MSR_IA32_APICBASE_BSP | MSR_IA32_APICBASE_ENABLE));
> +    if (kvm_enabled() && qemu_kvm_irqchip_in_kernel())
> +        s->apicbase = val;
> +    else
> +        s->apicbase = (val & 0xfffff000) |
> +            (s->apicbase & (MSR_IA32_APICBASE_BSP | MSR_IA32_APICBASE_ENABLE));
>      /* if disabled, cannot be enabled again */
>      if (!(val & MSR_IA32_APICBASE_ENABLE)) {
>          s->apicbase &= ~MSR_IA32_APICBASE_ENABLE;
>
>   

Can you explain how the existing code fails?

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone