diff options
author | Avi Kivity <avi@qumranet.com> | 2008-07-02 02:28:55 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-10-15 04:15:13 -0400 |
commit | 668f612fa0d8d4120ec5dc0725d7e1ca3152a954 (patch) | |
tree | b1daa43b36d544abe32f0bb787fc459c85a6f766 /include/asm-x86 | |
parent | cf393f75661f4b17451377b353833eb5502a9688 (diff) |
KVM: VMX: Move nmi injection failure processing to vm exit path
Instead of processing nmi injection failure in the vm entry path, move
it to the vm exit path (vm_complete_interrupts()). This separates nmi
injection from nmi post-processing, and moves the nmi state from the VT
state into vcpu state (new variable nmi_injected specifying an injection
in progress).
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 4f2bd884fd3a..7cf69fd1dcfe 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h | |||
@@ -300,6 +300,7 @@ struct kvm_vcpu_arch { | |||
300 | struct page *time_page; | 300 | struct page *time_page; |
301 | 301 | ||
302 | bool nmi_pending; | 302 | bool nmi_pending; |
303 | bool nmi_injected; | ||
303 | 304 | ||
304 | u64 mtrr[0x100]; | 305 | u64 mtrr[0x100]; |
305 | }; | 306 | }; |