diff options
| author | Gleb Natapov <gleb@redhat.com> | 2012-10-14 13:08:58 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-10-22 18:03:27 +0200 |
| commit | 7f46ddbd487e0d0528d89534fdfb31d885977804 (patch) | |
| tree | 7e0cedcd3842dda874380631e4824fbc0e2f6839 /arch/x86/kvm | |
| parent | f3ac1a4b667eeffcedf779f45529c95d66ddc71a (diff) | |
| download | linux-3.10-7f46ddbd487e0d0528d89534fdfb31d885977804.tar.gz linux-3.10-7f46ddbd487e0d0528d89534fdfb31d885977804.tar.bz2 linux-3.10-7f46ddbd487e0d0528d89534fdfb31d885977804.zip | |
KVM: apic: fix LDR calculation in x2apic mode
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>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index c6e6b721b6e..43e9fadca5d 100644 --- 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 & |