diff options
| author | Zhang, Yanmin <yanmin_zhang@linux.intel.com> | 2010-04-19 13:32:45 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-04-19 12:36:50 +0300 |
| commit | ff9d07a0e7ce756a183e7c2e483aec452ee6b574 (patch) | |
| tree | c355079734dc14700228f78fdd8ad824c0f80db0 /arch/x86/kvm/vmx.c | |
| parent | 39447b386c846bbf1c56f6403c5282837486200f (diff) | |
KVM: Implement perf callbacks for guest sampling
Below patch implements the perf_guest_info_callbacks on kvm.
Signed-off-by: Zhang Yanmin <yanmin_zhang@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 686492ed307..82be6dac3d2 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3654,8 +3654,11 @@ static void vmx_complete_interrupts(struct vcpu_vmx *vmx) /* We need to handle NMIs before interrupts are enabled */ if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR && - (exit_intr_info & INTR_INFO_VALID_MASK)) + (exit_intr_info & INTR_INFO_VALID_MASK)) { + kvm_before_handle_nmi(&vmx->vcpu); asm("int $2"); + kvm_after_handle_nmi(&vmx->vcpu); + } idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK; |