From nobody Mon Feb 9 20:46:16 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=1769694069; cv=none; d=zohomail.com; s=zohoarc; b=kNpfEYoZwkL674Mp/5oVKQqf0PzcNp7m3XSQdi375NYCABueMZmGc6lRVLKc8ihvL0vQOCmWIm8IhDpPHx3h5iJtGVNkV0vlmUA8tlVbLUu71MkXPY76INzKJUiMmR46uDhRIUhfj1G9wci36BPfvtRujWVK8/V/Tytg6RuKytY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769694069; 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=3VIB+OpBInAaNY2pTDrwIlQ5aTfArsqavUF/QiPi1mg=; b=Go+Zofl2qz54U4KwTBfpYyAg4exQQBOpCQ8K2Ci3UpN9itwMCMVT5ZJkhe1UCiMHQP0WSBXs1dsJfraOS6pMcKqwJsq+323bmob/3SeF5WjHtkHyAt67pqbj1umNZEydS3MBT35liXVGtAhoUQ4hxdJS1xzXED9ukVQ98GrzJGs= 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 1769694069896495.5926873006241; Thu, 29 Jan 2026 05:41:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vlSAD-0002BI-Ae; Thu, 29 Jan 2026 08:34:25 -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 1vlS9W-0000Tf-Pa for qemu-devel@nongnu.org; Thu, 29 Jan 2026 08:33:53 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vlS9U-0002jr-TA for qemu-devel@nongnu.org; Thu, 29 Jan 2026 08:33:42 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4806bf39419so13241695e9.1 for ; Thu, 29 Jan 2026 05:33:40 -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-435e10e4824sm15493348f8f.1.2026.01.29.05.33.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 29 Jan 2026 05:33:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769693619; x=1770298419; 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=3VIB+OpBInAaNY2pTDrwIlQ5aTfArsqavUF/QiPi1mg=; b=WMGqY7qjXHCXKBoLbyWyRQqUTmrP7+XX4xSy57+eM8lqoyXS2Y5fRbvq9iHzBtt9qj pLS8UJdIiOpcv0adFJr1sr1sJFlAPoR9uH2qygWXSa7MWtZd8i34BowtvS0qXp3FHmNj Vm9LOc9NeMnvOIO8aEfWMesbtuSw7xJupzaqZSf9zvkLblsR1kUGI0edUomdu4esNB5F 5eQI2LcoGyns/Is7C1A/QBCM5oPsq5ArpOuSnat/hf/Q4C8+xr1lZxtNU1z6CksCkSiv nnHrkTRE+OpAqIDTxUqmGI/40Lj5gQCiRZSsIAF71OIV2OSQdJKhTijmRnKnJGzm1PhR LCuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769693619; x=1770298419; 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=3VIB+OpBInAaNY2pTDrwIlQ5aTfArsqavUF/QiPi1mg=; b=LImbOsCjvF0SPq2DoIKY+MNUAFgCiyqJXZAA5jJheECvKgnrScMsCZMHIblgc7iuoj C3v/qAiLv1D8Zhaa01Vrl6MRxD+W1OLK6ZS/clR1PKc6/UWxSym9//ILLA2h/e7cewEP ZHpQgfQcJX2ti8IC38DO97fucc9IiZ7Zd7j9WqHdOARtBu0FQwqrbTSkSu6LAqdsKgW4 iPSNnBg0Hld6WRogvEOXpktPTnnM2H5c6iqNSN5NX6dnld7mNXnsFg8lKId9se65QwX8 Vaf8HTzFU2/m0yfc8IQTfVXuOgbaHEu5dH66cuS7mUaVfA2cJaSKplYiV6ecQsjQMtdT hCvA== X-Gm-Message-State: AOJu0YzZFCL26cPFiRRG+gS0WNkiOOFtg+kZGCF674VgFbmPK5foVkQN ImEZtGfoTfPV/A55HJ9+0InGKGhDZ/laZe18vIExiXPum9Oy5qfii+e6OUHuDMLWjmuks39qHCs 4ax3FZ/I= X-Gm-Gg: AZuq6aI3gPG7dnbYTMvqmrqarOqbhOUoobwuoEIOkzDOPfZLBea2Rs6oh5lvNV4Z+Ue rysIu2aUjCgVPCyOODg3wibit/eqcu4Tee6AtzeIOoGsyWIh2HJtZk0g0Nu/PLBXpTWa5hl+lrN 6/B8PKmKbwY55Hr8OnLCoh8dz/dvZSRi13RHLmMsfiyBSebapY8kgrfb6QExVbcJquBvQRW4f8y rl0P1ht06Z+mbiqlI0DctW8fSMTVvlQvlyxC7tBLy+XLhpfMkg6GuVF4dOWITS96H+RNfTt2lzm kLUFVHeZpR333SaUX9OoB/JyM5oDfn53wgMn3UsbtAsKP6WrkYw9tTvFQTw8lfBDicu2GPCeHF8 6cXoqYk7QnaBGNVy3qNZ3EyMt9uI4pbiR3azJCFLADreX1vOp/rmmUF+9wkRyyF9TfM9l9f+wHT 6FtKZrg/u91BrT1IxZqcHbjcHPmyChu+iqcCK/YEGmVBAVrjCn0sFt0UdBOguX X-Received: by 2002:a05:6000:4011:b0:435:db9b:5885 with SMTP id ffacd0b85a97d-435ea0672c8mr4435602f8f.10.1769693619055; Thu, 29 Jan 2026 05:33:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-riscv@nongnu.org, Richard Henderson , qemu-ppc@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v4 8/9] monitor: Reduce target-specific methods further Date: Thu, 29 Jan 2026 14:32:40 +0100 Message-ID: <20260129133241.35990-9-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129133241.35990-1-philmd@linaro.org> References: <20260129133241.35990-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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=ham 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: 1769694072759154100 get_monitor_def() doesn't use any target-specific declaration anymore, move it to hmp.c to compile it once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- monitor/monitor-internal.h | 1 - monitor/hmp-target.c | 49 ----------------------------------- monitor/hmp.c | 52 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 50 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 8dc88963630..3ecd394ecf6 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -181,7 +181,6 @@ void monitor_data_destroy_qmp(MonitorQMP *mon); void coroutine_fn monitor_qmp_dispatcher_co(void *data); void qmp_dispatcher_co_wake(void); =20 -int get_monitor_def(Monitor *mon, uint64_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 diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 257605a1c96..a3306b69c93 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -23,7 +23,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/bswap.h" #include "monitor-internal.h" #include "monitor/qdev.h" #include "net/slirp.h" @@ -60,54 +59,6 @@ HMPCommand *hmp_cmds_for_target(bool info_command) return info_command ? hmp_info_cmds : hmp_cmds; } =20 -/* - * Set @pval to the value in the register identified by @name. - * return 0 if OK, -1 if not found - */ -int get_monitor_def(Monitor *mon, uint64_t *pval, const char *name) -{ - const unsigned length =3D target_long_bits() / 8; - const MonitorDef *md =3D target_monitor_defs(); - CPUState *cs =3D mon_get_cpu(mon); - uint64_t tmp =3D 0; - int ret; - - if (cs =3D=3D NULL || md =3D=3D NULL) { - return -1; - } - - for(; md->name !=3D NULL; md++) { - if (hmp_compare_cmd(name, md->name)) { - if (md->get_value) { - *pval =3D md->get_value(mon, md, md->offset); - } else { - CPUArchState *env =3D mon_get_cpu_env(mon); - void *ptr =3D (uint8_t *)env + md->offset; - - switch(md->type) { - case MD_I32: - *pval =3D *(uint32_t *)ptr; - break; - case MD_TULONG: - *pval =3D ldn_he_p(ptr, length); - break; - default: - *pval =3D 0; - break; - } - } - return 0; - } - } - - ret =3D target_get_monitor_def(cs, name, &tmp); - if (!ret) { - *pval =3D ldn_he_p(&tmp, length); - } - - return ret; -} - static int compare_mon_cmd(const void *a, const void *b) { diff --git a/monitor/hmp.c b/monitor/hmp.c index eee8b7e964e..36e58c54670 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -27,8 +27,10 @@ #include "hw/core/qdev.h" #include "monitor-internal.h" #include "monitor/hmp.h" +#include "monitor/hmp-target.h" #include "qobject/qdict.h" #include "qobject/qnum.h" +#include "qemu/bswap.h" #include "qemu/config-file.h" #include "qemu/ctype.h" #include "qemu/cutils.h" @@ -311,6 +313,8 @@ void hmp_help_cmd(Monitor *mon, const char *name) static const char *pch; static sigjmp_buf expr_env; =20 +static int get_monitor_def(Monitor *mon, uint64_t *pval, const char *name); + static G_NORETURN G_GNUC_PRINTF(2, 3) void expr_error(Monitor *mon, const char *fmt, ...) { @@ -1552,3 +1556,51 @@ void monitor_register_hmp_info_hrt(const char *name, } g_assert_not_reached(); } + +/* + * Set @pval to the value in the register identified by @name. + * return 0 if OK, -1 if not found + */ +static int get_monitor_def(Monitor *mon, uint64_t *pval, const char *name) +{ + const unsigned length =3D target_long_bits() / 8; + const MonitorDef *md =3D target_monitor_defs(); + CPUState *cs =3D mon_get_cpu(mon); + uint64_t tmp =3D 0; + int ret; + + if (cs =3D=3D NULL || md =3D=3D NULL) { + return -1; + } + + for(; md->name !=3D NULL; md++) { + if (hmp_compare_cmd(name, md->name)) { + if (md->get_value) { + *pval =3D md->get_value(mon, md, md->offset); + } else { + CPUArchState *env =3D mon_get_cpu_env(mon); + void *ptr =3D (uint8_t *)env + md->offset; + + switch(md->type) { + case MD_U32: + *pval =3D *(uint32_t *)ptr; + break; + case MD_TULONG: + *pval =3D ldn_he_p(ptr, length); + break; + default: + *pval =3D 0; + break; + } + } + return 0; + } + } + + ret =3D target_get_monitor_def(cs, name, &tmp); + if (!ret) { + *pval =3D ldn_he_p(&tmp, length); + } + + return ret; +} --=20 2.52.0