Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

* 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (70 commits)
  KVM: Adjust smp_call_function_mask() callers to new requirements
  KVM: MMU: Fix potential race setting upper shadow ptes on nonpae hosts
  KVM: x86 emulator: emulate clflush
  KVM: MMU: improve invalid shadow root page handling
  KVM: MMU: nuke shadowed pgtable pages and ptes on memslot destruction
  KVM: Prefix some x86 low level function with kvm_, to avoid namespace issues
  KVM: check injected pic irq within valid pic irqs
  KVM: x86 emulator: Fix HLT instruction
  KVM: Apply the kernel sigmask to vcpus blocked due to being uninitialized
  KVM: VMX: Add ept_sync_context in flush_tlb
  KVM: mmu_shrink: kvm_mmu_zap_page requires slots_lock to be held
  x86: KVM guest: make kvm_smp_prepare_boot_cpu() static
  KVM: SVM: fix suspend/resume support
  KVM: s390: rename private structures
  KVM: s390: Set guest storage limit and offset to sane values
  KVM: Fix memory leak on guest exit
  KVM: s390: dont allocate dirty bitmap
  KVM: move slots_lock acquision down to vapic_exit
  KVM: VMX: Fake emulate Intel perfctr MSRs
  KVM: VMX: Fix a wrong usage of vmcs_config
  ...

1 files changed, 10 insertions, 4 deletions

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index ebc03f5ae162..73f43de69f67 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -356,8 +356,9 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
         case APIC_DM_SMI:
                 printk(KERN_DEBUG "Ignoring guest SMI\n");
                 break;
+
         case APIC_DM_NMI:
-                printk(KERN_DEBUG "Ignoring guest NMI\n");
+                kvm_inject_nmi(vcpu);
                 break;
 
         case APIC_DM_INIT:
@@ -572,6 +573,8 @@ static u32 __apic_read(struct kvm_lapic *apic, unsigned int offset)
 {
         u32 val = 0;
 
+        KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler);
+
         if (offset >= LAPIC_MMIO_LENGTH)
                 return 0;
 
@@ -695,6 +698,8 @@ static void apic_mmio_write(struct kvm_io_device *this,
 
         offset &= 0xff0;
 
+        KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler);
+
         switch (offset) {
         case APIC_ID:           /* Local APIC ID */
                 apic_set_reg(apic, APIC_ID, val);
@@ -780,7 +785,8 @@ static void apic_mmio_write(struct kvm_io_device *this,
 
 }
 
-static int apic_mmio_range(struct kvm_io_device *this, gpa_t addr)
+static int apic_mmio_range(struct kvm_io_device *this, gpa_t addr,
+                           int len, int size)
 {
         struct kvm_lapic *apic = (struct kvm_lapic *)this->private;
         int ret = 0;
@@ -939,8 +945,8 @@ static int __apic_timer_fn(struct kvm_lapic *apic)
         int result = 0;
         wait_queue_head_t *q = &apic->vcpu->wq;
 
-        atomic_inc(&apic->timer.pending);
-        set_bit(KVM_REQ_PENDING_TIMER, &apic->vcpu->requests);
+        if(!atomic_inc_and_test(&apic->timer.pending))
+                set_bit(KVM_REQ_PENDING_TIMER, &apic->vcpu->requests);
         if (waitqueue_active(q)) {
                 apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
                 wake_up_interruptible(q);