3.2.100-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Gleb Natapov gleb@redhat.com
commit 7f46ddbd487e0d0528d89534fdfb31d885977804 upstream.
Signed-off-by: Gleb Natapov gleb@redhat.com Reviewed-by: Chegu Vinod chegu_vinod@hp.com Tested-by: Chegu Vinod chegu_vinod@hp.com Signed-off-by: Avi Kivity avi@redhat.com [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- arch/x86/kvm/lapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1022,7 +1022,7 @@ void kvm_lapic_set_base(struct kvm_vcpu vcpu->arch.apic_base = value; if (apic_x2apic_mode(apic)) { u32 id = kvm_apic_id(apic); - u32 ldr = ((id & ~0xf) << 16) | (1 << (id & 0xf)); + u32 ldr = ((id >> 4) << 16) | (1 << (id & 0xf)); apic_set_reg(apic, APIC_LDR, ldr); } apic->base_address = apic->vcpu->arch.apic_base &