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

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

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

Signed-off-by: Juergen Gross <juergen.gross@xxxxxxxxxxxxxx>
xen-unstable changeset:   21926:6f07d9ac1e7c
xen-unstable date:        Thu Aug 05 14:41:14 2010 +0100
---
 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 ef5f25de00da -r 6cd35103cadb xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S       Mon Aug 02 17:19:06 2010 +0100
+++ b/xen/arch/x86/x86_32/entry.S       Mon Aug 09 16:50:37 2010 +0100
@@ -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 -r ef5f25de00da -r 6cd35103cadb xen/arch/x86/x86_64/compat/entry.S
--- a/xen/arch/x86/x86_64/compat/entry.S        Mon Aug 02 17:19:06 2010 +0100
+++ b/xen/arch/x86/x86_64/compat/entry.S        Mon Aug 09 16:50:37 2010 +0100
@@ -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 -r ef5f25de00da -r 6cd35103cadb xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S       Mon Aug 02 17:19:06 2010 +0100
+++ b/xen/arch/x86/x86_64/entry.S       Mon Aug 09 16:50:37 2010 +0100
@@ -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)

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