From nobody Mon Feb 9 09:35:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1769704955; cv=none; d=zohomail.com; s=zohoarc; b=mF/pjFUPoDO7mma33ziQieBQiH17LGcSOulgZL80LHeJbDo5SUjsgx/EHS4FLZ/32CJsn53y8u1jquf5E/5lV16T69wW01quVWJED4Rh+Va3Co8+82adkQZXzoPzITEpZRmE+/odfXvlynpecGZULhGD7evAttNwFDpfuvQtHxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769704955; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2/5ri0x0HKOQ4AevWnY2CiNFX91P9a3QRDv363s7aV8=; b=IDvNWa6MNlPEJkY+QpxAxDFb57bDOVp1PReoau/NDXKRaL9tYCQUvT0Hi/jxymKwdOcVbTuA77x+6y406WCnA9bqNrdnjHMZc6fEK6fQG+WNZK3XTRTWqG9xzcqA/AVQyULbBFoVBJzfHLlSaUeyondU7is6cQXMXNjUzQl8JbM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769704955382455.94669347046124; Thu, 29 Jan 2026 08:42:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vlV4u-0000f4-2U; Thu, 29 Jan 2026 11:41:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vlV4s-0000VC-2J for qemu-devel@nongnu.org; Thu, 29 Jan 2026 11:41:06 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vlV4p-0005C6-14 for qemu-devel@nongnu.org; Thu, 29 Jan 2026 11:41:05 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-430f3ef2d37so1021024f8f.3 for ; Thu, 29 Jan 2026 08:41:02 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435e132368csm14359910f8f.31.2026.01.29.08.41.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 29 Jan 2026 08:41:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769704861; x=1770309661; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2/5ri0x0HKOQ4AevWnY2CiNFX91P9a3QRDv363s7aV8=; b=kiAFKySkBMrXLTZwgavZueliq/6dukSt5nYF+cLVicuv/ZAdIRwplI6ms0f8kfkzgr jBXiQ4CIPUrZV6BpTdVeldTTPKn+xWTuQUs6BoBckemQGgXn+4Qke/DV55m/sIWOxAkR XA868fn/9lSSXt6lrLvaA20abIEFzXqdAifJ4AKJ+2vuuxzjaeDZQmVnf26CLjmqNiw3 DCwKfd2N+M5EoWBYnmSbcFouH/rOa+byLlab5abgZZgj0duVB6NaJe2GMFxQA3rdOLz5 HwfPvrywWU++1uioVR4cwGFzhYSb02Fe9ZbNETZPUrUUwrvE/UTlnqP+v/iig6VWACqt yJGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769704861; x=1770309661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2/5ri0x0HKOQ4AevWnY2CiNFX91P9a3QRDv363s7aV8=; b=mC5CbXaGgKA6OhH9eubcbNarx5BGPxiyHzFv0MrAbxJVqqHXA3eU/4PJnD1/ERckKL 1gd6SxsdwYadp3ygNEPhj87nNsOAqfbhsrsz/+KwTJEf/IQh/LorbxghOaNLYGYSc9rh kPF2tbTR3t40fJdCB+tY4OLOCjMOQ42zJxAM02ODbAch1mrjLVDCbHXr6qxavl8OOtlr oLfVekz50iekvwKeB2DB74nK9L/WDnrA01n9By5tKYSyNccBkB7ZBCCDbi6QchLcL63+ NVwMNh3CiCIoze+9y1SF4rFipzdZTJjUnnqSdOwo9ZzqPg1E5oPKWqbEjMpuLxh8NzE/ z2FA== X-Gm-Message-State: AOJu0YwmH8qcGchz98nnNgDBdm7dnhnuszP1RxHBj9YlcJfwZ8RQVhyZ 8zjYnNSRvwaugl7Dxf1/TSAjTRT+IOFpC3SdyTKXqgSCsFcbTUtF2RFRl9iTdbwEzECc0lsY/z+ +vPYsR+0= X-Gm-Gg: AZuq6aKHw+M6SQZon6ZnNRosE7gHwVujoYcIpuDQWmS1iS3c2A6m39pVvW9eFOWBnG/ Tt+UL4vovQJeVyRsZniaDOu0Hb77VrRjA+GvdoDUvJzdzik8/w2U2T+iyVzltJINp09f+jjXRjx UH0J4/5nXmIxySe6kcGDPLZY4QFaWnpgKrKSuTDRguR+cx8zh80dDBWr+GUTk//ok0+lGDhR9k3 DxS0/2lktohxeXHE9JkYpxgz1ttSVTwH34fetLCiPBjAXMtv9gs4d3SWOcyVGumFr3mUoVn3RYy wjcLD353byruAA1MfDmnM8+4kBgBd+R0IpaD06aWUrH+a8lKswwJNgdotFMwT8NW7TDo5WrjdOY KScy+uJEHxtqHISaipF9YfiKCmvAdLliVrnV6ufnOZX6ep0MkcUsNd5eX/vz1eGp24DmCMo5BR5 +b0jZZiop9DfJO8IyXiVF8u92leRAXaeKEvB7JDKldo8G8KzIuyA2s8HTeIfp1 X-Received: by 2002:a05:6000:430e:b0:435:dd81:4f4c with SMTP id ffacd0b85a97d-435f3a63167mr302299f8f.9.1769704861142; Thu, 29 Jan 2026 08:41:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Mark Cave-Ayland , qemu-riscv@nongnu.org, Richard Henderson , qemu-ppc@nongnu.org Subject: [PATCH v5 3/9] monitor: Add hmp_cmds_for_target() helper Date: Thu, 29 Jan 2026 17:40:32 +0100 Message-ID: <20260129164039.58472-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129164039.58472-1-philmd@linaro.org> References: <20260129164039.58472-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1769704957069158500 HMPCommand arrays are filled with target-specific commands, so defined in a target-specific unit. Introduce the hmp_cmds_for_target() to allow target-agnostic code to access the arrays. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Pierrick Bouvier --- monitor/monitor-internal.h | 9 +++++++-- monitor/hmp-target.c | 13 ++++++++----- monitor/hmp.c | 8 +++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 7735c731083..feca111ae31 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -169,8 +169,6 @@ extern QmpCommandList qmp_commands, qmp_cap_negotiation= _commands; extern QemuMutex monitor_lock; extern MonitorList mon_list; =20 -extern HMPCommand hmp_cmds[]; - void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, bool use_io_thread); void monitor_data_destroy(Monitor *mon); @@ -187,4 +185,11 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const= char *name); void handle_hmp_command(MonitorHMP *mon, const char *cmdline); int hmp_compare_cmd(const char *name, const char *list); =20 +/* + * hmp_cmds_for_target: Return array of HMPCommand entries + * + * If @info_command is true, return the particular 'info foo' commands arr= ay. + */ +HMPCommand *hmp_cmds_for_target(bool info_command); + #endif diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 37dfd7fd4c6..59c60d13b52 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -44,8 +44,6 @@ /* Make devices configuration available for use in hmp-commands*.hx templa= tes */ #include CONFIG_DEVICES =20 -static HMPCommand hmp_info_cmds[]; - /** * Is @name in the '|' separated list of names @list? */ @@ -76,11 +74,16 @@ static HMPCommand hmp_info_cmds[] =3D { }; =20 /* hmp_cmds and hmp_info_cmds would be sorted at runtime */ -HMPCommand hmp_cmds[] =3D { +static HMPCommand hmp_cmds[] =3D { #include "hmp-commands.h" { NULL, NULL, }, }; =20 +HMPCommand *hmp_cmds_for_target(bool info_command) +{ + return info_command ? hmp_info_cmds : hmp_cmds; +} + /* * Set @pval to the value in the register identified by @name. * return 0 if OK, -1 if not found @@ -148,7 +151,7 @@ static void __attribute__((__constructor__)) sortcmdlis= t(void) void monitor_register_hmp(const char *name, bool info, void (*cmd)(Monitor *mon, const QDict *qdict)) { - HMPCommand *table =3D info ? hmp_info_cmds : hmp_cmds; + HMPCommand *table =3D hmp_cmds_for_target(info); =20 while (table->name !=3D NULL) { if (strcmp(table->name, name) =3D=3D 0) { @@ -164,7 +167,7 @@ void monitor_register_hmp(const char *name, bool info, void monitor_register_hmp_info_hrt(const char *name, HumanReadableText *(*handler)(Error **e= rrp)) { - HMPCommand *table =3D hmp_info_cmds; + HMPCommand *table =3D hmp_cmds_for_target(true); =20 while (table->name !=3D NULL) { if (strcmp(table->name, name) =3D=3D 0) { diff --git a/monitor/hmp.c b/monitor/hmp.c index 4caafbc7146..17e5756986f 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -301,7 +301,7 @@ void hmp_help_cmd(Monitor *mon, const char *name) } =20 /* 2. dump the contents according to parsed args */ - help_cmd_dump(mon, hmp_cmds, args, nb_args, 0); + help_cmd_dump(mon, hmp_cmds_for_target(false), args, nb_args, 0); =20 free_cmdline_args(args, nb_args); } @@ -1131,7 +1131,8 @@ void handle_hmp_command(MonitorHMP *mon, const char *= cmdline) =20 trace_handle_hmp_command(mon, cmdline); =20 - cmd =3D monitor_parse_command(mon, cmdline, &cmdline, hmp_cmds); + cmd =3D monitor_parse_command(mon, cmdline, &cmdline, + hmp_cmds_for_target(false)); if (!cmd) { return; } @@ -1375,7 +1376,8 @@ static void monitor_find_completion(void *opaque, } =20 /* 2. auto complete according to args */ - monitor_find_completion_by_table(mon, hmp_cmds, args, nb_args); + monitor_find_completion_by_table(mon, hmp_cmds_for_target(false), + args, nb_args); =20 cleanup: free_cmdline_args(args, nb_args); --=20 2.52.0