[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 upstream 11/22] always qemu_cpu_kick after unhalt
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 upstream 11/22] always qemu_cpu_kick after unhalting a cpu |
Date: |
Sat, 26 Feb 2011 16:40:08 +0100 |
This ensures env->halt_cond is broadcast, and the loop in
qemu_tcg_wait_io_event and qemu_kvm_wait_io_event is exited
naturally rather than through a timeout.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ppc.c | 2 ++
hw/sun4m.c | 10 ++++++++--
hw/sun4u.c | 4 ++--
target-s390x/kvm.c | 1 +
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/ppc.c b/hw/ppc.c
index 968aec1..de02d33 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -208,6 +208,7 @@ static void ppc970_set_irq (void *opaque, int pin, int
level)
} else {
LOG_IRQ("%s: restart the CPU\n", __func__);
env->halted = 0;
+ qemu_cpu_kick(env);
}
break;
case PPC970_INPUT_HRESET:
@@ -300,6 +301,7 @@ static void ppc40x_set_irq (void *opaque, int pin, int
level)
} else {
LOG_IRQ("%s: restart the CPU\n", __func__);
env->halted = 0;
+ qemu_cpu_kick(env);
}
break;
case PPC40x_INPUT_DEBUG:
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 30e8a21..df3aa32 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -253,15 +253,21 @@ void cpu_check_irqs(CPUState *env)
}
}
+static void cpu_kick_irq(CPUState *env)
+{
+ env->halted = 0;
+ cpu_check_irqs(env);
+ qemu_cpu_kick(env);
+}
+
static void cpu_set_irq(void *opaque, int irq, int level)
{
CPUState *env = opaque;
if (level) {
trace_sun4m_cpu_set_irq_raise(irq);
- env->halted = 0;
env->pil_in |= 1 << irq;
- cpu_check_irqs(env);
+ cpu_kick_irq(env);
} else {
trace_sun4m_cpu_set_irq_lower(irq);
env->pil_in &= ~(1 << irq);
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 90b1ce2..d282324 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -298,6 +298,7 @@ static void cpu_kick_irq(CPUState *env)
{
env->halted = 0;
cpu_check_irqs(env);
+ qemu_cpu_kick(env);
}
static void cpu_set_irq(void *opaque, int irq, int level)
@@ -306,9 +307,8 @@ static void cpu_set_irq(void *opaque, int irq, int level)
if (level) {
CPUIRQ_DPRINTF("Raise CPU IRQ %d\n", irq);
- env->halted = 0;
env->pil_in |= 1 << irq;
- cpu_check_irqs(env);
+ cpu_kick_irq(env);
} else {
CPUIRQ_DPRINTF("Lower CPU IRQ %d\n", irq);
env->pil_in &= ~(1 << irq);
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index b349812..6e94274 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -194,6 +194,7 @@ static void kvm_s390_interrupt_internal(CPUState *env, int
type, uint32_t parm,
env->halted = 0;
env->exception_index = -1;
+ qemu_cpu_kick(env);
kvmint.type = type;
kvmint.parm = parm;
--
1.7.4
- [Qemu-devel] [PATCH v2 upstream 05/22] add win32 qemu-thread implementation, (continued)
- [Qemu-devel] [PATCH v2 upstream 05/22] add win32 qemu-thread implementation, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 06/22] include qemu-thread.h early, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 07/22] add assertions on the owner of a QemuMutex, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 08/22] remove CONFIG_THREAD, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 09/22] target-sh4: move intr_at_halt out of cpu_halted(), Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 10/22] inline cpu_halted into sole caller, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 11/22] always qemu_cpu_kick after unhalting a cpu,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 upstream 12/22] exit round-robin vcpu loop if cpu->stopped is true, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 13/22] always signal pause_cond after stopping a VCPU, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 14/22] do not use timedwait on qemu_halt_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 16/22] do not use timedwait on qemu_pause_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 15/22] do not use timedwait on qemu_system_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 17/22] do not use timedwait on qemu_cpu_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 19/22] move blocking of signals to qemu_signalfd_init, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 18/22] iothread stops the vcpu thread via IPI, Paolo Bonzini, 2011/02/26