[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/13] x86: Account for MCE in cpu_has_work
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 01/13] x86: Account for MCE in cpu_has_work |
Date: |
Tue, 15 Feb 2011 09:23:25 +0100 |
MCEs can be injected asynchronously, so they can also terminate the halt
state.
Signed-off-by: Jan Kiszka <address@hidden>
CC: Huang Ying <address@hidden>
CC: Hidetoshi Seto <address@hidden>
CC: Jin Dongming <address@hidden>
---
target-i386/exec.h | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/target-i386/exec.h b/target-i386/exec.h
index fc8945b..d050dd0 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -293,15 +293,12 @@ static inline void load_eflags(int eflags, int
update_mask)
static inline int cpu_has_work(CPUState *env)
{
- int work;
-
- work = (env->interrupt_request & CPU_INTERRUPT_HARD) &&
- (env->eflags & IF_MASK);
- work |= env->interrupt_request & CPU_INTERRUPT_NMI;
- work |= env->interrupt_request & CPU_INTERRUPT_INIT;
- work |= env->interrupt_request & CPU_INTERRUPT_SIPI;
-
- return work;
+ return ((env->interrupt_request & CPU_INTERRUPT_HARD) &&
+ (env->eflags & IF_MASK)) ||
+ (env->interrupt_request & (CPU_INTERRUPT_NMI |
+ CPU_INTERRUPT_INIT |
+ CPU_INTERRUPT_SIPI |
+ CPU_INTERRUPT_MCE));
}
static inline int cpu_halted(CPUState *env) {
--
1.7.1
- [Qemu-devel] [PATCH 00/13] [uq/master] Patch queue, part IV (MCE edition), Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 06/13] Synchronize VCPU states before reset, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 10/13] kvm: x86: Clean up kvm_setup_mce, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 01/13] x86: Account for MCE in cpu_has_work,
Jan Kiszka <=
- [Qemu-devel] [PATCH 02/13] x86: Perform implicit mcg_status reset, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 07/13] kvm: x86: Move MCE functions together, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 11/13] kvm: x86: Fail kvm_arch_init_vcpu if MCE initialization fails, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 03/13] x86: Small cleanups of MCE helpers, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 12/13] Add qemu_ram_remap, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 05/13] x86: Optionally avoid injecting AO MCEs while others are pending, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 08/13] kvm: x86: Inject pending MCE events on state writeback, Jan Kiszka, 2011/02/15