commit 4601f7b04c63072c73870d4f4db2a5c5ad5ad8d2
author Jan Kiszka <jan.kiszka@siemens.com> Tue Mar 15 12:26:19 2011 +0100
committer Marcelo Tosatti <mtosatti@redhat.com> Wed Mar 16 17:11:05 2011 -0300
tree 9a480ad6a1286ca896ec4a9b785418a926ad40fe
parent f2c1cc81c8229e8c1e26aae517d32aa534936a0c

kvm: x86: Do not leave halt if interrupts are disabled

When an external interrupt is pending but IF is cleared, we must not
leave the halt state prematurely.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

target-i386/kvm.c

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index f7995bd..3a07fce 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1590,7 +1590,9 @@
         return 0;
     }
 
-    if (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
+    if (((env->interrupt_request & CPU_INTERRUPT_HARD) &&
+         (env->eflags & IF_MASK)) ||
+        (env->interrupt_request & CPU_INTERRUPT_NMI)) {
         env->halted = 0;
     }
     if (env->interrupt_request & CPU_INTERRUPT_INIT) {