[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next 17/59] cpu: Move halt_cond to CPUState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next 17/59] cpu: Move halt_cond to CPUState |
Date: |
Wed, 23 May 2012 05:07:40 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
cpu-defs.h | 1 -
cpus.c | 22 ++++++++++++----------
include/qemu/cpu.h | 1 +
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/cpu-defs.h b/cpu-defs.h
index 43af2ba..7c68c39 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -205,7 +205,6 @@ typedef struct CPUWatchpoint {
/* user data */ \
void *opaque; \
\
- struct QemuCond *halt_cond; \
struct qemu_work_item *queued_work_first, *queued_work_last; \
const char *cpu_model_str; \
struct KVMState *kvm_state; \
diff --git a/cpus.c b/cpus.c
index c0f253e..fcc0483 100644
--- a/cpus.c
+++ b/cpus.c
@@ -724,8 +724,10 @@ static void qemu_tcg_wait_io_event(void)
static void qemu_kvm_wait_io_event(CPUArchState *env)
{
+ CPUState *cpu = ENV_GET_CPU(env);
+
while (cpu_thread_is_idle(env)) {
- qemu_cond_wait(env->halt_cond, &qemu_global_mutex);
+ qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex);
}
qemu_kvm_eat_signals(env);
@@ -875,7 +877,7 @@ void qemu_cpu_kick(void *_env)
CPUArchState *env = _env;
CPUState *cpu = ENV_GET_CPU(env);
- qemu_cond_broadcast(env->halt_cond);
+ qemu_cond_broadcast(cpu->halt_cond);
if (!tcg_enabled() && !cpu->thread_kicked) {
qemu_cpu_kick_thread(cpu);
cpu->thread_kicked = true;
@@ -994,9 +996,9 @@ static void qemu_tcg_init_vcpu(void *_env)
/* share a single thread for all cpus with TCG */
if (!tcg_cpu_thread) {
cpu->thread = g_malloc0(sizeof(QemuThread));
- env->halt_cond = g_malloc0(sizeof(QemuCond));
- qemu_cond_init(env->halt_cond);
- tcg_halt_cond = env->halt_cond;
+ cpu->halt_cond = g_malloc0(sizeof(QemuCond));
+ qemu_cond_init(cpu->halt_cond);
+ tcg_halt_cond = cpu->halt_cond;
qemu_thread_create(cpu->thread, qemu_tcg_cpu_thread_fn, env,
QEMU_THREAD_JOINABLE);
#ifdef _WIN32
@@ -1008,7 +1010,7 @@ static void qemu_tcg_init_vcpu(void *_env)
tcg_cpu_thread = cpu->thread;
} else {
cpu->thread = tcg_cpu_thread;
- env->halt_cond = tcg_halt_cond;
+ cpu->halt_cond = tcg_halt_cond;
}
}
@@ -1017,8 +1019,8 @@ static void qemu_kvm_start_vcpu(CPUArchState *env)
CPUState *cpu = ENV_GET_CPU(env);
cpu->thread = g_malloc0(sizeof(QemuThread));
- env->halt_cond = g_malloc0(sizeof(QemuCond));
- qemu_cond_init(env->halt_cond);
+ cpu->halt_cond = g_malloc0(sizeof(QemuCond));
+ qemu_cond_init(cpu->halt_cond);
qemu_thread_create(cpu->thread, qemu_kvm_cpu_thread_fn, env,
QEMU_THREAD_JOINABLE);
while (!cpu->created) {
@@ -1031,8 +1033,8 @@ static void qemu_dummy_start_vcpu(CPUArchState *env)
CPUState *cpu = ENV_GET_CPU(env);
cpu->thread = g_malloc0(sizeof(QemuThread));
- env->halt_cond = g_malloc0(sizeof(QemuCond));
- qemu_cond_init(env->halt_cond);
+ cpu->halt_cond = g_malloc0(sizeof(QemuCond));
+ qemu_cond_init(cpu->halt_cond);
qemu_thread_create(cpu->thread, qemu_dummy_cpu_thread_fn, env,
QEMU_THREAD_JOINABLE);
while (!cpu->created) {
diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h
index 4e62032..75e0f8d 100644
--- a/include/qemu/cpu.h
+++ b/include/qemu/cpu.h
@@ -69,6 +69,7 @@ struct CPUState {
#ifdef _WIN32
HANDLE hThread;
#endif
+ struct QemuCond *halt_cond;
bool thread_kicked;
bool created;
bool stop;
--
1.7.7
- [Qemu-devel] [PATCH qom-next 00/59] QOM CPUState, part 4: CPU_COMMON, Andreas Färber, 2012/05/23
- [Qemu-devel] [PATCH qom-next 11/59] cpu: Move created field to CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 10/59] cpus: Pass CPUState to qemu_cpu_kick_thread(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 01/59] qemu-thread: Let qemu_thread_is_self() return bool, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 03/59] cpu: Move thread field into CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 09/59] cpus: Pass CPUState to qemu_cpu_is_self(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 14/59] cpu: Move stopped field to CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 05/59] apic: Replace cpu_env pointer by X86CPU link, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 08/59] Makefile.dis: Add include/ to include path, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 17/59] cpu: Move halt_cond to CPUState,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next 04/59] pc: Add CPU as /machine/cpu[n], Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 06/59] pc: Pass X86CPU to cpu_is_bsp(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 07/59] cpu: Move thread_kicked to CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 22/59] ppc: Pass PowerPCCPU to power7_set_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 20/59] ppc: Pass PowerPCCPU to ppc6xx_set_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 12/59] cpu: Move stop field to CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 02/59] cpu: Move CPU_COMMON_THREAD into CPUState, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 18/59] cpus: Pass CPUState to qemu_tcg_cpu_thread_fn, Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 21/59] ppc: Pass PowerPCCPU to ppc970_set_irq(), Andreas Färber, 2012/05/22
- [Qemu-devel] [PATCH qom-next 27/59] sun4u: Pass SPARCCPU to {, s, hs}tick_irq() and cpu_timer_create(), Andreas Färber, 2012/05/22