From 216fc9a44b939eecc9594f6a07fdbebdf717659e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 2 May 2012 17:49:49 +0200 Subject: cpu: Move thread_kicked to CPUState MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change field type to bool. Signed-off-by: Andreas Färber --- cpus.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'cpus.c') diff --git a/cpus.c b/cpus.c index 565abb4d5b..b61f60eb95 100644 --- a/cpus.c +++ b/cpus.c @@ -686,13 +686,15 @@ static void flush_queued_work(CPUArchState *env) static void qemu_wait_io_event_common(CPUArchState *env) { + CPUState *cpu = ENV_GET_CPU(env); + if (env->stop) { env->stop = 0; env->stopped = 1; qemu_cond_signal(&qemu_pause_cond); } flush_queued_work(env); - env->thread_kicked = false; + cpu->thread_kicked = false; } static void qemu_tcg_wait_io_event(void) @@ -866,11 +868,12 @@ static void qemu_cpu_kick_thread(CPUArchState *env) void qemu_cpu_kick(void *_env) { CPUArchState *env = _env; + CPUState *cpu = ENV_GET_CPU(env); qemu_cond_broadcast(env->halt_cond); - if (!tcg_enabled() && !env->thread_kicked) { + if (!tcg_enabled() && !cpu->thread_kicked) { qemu_cpu_kick_thread(env); - env->thread_kicked = true; + cpu->thread_kicked = true; } } @@ -878,10 +881,11 @@ void qemu_cpu_kick_self(void) { #ifndef _WIN32 assert(cpu_single_env); + CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env); - if (!cpu_single_env->thread_kicked) { + if (!cpu_single_cpu->thread_kicked) { qemu_cpu_kick_thread(cpu_single_env); - cpu_single_env->thread_kicked = true; + cpu_single_cpu->thread_kicked = true; } #else abort(); -- cgit v1.2.1