KVM: apic: fix LDR calculation in x2apic mode

Gleb Natapov · avikivity · commit 7f46ddbd487e · 2012-10-22T18:03:27.000+02:00
Signed-off-by: Gleb Natapov &lt;gleb@redhat.com&gt;
Reviewed-by: Chegu Vinod  &lt;chegu_vinod@hp.com&gt;
Tested-by: Chegu Vinod &lt;chegu_vinod@hp.com&gt;
Signed-off-by: Avi Kivity &lt;avi@redhat.com&gt;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
@@ -1311,7 +1311,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
 	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));
 		kvm_apic_set_ldr(apic, ldr);
 	}
 	apic->base_address = apic->vcpu->arch.apic_base &

Original file line number	Diff line number	Diff line change
`@@ -1311,7 +1311,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)`
`1311`	`1311`	`vcpu->arch.apic_base = value;`
`1312`	`1312`	`if (apic_x2apic_mode(apic)) {`
`1313`	`1313`	`u32 id = kvm_apic_id(apic);`
`1314`		`- u32 ldr = ((id & ~0xf) << 16) \| (1 << (id & 0xf));`
	`1314`	`+ u32 ldr = ((id >> 4) << 16) \| (1 << (id & 0xf));`
`1315`	`1315`	`kvm_apic_set_ldr(apic, ldr);`
`1316`	`1316`	`}`
`1317`	`1317`	`apic->base_address = apic->vcpu->arch.apic_base &`