[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v6 01/32] i386: partial revert of interrupt poll
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v6 01/32] i386: partial revert of interrupt poll fix |
Date: |
Mon, 08 Dec 2014 10:53:06 +0300 |
User-agent: |
StGit/0.16 |
Processing CPU_INTERRUPT_POLL requests in cpu_has_work functions
break the determinism of cpu_exec. This patch is required to make
interrupts processing deterministic.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
cpu-exec.c | 6 ++++++
target-i386/cpu.c | 10 ++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index 3913de0..c976095 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -331,6 +331,12 @@ int cpu_exec(CPUArchState *env)
volatile bool have_tb_lock = false;
if (cpu->halted) {
+#ifdef TARGET_I386
+ if (cpu->interrupt_request & CPU_INTERRUPT_POLL) {
+ apic_poll_irq(x86_cpu->apic_state);
+ cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
+ }
+#endif
if (!cpu_has_work(cpu)) {
return EXCP_HALTED;
}
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index e9df33e..3f13dfe 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2912,14 +2912,8 @@ static bool x86_cpu_has_work(CPUState *cs)
X86CPU *cpu = X86_CPU(cs);
CPUX86State *env = &cpu->env;
-#if !defined(CONFIG_USER_ONLY)
- if (cs->interrupt_request & CPU_INTERRUPT_POLL) {
- apic_poll_irq(cpu->apic_state);
- cpu_reset_interrupt(cs, CPU_INTERRUPT_POLL);
- }
-#endif
-
- return ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
+ return ((cs->interrupt_request & (CPU_INTERRUPT_HARD |
+ CPU_INTERRUPT_POLL)) &&
(env->eflags & IF_MASK)) ||
(cs->interrupt_request & (CPU_INTERRUPT_NMI |
CPU_INTERRUPT_INIT |
- [Qemu-devel] [RFC PATCH v6 00/32] Deterministic replay core, Pavel Dovgalyuk, 2014/12/08
- [Qemu-devel] [RFC PATCH v6 01/32] i386: partial revert of interrupt poll fix,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v6 02/32] cpu-exec: fix cpu_exec_nocache, Pavel Dovgalyuk, 2014/12/08
- [Qemu-devel] [RFC PATCH v6 03/32] icount: set can_do_io outside TB execution, Pavel Dovgalyuk, 2014/12/08
- [Qemu-devel] [RFC PATCH v6 04/32] replay: global variables and function stubs, Pavel Dovgalyuk, 2014/12/08
- [Qemu-devel] [RFC PATCH v6 05/32] sysemu: system functions for replay, Pavel Dovgalyuk, 2014/12/08
- [Qemu-devel] [RFC PATCH v6 06/32] replay: internal functions for replay log, Pavel Dovgalyuk, 2014/12/08
- [Qemu-devel] [RFC PATCH v6 07/32] cpu-exec: reset exception_index correctly, Pavel Dovgalyuk, 2014/12/08
- [Qemu-devel] [RFC PATCH v6 08/32] icount: implement icount requesting, Pavel Dovgalyuk, 2014/12/08