Skip to contentSkip to conversation

correct nmi injection to guest

PATCH New Juergen Gross 1 participant 1 message Aug 5, 2010

lore
Share & tools
lore

Juergen Gross

author
#0 lore raw

PATCH 1/1 correct nmi injection to guest

Hi,

attached patch corrects nmi injection to guest. The problem was introduced by the following patch IMHO:

http://lists.xensource.com/archives/html/xen-devel/2009-12/msg00002.html

Juergen

Signature · 5 lines
Juergen Gross                 Principal Developer Operating Systems
TSP ES&S SWE OS6                       Telephone: +49 (0) 89 3222 2967
Fujitsu Technology Solutions              e-mail: [email protected]
Domagkstr. 28                           Internet: ts.fujitsu.com
D-80807 Muenchen                 Company details: ts.fujitsu.com/imprint.html
Signed-off-by [email protected]
xen/arch/x86/x86_32/entry.S +1 -1
diff -r 668f71224241 xen/arch/x86/x86_32/entry.S
@@ -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)
xen/arch/x86/x86_64/compat/entry.S +1 -1
diff -r 668f71224241 xen/arch/x86/x86_64/compat/entry.S
@@ -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)
xen/arch/x86/x86_64/entry.S +1 -1
diff -r 668f71224241 xen/arch/x86/x86_64/entry.S
@@ -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-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel