From nobody Thu Nov 6 10:35:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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 1540543276786146.09328954238833; Fri, 26 Oct 2018 01:41:16 -0700 (PDT) Received: from localhost ([::1]:58870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFxg7-0005lk-PK for importer@patchew.org; Fri, 26 Oct 2018 04:41:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFxUH-0000LS-Ek for qemu-devel@nongnu.org; Fri, 26 Oct 2018 04:29:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFxJE-0004pY-Ew for qemu-devel@nongnu.org; Fri, 26 Oct 2018 04:17:33 -0400 Received: from greensocs.com ([193.104.36.180]:45402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFxJ9-0004lW-Id; Fri, 26 Oct 2018 04:17:29 -0400 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 32F5B441B52; Fri, 26 Oct 2018 10:17:18 +0200 (CEST) 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 aQ72E5I5hsOF; Fri, 26 Oct 2018 10:17:17 +0200 (CEST) Received: by greensocs.com (Postfix, from userid 998) id 45027441B45; Fri, 26 Oct 2018 10:17:15 +0200 (CEST) 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 CC7C5441B42; Fri, 26 Oct 2018 10:17:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1540541838; bh=+bywekg1op7l1Y73+cSyV1i54Evh+KgmouT9yYwL0DM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q8KUJf5Rs8JX+2aenEIOIGHa1p4iMdCBQxaq3kaNcQV+2B+EFEsu0O5KbCQvIIafB QOBZR2nzCCRm+IRLzGYoPoU7rwDl6wS8/olAmscKcL5ff8SDWSQ9SAPh5WTQalEb/c 167MEFXGd6UfHjustLOil630fh4nAUpBbAahKEmY= 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=1Vir/1de; dkim=pass (1024-bit key) header.d=greensocs.com header.b=1Vir/1de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1540541835; bh=+bywekg1op7l1Y73+cSyV1i54Evh+KgmouT9yYwL0DM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1Vir/1dei0+bicrl/JcEIDsqgYpXUJT0qqJ8g8f6plDscZQtvV5Y1qhmOVh5qBOKm lN2IYupvoWYktAhPEoo61MpQfpRLBbRQ0NRo0e54md/UI6eoXcqxPsbBkpujuaUCnf +wqLcsj8ZLID1PEkCKu+zs0aL4no7h9MViXHF+Mk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1540541835; bh=+bywekg1op7l1Y73+cSyV1i54Evh+KgmouT9yYwL0DM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1Vir/1dei0+bicrl/JcEIDsqgYpXUJT0qqJ8g8f6plDscZQtvV5Y1qhmOVh5qBOKm lN2IYupvoWYktAhPEoo61MpQfpRLBbRQ0NRo0e54md/UI6eoXcqxPsbBkpujuaUCnf +wqLcsj8ZLID1PEkCKu+zs0aL4no7h9MViXHF+Mk= From: Luc Michel To: qemu-devel@nongnu.org Date: Fri, 26 Oct 2018 10:16:44 +0200 Message-Id: <20181026081653.24602-8-luc.michel@greensocs.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181026081653.24602-1-luc.michel@greensocs.com> References: <20181026081653.24602-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 X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [PATCH v3 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 --- gdbstub.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 17fec8a41c..b8aa4b34af 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1257,11 +1257,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]; @@ -1553,30 +1552,46 @@ 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_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_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 in multiprocess mode */ + ObjectClass *oc =3D object_get_class(OBJECT(cpu)); + const char *cpu_model =3D object_class_get_name(oc); + len =3D snprintf((char *)mem_buf, sizeof(buf) / 2, + "CPU#%d %s [%s]", cpu->cpu_index, + cpu_model, + cpu->halted ? "halted " : "running"); + } 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