From 3e09f0c5b81e66990e390a8f7900af82cdb9b56f Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Sun, 5 Aug 2012 15:58:28 +0300 Subject: [PATCH] --- yaml --- r: 329846 b: refs/heads/master c: 6aed64a8a440360be875f31eabeacaddb83ef25f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/lapic.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 50f3aee8a6e7..c7dea45bd250 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dbc8f3fed0b4cb04dfb276150294f21c5f0fc66 +refs/heads/master: 6aed64a8a440360be875f31eabeacaddb83ef25f diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c index 49f4ac047f60..c3f14fe51e9b 100644 --- a/trunk/arch/x86/kvm/lapic.c +++ b/trunk/arch/x86/kvm/lapic.c @@ -1311,7 +1311,8 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) HRTIMER_MODE_ABS); apic->lapic_timer.timer.function = apic_timer_fn; - kvm_lapic_set_base(vcpu, APIC_DEFAULT_PHYS_BASE); + kvm_lapic_set_base(vcpu, + APIC_DEFAULT_PHYS_BASE | MSR_IA32_APICBASE_ENABLE); kvm_lapic_reset(vcpu); kvm_iodevice_init(&apic->dev, &apic_mmio_ops);