From patchwork Mon Jan 7 16:30:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 154923 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3677801ljp; Mon, 7 Jan 2019 08:42:36 -0800 (PST) X-Google-Smtp-Source: ALg8bN64HvWW3tNYUoh5CjeqicrA8vQQXeUXcB4oFds0hUdZyiIgkTHRvjR0y3+5IraNB2UGme9T X-Received: by 2002:adf:9f10:: with SMTP id l16mr53377884wrf.206.1546879355968; Mon, 07 Jan 2019 08:42:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546879355; cv=none; d=google.com; s=arc-20160816; b=r8RK9GuV8xdDwmHQ7U9uFdrWd8dZcczPEnPW9qYzrrBhpC0S039ZWat9jndsmdizsV Q2aGevdcOblxrosMM7YzkpmQqXMvCu+iXytOetZR4pWhFH2U48NHNIz7EbWMIutNJU2k NNZaKHmsemPsezBA4it3yZwQvqoP4a5g5sPpZJXxrBmsRAM6jSh6hnVYd1wtWnrtDb6c IIuA2L3Iv/fdDRzNXXr92tlzgH/7ayNqBiM29+rFL4Q1ArSnan7C0hwH+spmJqyj7ca+ nwdtD+9IcV4KtSTDpt+3lyoOtr2hOw0tXO0q5hNi028y5fbWyImteU7kS41/3hwLw+xQ Ux2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=sHoVLSA2tLPSJ2TzBtejORvIedQQDnk9Co9AD6jwdzM=; b=SOEF7eXgMnhDBAfnWI1JPcIEUEkoOkd7cQYe2mlukPlYQVwdegSrbCa8ArqBtq//2O v+I/d1jfwevvbyYdU9xEyOy99d9/edeIkY1GfZP8uu4QmlXJnUxzQbWsQW8RoqlAhJ/R vW9DCiTuiPXhLsjZ1wQ93g2i1W4RsCk/y4MQy35k3UywVBM2qkQys1XeK/x5Wt8fSnsm +cbFqI5MuWVlxTlh8/Fu0Fdkil/4W1VpC9D67ueCJNlU2RXvEs4YLYEPImqfcQvZ2+jj 7JQYaNuD86rtG8JhTMaRLx6ngsrExnqlJgaqNvDsPA55TLGCJu8fPsHRSdoFTPxhuec9 eqEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XO2QSEoT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 59si37976654wrs.90.2019.01.07.08.42.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:42:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XO2QSEoT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:44986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXz0-00057n-Sx for patch@linaro.org; Mon, 07 Jan 2019 11:42:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXoY-0004zl-QV for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggXoX-000233-LL for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:46 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggXoV-0001pP-OP for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:43 -0500 Received: by mail-wr1-x429.google.com with SMTP id z5so1033528wrt.11 for ; Mon, 07 Jan 2019 08:31:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sHoVLSA2tLPSJ2TzBtejORvIedQQDnk9Co9AD6jwdzM=; b=XO2QSEoT6GLREWLdlXNW2rAdid3xejgPgcgSesrkFgJ1hUopRl88WB6Ij9CLYgd/nG H6yzUVa+4aQ4aLW5ZnwrxKcwqlXGPT5FOhi9Wb4WNwZFelUarRhaJC25uwVYp/lEBr75 lVIWnjgy2a0J1XjUClMZeIAMWa0/3VQteIciA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sHoVLSA2tLPSJ2TzBtejORvIedQQDnk9Co9AD6jwdzM=; b=Xa5KkjlJGvF2BxmVSf8g3SaUurFWOieHYKPjBZdtmX8Xt3/BZ+seU6Bzc1ze0DVHL5 kudtcrvuCvlX7oqtHldGoVoR2GrSLeu0RBAsknz/QVGZwgBfSibAqnDGY8QyKetV8US7 8ePadLtHK5ylLGtyJvD0KltxzQVMlZL6GMRGm64/069Ng2s77RkxELXRdzitpqo/VDlX mfUwGlPGAZybAOiTH85uWgPauuBE4sFQtUoAG1IR0np11b7g64k75LvZXEaVqJFO/hkd 2mnuRg0gfbbB2K5ciYWn8LOZ/dmjAM92umo1EtjAzvsc88EtvvgyeDqGRkCuSkxKou0U cGnQ== X-Gm-Message-State: AJcUukcZA2Znh1Y9guBvTWrUbe5rOn9aCDGNQSbjXH1shcLYvER211QD U/qFcAfk6y4ngit5WeyQoPzzjLeJsuZV6w== X-Received: by 2002:adf:dec4:: with SMTP id i4mr50351454wrn.307.1546878694566; Mon, 07 Jan 2019 08:31:34 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j14sm46039759wrv.96.2019.01.07.08.31.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:31:33 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:30:51 +0000 Message-Id: <20190107163117.16269-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190107163117.16269-1-peter.maydell@linaro.org> References: <20190107163117.16269-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 11/37] gdbstub: add multiprocess support to gdb_vm_state_change() 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Luc Michel Add support for multiprocess extension in gdb_vm_state_change() function. Signed-off-by: Luc Michel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias Acked-by: Alistair Francis Message-id: 20181207090135.7651-10-luc.michel@greensocs.com Signed-off-by: Peter Maydell --- gdbstub.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- 2.19.2 diff --git a/gdbstub.c b/gdbstub.c index 1f2b155490d..edee38b6136 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1724,6 +1724,7 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state) GDBState *s = gdbserver_state; CPUState *cpu = s->c_cpu; char buf[256]; + char thread_id[16]; const char *type; int ret; @@ -1735,6 +1736,14 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state) put_packet(s, s->syscall_buf); return; } + + if (cpu == NULL) { + /* No process attached */ + return; + } + + gdb_fmt_thread_id(s, cpu, thread_id, sizeof(thread_id)); + switch (state) { case RUN_STATE_DEBUG: if (cpu->watchpoint_hit) { @@ -1752,8 +1761,8 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state) trace_gdbstub_hit_watchpoint(type, cpu_gdb_index(cpu), (target_ulong)cpu->watchpoint_hit->vaddr); snprintf(buf, sizeof(buf), - "T%02xthread:%02x;%swatch:" TARGET_FMT_lx ";", - GDB_SIGNAL_TRAP, cpu_gdb_index(cpu), type, + "T%02xthread:%s;%swatch:" TARGET_FMT_lx ";", + GDB_SIGNAL_TRAP, thread_id, type, (target_ulong)cpu->watchpoint_hit->vaddr); cpu->watchpoint_hit = NULL; goto send_packet; @@ -1795,7 +1804,7 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state) break; } gdb_set_stop_cpu(cpu); - snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, cpu_gdb_index(cpu)); + snprintf(buf, sizeof(buf), "T%02xthread:%s;", ret, thread_id); send_packet: put_packet(s, buf);