From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [PATCH 28/37] Move debug exception handling out of cpu_exec Date: Mon, 14 Feb 2011 13:22:57 -0200 Message-ID: <83f338f73ecb88cc6f85d6e7b81ebef112ce07be.1297696986.git.mtosatti@redhat.com> References: Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jan Kiszka , Marcelo Tosatti To: Anthony Liguori Return-path: Received: from mx1.redhat.com ([209.132.183.28]:50672 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755749Ab1BNPZA (ORCPT ); Mon, 14 Feb 2011 10:25:00 -0500 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: From: Jan Kiszka 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 Signed-off-by: Marcelo Tosatti --- 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 97a6d4f..c7e86c2 100644 --- a/cpus.c +++ b/cpus.c @@ -165,10 +165,34 @@ static bool all_cpu_threads_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 eebe684..b436952 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) -- 1.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58013 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pp0IV-0000Gc-Nn for qemu-devel@nongnu.org; Mon, 14 Feb 2011 10:25:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pp0IM-00041w-Cn for qemu-devel@nongnu.org; Mon, 14 Feb 2011 10:25:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pp0IL-00040J-9z for qemu-devel@nongnu.org; Mon, 14 Feb 2011 10:24:57 -0500 From: Marcelo Tosatti Date: Mon, 14 Feb 2011 13:22:57 -0200 Message-Id: <83f338f73ecb88cc6f85d6e7b81ebef112ce07be.1297696986.git.mtosatti@redhat.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH 28/37] Move debug exception handling out of cpu_exec List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jan Kiszka 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 Signed-off-by: Marcelo Tosatti --- 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 97a6d4f..c7e86c2 100644 --- a/cpus.c +++ b/cpus.c @@ -165,10 +165,34 @@ static bool all_cpu_threads_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 eebe684..b436952 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) -- 1.7.4