From patchwork Tue Oct 17 13:12:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Abakumov X-Patchwork-Id: 827023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yGc0n58hDz9s9Y for ; Wed, 18 Oct 2017 00:46:16 +1100 (AEDT) Received: from localhost ([::1]:39488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4SCE-0008J7-5l for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 09:46:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4RfO-0005Kp-Pd for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:12:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4RfI-0006z2-OS for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:12:18 -0400 Received: from mail.ispras.ru ([83.149.199.45]:57298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4RfI-0006yW-B1 for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:12:12 -0400 Received: from Misha-PC.lan02.inno (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id A128254006C; Tue, 17 Oct 2017 16:12:11 +0300 (MSK) From: Mihail Abakumov To: qemu-devel@nongnu.org Date: Tue, 17 Oct 2017 16:12:09 +0300 Message-ID: <150824592910.6816.15328039229084611078.stgit@Misha-PC.lan02.inno> In-Reply-To: <150824572545.6816.5099701189660002212.stgit@Misha-PC.lan02.inno> References: <150824572545.6816.5099701189660002212.stgit@Misha-PC.lan02.inno> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH v2 35/43] windbg: debug exception subscribing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, lprosek@redhat.com, dovgaluk@ispras.ru, rkagan@virtuozzo.com, pbonzini@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Added handler registration of gdb debug exception. Its exception also can be used for windbg. Signed-off-by: Mihail Abakumov Signed-off-by: Pavel Dovgalyuk Signed-off-by: Dmitriy Koltunov --- cpus.c | 18 +++++++++++++++++- gdbstub.c | 4 ++++ include/sysemu/sysemu.h | 2 ++ windbgstub.c | 16 ++++++++++++---- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/cpus.c b/cpus.c index 9bed61eefc..212553b7e3 100644 --- a/cpus.c +++ b/cpus.c @@ -77,6 +77,8 @@ int64_t max_advance; static QEMUTimer *throttle_timer; static unsigned int throttle_percentage; +static void (*excp_debug_handler)(CPUState *cpu); + #define CPU_THROTTLE_PCT_MIN 1 #define CPU_THROTTLE_PCT_MAX 99 #define CPU_THROTTLE_TIMESLICE_NS 10000000 @@ -960,9 +962,23 @@ static bool cpu_can_run(CPUState *cpu) return true; } +bool register_excp_debug_handler(void (*handler)(CPUState *cpu)) +{ + if (excp_debug_handler == NULL) { + excp_debug_handler = handler; + return true; + } else { + error_report("ERROR: Something debugger already using"); + return false; + } +} + static void cpu_handle_guest_debug(CPUState *cpu) { - gdb_set_stop_cpu(cpu); + if (excp_debug_handler != NULL) { + excp_debug_handler(cpu); + } + qemu_system_debug_request(); cpu->stopped = true; } diff --git a/gdbstub.c b/gdbstub.c index 2a94030d3b..8c76f54117 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2006,6 +2006,10 @@ int gdbserver_start(const char *device) s->mon_chr = mon_chr; s->current_syscall_cb = NULL; + if (!register_excp_debug_handler(gdb_set_stop_cpu)) { + exit(1); + } + return 0; } diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index b21369672a..34588c99b4 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -193,6 +193,8 @@ QemuOpts *qemu_get_machine_opts(void); bool defaults_enabled(void); +bool register_excp_debug_handler(void (*handler)(CPUState *cpu)); + extern QemuOptsList qemu_legacy_drive_opts; extern QemuOptsList qemu_common_drive_opts; extern QemuOptsList qemu_drive_opts; diff --git a/windbgstub.c b/windbgstub.c index 489abe6d6c..b33f412659 100755 --- a/windbgstub.c +++ b/windbgstub.c @@ -115,16 +115,20 @@ static void windbg_send_control_packet(uint16_t type) windbg_state->ctrl_packet_id ^= 1; } -static void windbg_vm_stop(void) +static void windbg_bp_handler(CPUState *cpu) { - CPUState *cpu = qemu_get_cpu(0); - vm_stop(RUN_STATE_PAUSED); - SizedBuf buf = kd_gen_exception_sc(cpu); windbg_send_data_packet(buf.data, buf.size, PACKET_TYPE_KD_STATE_CHANGE64); SBUF_FREE(buf); } +static void windbg_vm_stop(void) +{ + CPUState *cpu = qemu_get_cpu(0); + vm_stop(RUN_STATE_PAUSED); + windbg_bp_handler(cpu); +} + static void windbg_process_manipulate_packet(ParsingContext *ctx) { CPUState *cpu; @@ -432,6 +436,10 @@ int windbg_server_start(const char *device) qemu_register_reset(windbg_handle_reset, NULL); + if (!register_excp_debug_handler(windbg_bp_handler)) { + exit(1); + } + atexit(windbg_exit); return 0; }