[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/35] kvm: x86: Do not leave halt if interrupts are
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 23/35] kvm: x86: Do not leave halt if interrupts are disabled |
Date: |
Tue, 15 Mar 2011 18:50:37 -0300 |
From: Jan Kiszka <address@hidden>
When an external interrupt is pending but IF is cleared, we must not
leave the halt state prematurely.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
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 @@ int kvm_arch_process_async_events(CPUState *env)
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) {
--
1.7.4
- [Qemu-devel] [PATCH 00/35] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 23/35] kvm: x86: Do not leave halt if interrupts are disabled,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 20/35] s390: Detect invalid invocations of qemu_ram_free/remap, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 18/35] Implement qemu_kvm_eat_signals only for CONFIG_LINUX, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 02/35] kvm: Fix build warning when KVM_CAP_SET_GUEST_DEBUG is lacking, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 04/35] x86: Perform implicit mcg_status reset, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 12/35] x86: Run qemu_inject_x86_mce on target VCPU, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 14/35] kvm: x86: Clean up kvm_setup_mce, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 08/35] Synchronize VCPU states before reset, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 07/35] x86: Optionally avoid injecting AO MCEs while others are pending, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 22/35] kvm: Add in-kernel irqchip awareness to cpu_thread_is_idle, Marcelo Tosatti, 2011/03/15
- [Qemu-devel] [PATCH 03/35] x86: Account for MCE in cpu_has_work, Marcelo Tosatti, 2011/03/15