[Xen-changelog] [xen-unstable] x86: Fix NMI injection to PV guests

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1281015674 -3600
# Node ID 6f07d9ac1e7cd145fb2770bb11655ac1161b58da
# Parent  8992134dcfd0b9e1e86f4111e68a8aa48bd33c3c
x86: Fix NMI injection to PV guests

Signed-off-by: Juergen Gross <juergen.gross@xxxxxxxxxxxxxx>
---
 xen/arch/x86/x86_32/entry.S        |    2 +-
 xen/arch/x86/x86_64/compat/entry.S |    2 +-
 xen/arch/x86/x86_64/entry.S        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r 8992134dcfd0 -r 6f07d9ac1e7c xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S       Wed Aug 04 19:24:17 2010 +0100
+++ b/xen/arch/x86/x86_32/entry.S       Thu Aug 05 14:41:14 2010 +0100
@@ -264,7 +264,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 -r 8992134dcfd0 -r 6f07d9ac1e7c xen/arch/x86/x86_64/compat/entry.S
--- a/xen/arch/x86/x86_64/compat/entry.S        Wed Aug 04 19:24:17 2010 +0100
+++ b/xen/arch/x86/x86_64/compat/entry.S        Thu Aug 05 14:41:14 2010 +0100
@@ -137,7 +137,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 -r 8992134dcfd0 -r 6f07d9ac1e7c xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S       Wed Aug 04 19:24:17 2010 +0100
+++ b/xen/arch/x86/x86_64/entry.S       Thu Aug 05 14:41:14 2010 +0100
@@ -239,7 +239,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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog