From nobody Tue Feb 10 02:30:28 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=1770067399; cv=none; d=zohomail.com; s=zohoarc; b=Lpz88v0ZinIjOvz6hKCW0Lt4cSHqX12F7I3XNxM0ZNOgPXxRTrQGYwm7eN6g7Gcww3l9gIUIsCdbLTTTS+z7UMTjRFz4J8YxG7v7UMVjJszGkt4qRwKlIMTy3bueAzQYpYZ5xvu2uH0p0y13Cy3dInogzvGuXdKz60Km/cMkOng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770067399; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=LGPgOWqY6NlYrVCwUyVSsX2YgvOrDGLMDph16Mc2NKE=; b=KK5zdO7jr8C84kxcIi/z1914cu7sC1tWjFa5U0MWRRP7qiZbQVGLPV5+wcmYEYqNkI7CTe35e6A8uro7dKqB7CJAP2mwjRqJXkmAFm/753EJLLgTFNSefq5lG6SE3JN01S9SjqftgBQJmqzFb/pxAbJmpwC6RALncvewp/KGJhQ= 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 1770067399088337.62478269397275; Mon, 2 Feb 2026 13:23:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vn1Nj-0005i3-Nb; Mon, 02 Feb 2026 16:22:51 -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 1vn1NA-00059g-Fw for qemu-devel@nongnu.org; Mon, 02 Feb 2026 16:22:20 -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 1vn1N8-0007jk-UP for qemu-devel@nongnu.org; Mon, 02 Feb 2026 16:22:16 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-482f454be5bso1326725e9.0 for ; Mon, 02 Feb 2026 13:22:14 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48305133689sm14003955e9.12.2026.02.02.13.22.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 02 Feb 2026 13:22:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770067333; x=1770672133; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LGPgOWqY6NlYrVCwUyVSsX2YgvOrDGLMDph16Mc2NKE=; b=Y8DzaG0wG+rDWKl5nAjG5qt1MJjKn/QjEKYI8vdDes1JCNqyLxjytGeLZKLJIsSl1f lpuMr+qFEwnw5fxvbT+1+nH37dGbdbYLIFgVrYkj5oo+OGS1yE49WHET6r82laZ6R4mB fvNxeNeGNNhk2knHqsSmvQ2ES8ANJEVUTioIf3w9lD7ZEdDCbWWw1DuOOHyl5jRBlS2U hB/teHTqTiWQCZLUjPzvbQcAef/9qFY3xSZiA1tVLhb0U5BfIOVlZ8lHrG+4WVxMtDSz TakrRrZtwSp1ZU8Vu67zgha8D6f0TJPLDduW+eoN7xeR/l4m8muhy6fXIcH/RcfaR9aK CSSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770067333; x=1770672133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=LGPgOWqY6NlYrVCwUyVSsX2YgvOrDGLMDph16Mc2NKE=; b=ItKVlxXMpwRnHsrolHX4Pb7cdJ98Orud/w3gwomz/0m4RNU6F2d+8hzQoozv46ksVD 1BJby8aRogN63xaCFPeOYicfqzY8YDzY/ABjcvrVdkSo4rNhDEK5wD9Lh6Ov4xRUgnHp PJj2RMonO5ynZynlfJsETJOxASVJ2s7paSNjOr2xrAxoVWPchor22WXwsF/ZVoiK0bwB kj3AhWaDJ5rzAishV9k5Q2/wMPQz4DE1zSTOOnn+MW2NHj0TPyenur0a8EIUQoV6M8Pa joEauN/Y6cDok+uaKwQj25TGpfB/uy93iM69WfMfQJkA8/QnHj1gh7tQIwvbnmxw7Si6 MMug== X-Gm-Message-State: AOJu0YzDJlQECveP+y1bP8/zZv6Mrws+9O9ZOmakTwOpqBtr4fzzWSCR 18mYBcact70/uznw70cm3WJwxyjLhGbsOucaILD6HFVlveoyvhN5pl4seUtD2WOAi2VmnexnKeH EQ24/XI8= X-Gm-Gg: AZuq6aJ6Jw3Nqm7o1IxHgATNTcT8XRUxonetTUkh9D0DA1w+lSUYtPDEXek0B1Rnjrv xCVJR9CxHr0J8gGSQgiFBrcRQLaROrm9u1y7xsXzk1pk5ejsfv3UEN8Qyq387P544Y4HYZ4gKpX wh2DyTIsXOmEVKNJczv3/nrdBoGfuGIDlDc0khnoGRgZReQ3yD4w6hSHgqRh/6Q1h2uLDDOScpx +pn6ErWuC+91UIG0VOvldEZ7dCeNq2bDrz3bT3IetfpEZb1UZzPR2eeROZ098ccVtEpmanJeZeG /Ak0pRn3qa25Kj9zkbg1vylMxl2mDpkRZ2xm3i38A5tnWIRbISKoT/BoNRoIom7fks39rBxU0xo qUD/JtSfSuHGe3MV1qTIsCbY3Wr64LxHveqHgBgaiGNK8wmoxoqwFuenFixlZ47TSF53vnup2Qr 7iYuByfXCOhuOVDxCDnsyx2F1Ipob28TECrk+tjq505p9m/K2/txkyDrp46nT1 X-Received: by 2002:a05:600c:6303:b0:47e:e59c:67c5 with SMTP id 5b1f17b1804b1-4830513aed8mr15509575e9.8.1770067333141; Mon, 02 Feb 2026 13:22:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 16/16] monitor: Reduce target-specific methods Date: Mon, 2 Feb 2026 22:20:19 +0100 Message-ID: <20260202212019.94205-17-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260202212019.94205-1-philmd@linaro.org> References: <20260202212019.94205-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: 1770067401384158502 The following methods don't use target-specific code anymore: - hmp_compare_cmd() - monitor_register_hmp() - monitor_register_hmp_info_hrt() Move them to hmp.c which is target-agnostic, being built once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Message-Id: <20260129164039.58472-5-philmd@linaro.org> --- monitor/hmp-target.c | 57 -------------------------------------------- monitor/hmp.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 57 deletions(-) diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 59c60d13b52..420969bd6eb 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -33,8 +33,6 @@ #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-machine.h" -#include "qapi/error.h" -#include "qemu/cutils.h" =20 #if defined(TARGET_S390X) #include "hw/s390x/storage-keys.h" @@ -44,29 +42,6 @@ /* Make devices configuration available for use in hmp-commands*.hx templa= tes */ #include CONFIG_DEVICES =20 -/** - * Is @name in the '|' separated list of names @list? - */ -int hmp_compare_cmd(const char *name, const char *list) -{ - const char *p, *pstart; - int len; - len =3D strlen(name); - p =3D list; - for (;;) { - pstart =3D p; - p =3D qemu_strchrnul(p, '|'); - if ((p - pstart) =3D=3D len && !memcmp(pstart, name, len)) { - return 1; - } - if (*p =3D=3D '\0') { - break; - } - p++; - } - return 0; -} - /* Please update hmp-commands.hx when adding or changing commands */ static HMPCommand hmp_info_cmds[] =3D { #include "hmp-commands-info.h" @@ -147,35 +122,3 @@ static void __attribute__((__constructor__)) sortcmdli= st(void) sizeof(*hmp_info_cmds), compare_mon_cmd); } - -void monitor_register_hmp(const char *name, bool info, - void (*cmd)(Monitor *mon, const QDict *qdict)) -{ - HMPCommand *table =3D hmp_cmds_for_target(info); - - while (table->name !=3D NULL) { - if (strcmp(table->name, name) =3D=3D 0) { - g_assert(table->cmd =3D=3D NULL && table->cmd_info_hrt =3D=3D = NULL); - table->cmd =3D cmd; - return; - } - table++; - } - g_assert_not_reached(); -} - -void monitor_register_hmp_info_hrt(const char *name, - HumanReadableText *(*handler)(Error **e= rrp)) -{ - HMPCommand *table =3D hmp_cmds_for_target(true); - - while (table->name !=3D NULL) { - if (strcmp(table->name, name) =3D=3D 0) { - g_assert(table->cmd =3D=3D NULL && table->cmd_info_hrt =3D=3D = NULL); - table->cmd_info_hrt =3D handler; - return; - } - table++; - } - g_assert_not_reached(); -} diff --git a/monitor/hmp.c b/monitor/hmp.c index 17e5756986f..0a5bbf82197 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1497,3 +1497,58 @@ void monitor_init_hmp(Chardev *chr, bool use_readlin= e, Error **errp) monitor_event, NULL, &mon->common, NULL, true= ); monitor_list_append(&mon->common); } + +/** + * Is @name in the '|' separated list of names @list? + */ +int hmp_compare_cmd(const char *name, const char *list) +{ + const char *p, *pstart; + int len; + len =3D strlen(name); + p =3D list; + for (;;) { + pstart =3D p; + p =3D qemu_strchrnul(p, '|'); + if ((p - pstart) =3D=3D len && !memcmp(pstart, name, len)) { + return 1; + } + if (*p =3D=3D '\0') { + break; + } + p++; + } + return 0; +} + +void monitor_register_hmp(const char *name, bool info, + void (*cmd)(Monitor *mon, const QDict *qdict)) +{ + HMPCommand *table =3D hmp_cmds_for_target(info); + + while (table->name !=3D NULL) { + if (strcmp(table->name, name) =3D=3D 0) { + g_assert(table->cmd =3D=3D NULL && table->cmd_info_hrt =3D=3D = NULL); + table->cmd =3D cmd; + return; + } + table++; + } + g_assert_not_reached(); +} + +void monitor_register_hmp_info_hrt(const char *name, + HumanReadableText *(*handler)(Error **e= rrp)) +{ + HMPCommand *table =3D hmp_cmds_for_target(true); + + while (table->name !=3D NULL) { + if (strcmp(table->name, name) =3D=3D 0) { + g_assert(table->cmd =3D=3D NULL && table->cmd_info_hrt =3D=3D = NULL); + table->cmd_info_hrt =3D handler; + return; + } + table++; + } + g_assert_not_reached(); +} --=20 2.52.0