diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-08-09 16:50:37 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-08-09 16:50:37 +0100 |
| commit | 4f874dc24ffe0b2c49d3eb89c7abc453eccde007 (patch) | |
| tree | 49c3884c251a745701239f88dfe36a5ec804f513 | |
| parent | fb3f71889cc3636327edfd396f46f63bd58ed3be (diff) | |
| download | xen-4f874dc24ffe0b2c49d3eb89c7abc453eccde007.tar.gz xen-4f874dc24ffe0b2c49d3eb89c7abc453eccde007.tar.bz2 xen-4f874dc24ffe0b2c49d3eb89c7abc453eccde007.zip | |
x86: Fix NMI injection to PV guests
Signed-off-by: Juergen Gross <juergen.gross@ts.fujitsu.com>
xen-unstable changeset: 21926:6f07d9ac1e7c
xen-unstable date: Thu Aug 05 14:41:14 2010 +0100
| -rw-r--r-- | xen/arch/x86/x86_32/entry.S | 2 | ||||
| -rw-r--r-- | xen/arch/x86/x86_64/compat/entry.S | 2 | ||||
| -rw-r--r-- | xen/arch/x86/x86_64/entry.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index 85d527b6e9..5ea96a58f7 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -275,7 +275,7 @@ process_mce: ALIGN /* %ebx: struct vcpu */ process_nmi: - cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%ebx) + testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%ebx) jnz test_guest_events sti movb $0,VCPU_nmi_pending(%ebx) diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 597683ccf5..81fbcfe28d 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -148,7 +148,7 @@ compat_process_mce: ALIGN /* %rbx: struct vcpu */ compat_process_nmi: - cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx) + testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx) jnz compat_test_guest_events sti movb $0,VCPU_nmi_pending(%rbx) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 4cb902ec09..0558ba8ede 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -250,7 +250,7 @@ process_mce: ALIGN /* %rbx: struct vcpu */ process_nmi: - cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx) + testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx) jnz test_guest_events sti movb $0,VCPU_nmi_pending(%rbx) |