From patchwork Thu Aug 2 00:48:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 174624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3960E2C0092 for ; Thu, 2 Aug 2012 10:49:09 +1000 (EST) Received: from localhost ([::1]:34884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swjb9-0000VX-AZ for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 20:49:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swjau-0000J5-Um for qemu-devel@nongnu.org; Wed, 01 Aug 2012 20:48:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Swjat-00076o-Ev for qemu-devel@nongnu.org; Wed, 01 Aug 2012 20:48:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32964 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swjat-00076a-4i for qemu-devel@nongnu.org; Wed, 01 Aug 2012 20:48:51 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 987C0A2FD6; Thu, 2 Aug 2012 02:48:50 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 2 Aug 2012 02:48:37 +0200 Message-Id: <1343868517-11852-5-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1343868517-11852-1-git-send-email-afaerber@suse.de> References: <1343868517-11852-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH for-1.2 4/4] cpu: Move thread_kicked to CPUState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Change field type to bool. Signed-off-by: Andreas Färber --- cpu-defs.h | 1 - cpus.c | 14 +++++++++----- include/qemu/cpu.h | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cpu-defs.h b/cpu-defs.h index be89684..4018b88 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -209,7 +209,6 @@ typedef struct CPUWatchpoint { uint32_t stop; /* Stop request */ \ uint32_t stopped; /* Artificially stopped */ \ struct QemuCond *halt_cond; \ - int thread_kicked; \ 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 565abb4..b61f60e 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(); diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index d20644b..ad706a6 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -66,6 +66,7 @@ struct CPUState { #ifdef _WIN32 HANDLE hThread; #endif + bool thread_kicked; /* TODO Move common fields from CPUArchState here. */ };