From patchwork Mon Dec 21 08:09:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 41533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2A06DB6F08 for ; Mon, 21 Dec 2009 20:02:59 +1100 (EST) Received: from localhost ([127.0.0.1]:38988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMeAL-0001NW-0Q for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 04:02:57 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMdL2-0002pP-Ku for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:57 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMdKs-0002jX-0Y for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:51 -0500 Received: from [199.232.76.173] (port=52822 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdKr-0002jT-Ds for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31122) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMdKq-0003p0-TP for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:45 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89io0001054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Dec 2009 03:09:44 -0500 Received: from localhost.localdomain (vpn2-10-119.ams2.redhat.com [10.36.10.119]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89V3X011460 for ; Mon, 21 Dec 2009 03:09:43 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2009 09:09:24 +0100 Message-Id: <1261382970-23251-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> References: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 13/19] move tcg_has_work to cpu-exec.c and rename it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org tcg_has_work is the only user of cpu-exec.c's qemu_cpu_has_work export. Just move everything into cpu-exec.c. Signed-off-by: Paolo Bonzini --- cpu-all.h | 2 +- cpu-exec.c | 16 ++++++++++++++-- vl.c | 28 ++-------------------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index e214374..aef594d 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -781,7 +781,7 @@ void cpu_reset_interrupt(CPUState *env, int mask); void cpu_exit(CPUState *s); -int qemu_cpu_has_work(CPUState *env); +int qemu_cpus_have_work(void); /* Breakpoint/watchpoint flags */ #define BP_MEM_READ 0x01 diff --git a/cpu-exec.c b/cpu-exec.c index af4595b..b458484 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -49,9 +49,21 @@ int tb_invalidated_flag; //#define CONFIG_DEBUG_EXEC //#define DEBUG_SIGNAL -int qemu_cpu_has_work(CPUState *env) +int qemu_cpus_have_work(void) { - return cpu_has_work(env); + CPUState *env; + + for (env = first_cpu; env != NULL; env = env->next_cpu) { + if (env->stop) + return 1; + if (env->stopped) + return 0; + if (!env->halted) + return 1; + if (cpu_has_work(env)) + return 1; + } + return 0; } void cpu_loop_exit(void) diff --git a/vl.c b/vl.c index 9f363c8..9bf9806 100644 --- a/vl.c +++ b/vl.c @@ -3435,7 +3435,6 @@ static QemuCond qemu_pause_cond; static void block_io_signals(void); static void unblock_io_signals(void); -static int tcg_has_work(void); static int qemu_init_main_loop(void) { @@ -3458,7 +3457,7 @@ static int qemu_init_main_loop(void) static void qemu_wait_io_event(CPUState *env) { - while (!tcg_has_work()) + while (!qemu_cpus_have_work()) qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000); qemu_mutex_unlock(&qemu_global_mutex); @@ -3922,29 +3921,6 @@ static void tcg_cpu_exec(void) } } -static int cpu_has_work(CPUState *env) -{ - if (env->stop) - return 1; - if (env->stopped) - return 0; - if (!env->halted) - return 1; - if (qemu_cpu_has_work(env)) - return 1; - return 0; -} - -static int tcg_has_work(void) -{ - CPUState *env; - - for (env = first_cpu; env != NULL; env = env->next_cpu) - if (cpu_has_work(env)) - return 1; - return 0; -} - static int qemu_calculate_timeout(void) { #ifndef CONFIG_IOTHREAD @@ -3952,7 +3928,7 @@ static int qemu_calculate_timeout(void) if (!vm_running) timeout = 5000; - else if (tcg_has_work()) + else if (qemu_cpus_have_work()) timeout = 0; else { /* XXX: use timeout computed from timers */