From nobody Tue Feb 10 12:59:40 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542965543339188.49953100701032; Fri, 23 Nov 2018 01:32:23 -0800 (PST) Received: from localhost ([::1]:51230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQ7op-00048T-6J for importer@patchew.org; Fri, 23 Nov 2018 04:32:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQ7bA-0008BN-LB for qemu-devel@nongnu.org; Fri, 23 Nov 2018 04:18:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQ7b5-0000tE-Nf for qemu-devel@nongnu.org; Fri, 23 Nov 2018 04:18:04 -0500 Received: from greensocs.com ([193.104.36.180]:47082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQ7au-0000Xw-4C; Fri, 23 Nov 2018 04:17:48 -0500 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 15DFE5BD1BB; Fri, 23 Nov 2018 10:17:37 +0100 (CET) Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z7vvdE3Gzq6Y; Fri, 23 Nov 2018 10:17:36 +0100 (CET) Received: by greensocs.com (Postfix, from userid 998) id D96D25BD1A0; Fri, 23 Nov 2018 10:17:34 +0100 (CET) Received: from michell-laptop.home.lmichel.fr (lfbn-1-8165-82.w90-112.abo.wanadoo.fr [90.112.74.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: luc.michel@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 778785BD1BB; Fri, 23 Nov 2018 10:17:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1542964657; bh=N3SgyWObF08UCOAHR0WsOdofElUyflERkmzj4Rs5gYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=v+gTaO4XNYb+WvpOAJ3epK67yEKyHu5oe5Kfy3NNipt1FbM0mA0z3PeoloeDivh6E VjvraiwCqk96ChyLxTkw8JVYbf8QG8bzh15wrrBGI5kxhuOUyM5rw+2wGwfjkx92G5 F5I4g/kxrnBG0eHxiSGnXQyjh5ZQUnoZEw98qjno= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com header.b=tyjvSgsc; dkim=pass (1024-bit key) header.d=greensocs.com header.b=tyjvSgsc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1542964654; bh=N3SgyWObF08UCOAHR0WsOdofElUyflERkmzj4Rs5gYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tyjvSgscMLb7qhEKU8oWeIII3GkcZec4TR78IKFZfcd5sW0RPEl2e/DS8WcGZ/Juw UGcuu6P2KqPvvPvL6mJ0QE0BmDxkbwcAa9lijHkQgRHpLxWGWhd4zr1IFStYSHg01k D/5FHUEmUS3R1udApWMPMD3xdnpnbmgN8YjtNLDk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1542964654; bh=N3SgyWObF08UCOAHR0WsOdofElUyflERkmzj4Rs5gYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tyjvSgscMLb7qhEKU8oWeIII3GkcZec4TR78IKFZfcd5sW0RPEl2e/DS8WcGZ/Juw UGcuu6P2KqPvvPvL6mJ0QE0BmDxkbwcAa9lijHkQgRHpLxWGWhd4zr1IFStYSHg01k D/5FHUEmUS3R1udApWMPMD3xdnpnbmgN8YjtNLDk= From: Luc Michel To: qemu-devel@nongnu.org Date: Fri, 23 Nov 2018 10:17:20 +0100 Message-Id: <20181123091729.29921-8-luc.michel@greensocs.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181123091729.29921-1-luc.michel@greensocs.com> References: <20181123091729.29921-1-luc.michel@greensocs.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [PATCH v7 07/16] 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: , Cc: Peter Maydell , Eduardo Habkost , alistair@alistair23.me, mark.burton@greensocs.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , saipava@xilinx.com, edgari@xilinx.com, qemu-arm@nongnu.org, Luc Michel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" 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 --- gdbstub.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 728efdabee..12d4e33c40 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1262,11 +1262,10 @@ out: 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]; char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; char thread_id[16]; @@ -1558,30 +1557,48 @@ static int gdb_handle_packet(GDBState *s, const cha= r *line_buf) snprintf(buf, sizeof(buf), "QC%s", gdb_fmt_thread_id(s, cpu, thread_id, sizeof(thread_id= ))); 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); } break; --=20 2.19.1