debuggers.hg

changeset 21972:6f07d9ac1e7c

x86: Fix NMI injection to PV guests

Signed-off-by: Juergen Gross <juergen.gross@ts.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Aug 05 14:41:14 2010 +0100 (2010-08-05)
parents 8992134dcfd0
children a904221a56c2
files xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_64/compat/entry.S xen/arch/x86/x86_64/entry.S
line diff
     1.1 --- a/xen/arch/x86/x86_32/entry.S	Wed Aug 04 19:24:17 2010 +0100
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Thu Aug 05 14:41:14 2010 +0100
     1.3 @@ -264,7 +264,7 @@ process_mce:
     1.4          ALIGN
     1.5  /* %ebx: struct vcpu */
     1.6  process_nmi:
     1.7 -        cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%ebx)
     1.8 +        testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%ebx)
     1.9          jnz  test_guest_events
    1.10          sti
    1.11          movb $0,VCPU_nmi_pending(%ebx)
     2.1 --- a/xen/arch/x86/x86_64/compat/entry.S	Wed Aug 04 19:24:17 2010 +0100
     2.2 +++ b/xen/arch/x86/x86_64/compat/entry.S	Thu Aug 05 14:41:14 2010 +0100
     2.3 @@ -137,7 +137,7 @@ compat_process_mce:
     2.4  	ALIGN
     2.5  /* %rbx: struct vcpu */
     2.6  compat_process_nmi:
     2.7 -        cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx)
     2.8 +        testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx)
     2.9          jnz  compat_test_guest_events
    2.10          sti
    2.11          movb  $0,VCPU_nmi_pending(%rbx)
     3.1 --- a/xen/arch/x86/x86_64/entry.S	Wed Aug 04 19:24:17 2010 +0100
     3.2 +++ b/xen/arch/x86/x86_64/entry.S	Thu Aug 05 14:41:14 2010 +0100
     3.3 @@ -239,7 +239,7 @@ process_mce:
     3.4          ALIGN
     3.5  /* %rbx: struct vcpu */
     3.6  process_nmi:
     3.7 -        cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx)
     3.8 +        testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx)
     3.9          jnz  test_guest_events
    3.10          sti
    3.11          movb $0,VCPU_nmi_pending(%rbx)