From nobody Tue Apr 15 14:46:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546878839846339.70228656335667; Mon, 7 Jan 2019 08:33:59 -0800 (PST) Received: from localhost ([127.0.0.1]:42840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXqg-0006D7-Qn for importer@patchew.org; Mon, 07 Jan 2019 11:33:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXoR-0004ud-Cg for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggXoO-0001s0-PO for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:38 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35429) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggXoM-0001l9-Ao for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:35 -0500 Received: by mail-wr1-x42d.google.com with SMTP id 96so1089424wrb.2 for ; Mon, 07 Jan 2019 08:31:33 -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.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:31:31 -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=qzU0ympb5SfpvFVwfmO3i1qJ2YHOQU/0Au0uTSOXsmk=; b=ZxKIykM3oDCSc3v9JEWD1uVMHrSz57LQUvmJhxSS4xhYvphPjaGZ/dQFHeogMbv6cI wqk3G9J1iXtHYYJBEFX/numymw3k+8sKDfKmfHGRoCqQNFfbpA7WzzIZNr6Nr3aNDaUl 8CJ0eDS0oaCXhIrIj1vrHzOnHQSvFneUv5vN8= 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=qzU0ympb5SfpvFVwfmO3i1qJ2YHOQU/0Au0uTSOXsmk=; b=axnfwiY0eOc/BFuG6Z4iBF3EVr8srWin9ep0fXL52WPRYuel/0shUEYmvUGwviqsJA hnv3ON99FUG/+5WyIRF9tZ1MU4FxLa+7gvUsYPwHhqUO6SJUnMPuQFLPjRg9j5hVWc/7 LRDnlQPhPqSowR+9CvueXuYqdFsQpyYEs1eWOn5zfcnVNZlpcucUlUyCAgEh4I/YYZlX g4HG8yckzVBJRcW0AxYU1FCwMzDMbEayVAEk6XsDeSnSt+J+Q3oLgvNsRDKYFU2hvI00 GyIxeSEUlUfdryMgKzKXRm2gHmsDPtHSYGgxF9StJdycSLMhpNdShkgisLmYOYB8BHc+ /c/Q== X-Gm-Message-State: AJcUukelmnyEG8JBauE30M+UWkqUamb3Qbk7plc2hMJtIOL2Hr75BF0F bTjY2zRdvz65KGHW5nZrZCwXBkz/tl9a0A== X-Google-Smtp-Source: ALg8bN5xeBMjIKZuAebI/yvLDya39FrHkuAR5zKXZ3ICLys8T2d2ziCBQ5UAYuykwG0+SIMwOrFvnw== X-Received: by 2002:a5d:4acb:: with SMTP id y11mr50715502wrs.281.1546878692414; Mon, 07 Jan 2019 08:31:32 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:30:49 +0000 Message-Id: <20190107163117.16269-10-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 09/37] gdbstub: add multiprocess support to (f|s)ThreadInfo and ThreadExtraInfo 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Luc Michel Change the thread info related packets handling to support multiprocess extension. Add the CPUs class name in the extra info to help differentiate them in multiprocess mode. Signed-off-by: Luc Michel Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Edgar E. Iglesias Reviewed-by: Alistair Francis Message-id: 20181207090135.7651-8-luc.michel@greensocs.com Signed-off-by: Peter Maydell --- gdbstub.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 1ba7aa6a28a..f70b5a326fe 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1268,7 +1268,6 @@ static int gdb_handle_packet(GDBState *s, const char = *line_buf) CPUState *cpu; CPUClass *cc; const char *p; - uint32_t thread; uint32_t pid, tid; int ch, reg_size, type, res; uint8_t mem_buf[MAX_PACKET_LENGTH]; @@ -1565,26 +1564,44 @@ static int gdb_handle_packet(GDBState *s, const cha= r *line_buf) put_packet(s, buf); break; } else if (strcmp(p,"fThreadInfo") =3D=3D 0) { - s->query_cpu =3D first_cpu; + s->query_cpu =3D gdb_first_attached_cpu(s); goto report_cpuinfo; } else if (strcmp(p,"sThreadInfo") =3D=3D 0) { report_cpuinfo: if (s->query_cpu) { - snprintf(buf, sizeof(buf), "m%x", cpu_gdb_index(s->query_c= pu)); + snprintf(buf, sizeof(buf), "m%s", + gdb_fmt_thread_id(s, s->query_cpu, + thread_id, sizeof(thread_id))); put_packet(s, buf); - s->query_cpu =3D CPU_NEXT(s->query_cpu); + s->query_cpu =3D gdb_next_attached_cpu(s, s->query_cpu); } else put_packet(s, "l"); break; } else if (strncmp(p,"ThreadExtraInfo,", 16) =3D=3D 0) { - thread =3D strtoull(p+16, (char **)&p, 16); - cpu =3D find_cpu(thread); + if (read_thread_id(p + 16, &p, &pid, &tid) =3D=3D GDB_READ_THR= EAD_ERR) { + put_packet(s, "E22"); + break; + } + cpu =3D gdb_get_cpu(s, pid, tid); if (cpu !=3D NULL) { cpu_synchronize_state(cpu); - /* memtohex() doubles the required space */ - len =3D snprintf((char *)mem_buf, sizeof(buf) / 2, - "CPU#%d [%s]", cpu->cpu_index, - cpu->halted ? "halted " : "running"); + + if (s->multiprocess && (s->process_num > 1)) { + /* Print the CPU model and name in multiprocess mode */ + ObjectClass *oc =3D object_get_class(OBJECT(cpu)); + const char *cpu_model =3D object_class_get_name(oc); + char *cpu_name =3D + object_get_canonical_path_component(OBJECT(cpu)); + len =3D snprintf((char *)mem_buf, sizeof(buf) / 2, + "%s %s [%s]", cpu_model, cpu_name, + cpu->halted ? "halted " : "running"); + g_free(cpu_name); + } else { + /* memtohex() doubles the required space */ + len =3D snprintf((char *)mem_buf, sizeof(buf) / 2, + "CPU#%d [%s]", cpu->cpu_index, + cpu->halted ? "halted " : "running"); + } trace_gdbstub_op_extra_info((char *)mem_buf); memtohex(buf, mem_buf, len); put_packet(s, buf); --=20 2.19.2