From patchwork Mon Feb 7 11:19:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 82247 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 513EAB7043 for ; Tue, 8 Feb 2011 10:51:02 +1100 (EST) Received: from localhost ([127.0.0.1]:40956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmPeW-0000nB-C6 for incoming@patchwork.ozlabs.org; Mon, 07 Feb 2011 06:53:08 -0500 Received: from [140.186.70.92] (port=45775 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmP82-0006pq-8b for qemu-devel@nongnu.org; Mon, 07 Feb 2011 06:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmP7y-0007wa-7j for qemu-devel@nongnu.org; Mon, 07 Feb 2011 06:19:34 -0500 Received: from thoth.sbs.de ([192.35.17.2]:17922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmP7x-0007vL-NE for qemu-devel@nongnu.org; Mon, 07 Feb 2011 06:19:30 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p17BJSPx011443; Mon, 7 Feb 2011 12:19:28 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p17BJQKN027537; Mon, 7 Feb 2011 12:19:27 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 7 Feb 2011 12:19:17 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 06/15] Move debug exception handling out of cpu_exec 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 To prepare splitting up KVM and TCG CPU entry/exit, move the debug exception into cpus.c and invoke cpu_handle_debug_exception on return from qemu_cpu_exec. This also allows to clean up the debug request signaling: We can assign the job of informing main-loop to qemu_system_debug_request and stop the calling cpu directly in cpu_handle_debug_exception. That means a debug stop will now only be signaled via debug_requested and not additionally via vmstop_requested. Signed-off-by: Jan Kiszka --- cpu-exec.c | 24 ------------------------ cpus.c | 35 ++++++++++++++++++++++++++++++----- vl.c | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 8c9fb8b..9c0b10d 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -196,28 +196,6 @@ static inline TranslationBlock *tb_find_fast(void) return tb; } -static CPUDebugExcpHandler *debug_excp_handler; - -CPUDebugExcpHandler *cpu_set_debug_excp_handler(CPUDebugExcpHandler *handler) -{ - CPUDebugExcpHandler *old_handler = debug_excp_handler; - - debug_excp_handler = handler; - return old_handler; -} - -static void cpu_handle_debug_exception(CPUState *env) -{ - CPUWatchpoint *wp; - - if (!env->watchpoint_hit) - QTAILQ_FOREACH(wp, &env->watchpoints, entry) - wp->flags &= ~BP_WATCHPOINT_HIT; - - if (debug_excp_handler) - debug_excp_handler(env); -} - /* main execution loop */ volatile sig_atomic_t exit_request; @@ -287,8 +265,6 @@ int cpu_exec(CPUState *env1) if (env->exception_index >= EXCP_INTERRUPT) { /* exit request from the cpu execution loop */ ret = env->exception_index; - if (ret == EXCP_DEBUG) - cpu_handle_debug_exception(env); break; } else { #if defined(CONFIG_USER_ONLY) diff --git a/cpus.c b/cpus.c index 85c680e..d4b5e80 100644 --- a/cpus.c +++ b/cpus.c @@ -165,10 +165,34 @@ static bool all_cpus_idle(void) return true; } -static void cpu_debug_handler(CPUState *env) +static CPUDebugExcpHandler *debug_excp_handler; + +CPUDebugExcpHandler *cpu_set_debug_excp_handler(CPUDebugExcpHandler *handler) +{ + CPUDebugExcpHandler *old_handler = debug_excp_handler; + + debug_excp_handler = handler; + return old_handler; +} + +static void cpu_handle_debug_exception(CPUState *env) { + CPUWatchpoint *wp; + + if (!env->watchpoint_hit) { + QTAILQ_FOREACH(wp, &env->watchpoints, entry) { + wp->flags &= ~BP_WATCHPOINT_HIT; + } + } + if (debug_excp_handler) { + debug_excp_handler(env); + } + gdb_set_stop_cpu(env); qemu_system_debug_request(); +#ifdef CONFIG_IOTHREAD + env->stopped = 1; +#endif } #ifdef CONFIG_LINUX @@ -479,7 +503,6 @@ int qemu_init_main_loop(void) return ret; } #endif - cpu_set_debug_excp_handler(cpu_debug_handler); qemu_init_sigbus(); @@ -653,8 +676,6 @@ int qemu_init_main_loop(void) int ret; sigset_t blocked_signals; - cpu_set_debug_excp_handler(cpu_debug_handler); - qemu_init_sigbus(); blocked_signals = block_io_signals(); @@ -808,7 +829,10 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) while (1) { if (cpu_can_run(env)) { - qemu_cpu_exec(env); + r = qemu_cpu_exec(env); + if (r == EXCP_DEBUG) { + cpu_handle_debug_exception(env); + } } qemu_kvm_wait_io_event(env); } @@ -1076,6 +1100,7 @@ bool cpu_exec_all(void) qemu_kvm_eat_signals(env); } if (r == EXCP_DEBUG) { + cpu_handle_debug_exception(env); break; } } else if (env->stop) { diff --git a/vl.c b/vl.c index afc0144..79a2332 100644 --- a/vl.c +++ b/vl.c @@ -1315,7 +1315,7 @@ void qemu_system_powerdown_request(void) void qemu_system_debug_request(void) { debug_requested = 1; - vm_stop(VMSTOP_DEBUG); + qemu_notify_event(); } void qemu_system_vmstop_request(int reason)