From nobody Thu Nov 6 18:22:14 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 1542275627639320.9673491158094; Thu, 15 Nov 2018 01:53:47 -0800 (PST) Received: from localhost ([::1]:37711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNELK-000743-7n for importer@patchew.org; Thu, 15 Nov 2018 04:53:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNEBG-0007r7-J9 for qemu-devel@nongnu.org; Thu, 15 Nov 2018 04:43:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNEBE-00053Q-8i for qemu-devel@nongnu.org; Thu, 15 Nov 2018 04:43:22 -0500 Received: from greensocs.com ([193.104.36.180]:41899) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNEB3-0004NF-TM; Thu, 15 Nov 2018 04:43:11 -0500 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id AA21E6FD9D; Thu, 15 Nov 2018 10:42:16 +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 WOJHX7Kbahed; Thu, 15 Nov 2018 10:42:16 +0100 (CET) Received: by greensocs.com (Postfix, from userid 998) id 78BE56FD8A; Thu, 15 Nov 2018 10:42:15 +0100 (CET) Received: from michell-laptop.hive.antfield.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 E98666FD97; Thu, 15 Nov 2018 10:42:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1542274936; bh=Vz03jEkEoeWXKtww+utaeJgxU7B2mcpLpZOzsXl5hzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d6QPbcz7le5zdoEhmifFn5ON0sm1N8p/QDjy2OhCzjmc2s06H1PiyJ/5GaXuW1ZjH gkle4CIc9WvWeImYl/WoNhcMBNwdJ19f2bbc3UfteaKJLoEPBapr+BCCDxB6MJPggY IVvtpN6TPb7fGJpfQvHNHpDCcG7W5bbRLHyNopEg= 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=sRqDACG8; dkim=pass (1024-bit key) header.d=greensocs.com header.b=sRqDACG8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1542274935; bh=Vz03jEkEoeWXKtww+utaeJgxU7B2mcpLpZOzsXl5hzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sRqDACG8Kiim6s18FoKa9q28+vxBat5VPUw6vWOteOobE6viUYW3OeRrZRymQKPm7 STJVqSR0ekKlyqPO6FhGpHiymaahjJRXGFD+SsW1vQZ2YFTwk+0UdNWXFeCY74eIzH eCM/Y9BOJew6gFHVL9CSbHnzB8HI0TS965pMR7Is= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1542274935; bh=Vz03jEkEoeWXKtww+utaeJgxU7B2mcpLpZOzsXl5hzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sRqDACG8Kiim6s18FoKa9q28+vxBat5VPUw6vWOteOobE6viUYW3OeRrZRymQKPm7 STJVqSR0ekKlyqPO6FhGpHiymaahjJRXGFD+SsW1vQZ2YFTwk+0UdNWXFeCY74eIzH eCM/Y9BOJew6gFHVL9CSbHnzB8HI0TS965pMR7Is= From: Luc Michel To: qemu-devel@nongnu.org Date: Thu, 15 Nov 2018 10:41:58 +0100 Message-Id: <20181115094207.22846-8-luc.michel@greensocs.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115094207.22846-1-luc.michel@greensocs.com> References: <20181115094207.22846-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 v6 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 d19b0137e8..292dee8914 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1260,11 +1260,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]; @@ -1556,30 +1555,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