From nobody Fri Nov 7 07:37:48 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 1548084392671845.2389610182091; Mon, 21 Jan 2019 07:26:32 -0800 (PST) Received: from localhost ([127.0.0.1]:55228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glbT2-0002fN-4Q for importer@patchew.org; Mon, 21 Jan 2019 10:26:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glbPL-00080b-AD for qemu-devel@nongnu.org; Mon, 21 Jan 2019 10:22:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glbPJ-0003w3-Cs for qemu-devel@nongnu.org; Mon, 21 Jan 2019 10:22:38 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1glbPH-0003s6-5a for qemu-devel@nongnu.org; Mon, 21 Jan 2019 10:22:35 -0500 Received: by mail-wm1-x343.google.com with SMTP id y8so11136847wmi.4 for ; Mon, 21 Jan 2019 07:22:28 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id o16sm128900134wrn.11.2019.01.21.07.22.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 07:22:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z6np4aEV6kepum56jAKTLhBF7tWQywONgDj9IEtWngY=; b=EgXS8CKCfBSjXbi0wQozZG6omguld7mMH7t3HaXqQ9K7h8aZACJMounSwi5WfGf63K 8sgtuF47yd6NvgPjn0USJZFHtb+cwDuZBDj4rMtOJqyuZwagJde1bQ7F97hUDSQKHBZj +UvoGRD/+iO2KxkDsCr+Atrd/KwS/N8N7GXNY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z6np4aEV6kepum56jAKTLhBF7tWQywONgDj9IEtWngY=; b=OMtQSo03HZs9Y+Ed0oThYulGAEVwcs5pD/w3LEVDls6Wreb2Y8wvfgRdz8tsN1+6jN CfZYB038pRs4K024oO2qMYVwfChQKP2LYULmhvBZSqyNhX0dKH8LHkxTjl28JiWTgxhQ Fsp3ycFISKUGQbQmmSz5BP56ErRYKIHqz5j8/njYA6J8WBarw8JzXX6hWUByl8863CV/ A74rgmWTG/aQCAAI7rcm+4KQxCw87fEwCGYaCbEv9IemckKb59oRTW7z4kakplEE7FVq S/KOL7V/Htz3LHQ14bzOphtXeD0Mzq1IWxZ5t1j02w97fW3PkdU55fyUvrNZUpstoIzc Glow== X-Gm-Message-State: AJcUukc1kISR7v5lchNc+izfpzY/Y4Qm0f0jv3W7ivAS9aBiFlfR0v7m EygPkl8kwXGjWhFZZKR/HfBz+A== X-Google-Smtp-Source: ALg8bN7ZSsbK+d25xG3D3geoEqFgRFMM7PAw34qapn/0uei7llwGokS4LO0D4V2ATfUjjBvketcYrA== X-Received: by 2002:a1c:a00f:: with SMTP id j15mr24001656wme.84.1548084147814; Mon, 21 Jan 2019 07:22:27 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 15:22:18 +0000 Message-Id: <20190121152218.9592-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121152218.9592-1-peter.maydell@linaro.org> References: <20190121152218.9592-1-peter.maydell@linaro.org> MIME-Version: 1.0 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::343 Subject: [Qemu-devel] [PATCH v3 4/4] gdbstub: Simplify gdb_get_cpu_pid() to use cpu->cluster_index 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: Eduardo Habkost , Peter Crosthwaite , Alistair Francis , Richard Henderson , "Emilio G . Cota" , "Edgar E. Iglesias" , Paolo Bonzini , Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Now we're keeping the cluster index in the CPUState, we don't need to jump through hoops in gdb_get_cpu_pid() to find the associated cluster object. Signed-off-by: Peter Maydell Reviewed-by: Luc Michel Reviewed-by: Edgar E. Iglesias --- gdbstub.c | 48 +++++------------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index bfc7afb5096..5d6cbea9d35 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -644,50 +644,12 @@ static int memtox(char *buf, const char *mem, int len) =20 static uint32_t gdb_get_cpu_pid(const GDBState *s, CPUState *cpu) { -#ifndef CONFIG_USER_ONLY - gchar *path, *name =3D NULL; - Object *obj; - CPUClusterState *cluster; - uint32_t ret; - - path =3D object_get_canonical_path(OBJECT(cpu)); - - if (path =3D=3D NULL) { - /* Return the default process' PID */ - ret =3D s->processes[s->process_num - 1].pid; - goto out; - } - - name =3D object_get_canonical_path_component(OBJECT(cpu)); - assert(name !=3D NULL); - - /* - * Retrieve the CPU parent path by removing the last '/' and the CPU n= ame - * from the CPU canonical path. - */ - path[strlen(path) - strlen(name) - 1] =3D '\0'; - - obj =3D object_resolve_path_type(path, TYPE_CPU_CLUSTER, NULL); - - if (obj =3D=3D NULL) { - /* Return the default process' PID */ - ret =3D s->processes[s->process_num - 1].pid; - goto out; - } - - cluster =3D CPU_CLUSTER(obj); - ret =3D cluster->cluster_id + 1; - -out: - g_free(name); - g_free(path); - - return ret; - -#else /* TODO: In user mode, we should use the task state PID */ - return s->processes[s->process_num - 1].pid; -#endif + if (cpu->cluster_index =3D=3D UNASSIGNED_CLUSTER_INDEX) { + /* Return the default process' PID */ + return s->processes[s->process_num - 1].pid; + } + return cpu->cluster_index + 1; } =20 static GDBProcess *gdb_get_process(const GDBState *s, uint32_t pid) --=20 2.20.1