From nobody Sun Mar 22 14:11:53 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=1774022963; cv=none; d=zohomail.com; s=zohoarc; b=H3hPrM8bgyH877u0DmMUk4rOHQteCD8JbTvEDfGWZP55kJS8MPzFWAuHrJwxC1AT+Jg/MXbawTJPof5K31bldiQsGNZMc0WfptrghQenF2dU+bE4Zs0s30n0g4zOW6QeI3wKyEl1rBLg18bq6Yx+o7+jTxLkQoXQlrUwnTOp01A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774022963; 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=B1etCwO8aK08qpLcIJ497JKqocrRfF8wFd5a8chIrRs=; b=NGdpZBhDDsqNJ/DajZ/Te6axhvEnpyoIbjlHc3D/zXTeBiIm2LhPD2WR6b9Nmt7AvLLk6UzwEuEjRjHfqjPwHLITmiz1sx9Rg3rGgrzUUDTVG9LcVt0L8alxhPPug8y5cSn+oW82FnnkLYeN4NlccRrgMhPSU2d7NxMNBwuMM38= 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 1774022963320191.38143968717486; Fri, 20 Mar 2026 09:09:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cP8-0000Bx-37; Fri, 20 Mar 2026 12:08:55 -0400 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 1w3cOg-0008W9-Ot for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:30 -0400 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 1w3cOe-0008Sz-5n for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:26 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-439b9cf8cb5so2822015f8f.0 for ; Fri, 20 Mar 2026 09:08:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b644addfbsm7803368f8f.3.2026.03.20.09.08.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022902; x=1774627702; 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=B1etCwO8aK08qpLcIJ497JKqocrRfF8wFd5a8chIrRs=; b=pSTGD1CFKAJhkrEF0BTY5LUH/CRwqhoyB1Qjqep9PHahp+hELi/yNGufOUKaEeS6bP t42onDqZjLUZkTSC1TrK1UXCfDxipG8IXaN1ncP388DmU1odP2enO4ZpO6wzB5uQNho+ diZtFRSMYuNmvj/HtzkWBkemkfALuuN0HLrQkuXdCKCzFGKkPnZn+XWrVhEfWRHJTWRB OMgCU8+vzoKm7J1ZMuWX/8IxsIpL9T3Rd/QK8W8h8waeNYsLZv4IQ2RFsQkn37WrMPx6 SbORc4FZ0sv6BR2zJcBBt/vyfFUWNiLOGvv1IhxYwXEY9+JFgX5aTKaSgH6aqQNBwCkX bknA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022902; x=1774627702; 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=B1etCwO8aK08qpLcIJ497JKqocrRfF8wFd5a8chIrRs=; b=fZI7NcoCBDQ4s8faoWzXc0SKVsMV6x8HNhrBw/74HEqE4+MTBMezXd7zYjIKDaGb5f S0u1HPZm8o9vn+jPxPHYavflQtrpQb4fEYilYkGxDdIYFJyHfgHpVBph0GPDXfh9zd/r FS/1i8zTcEdBZVdqICEagp+Utcc6smq3I9BnQGaxfk/+ycAkNt0CNYeI3nKcsLzd64Kc WbKFcYNo/yo/cm5Kj4y7hWFQvvROIqFsnOGVT6a0q4039riPoxQ+I4JU9IaliOjUs5jz gaRJn1E3bUyTOB/g4swiaEKuwi/oZNRqeKgGXKv66kbKzGYlmCa/4hcUBQcGHwtAw/0A g5yA== X-Gm-Message-State: AOJu0YzUVZAw5s0873U/d2zj84LABwXmvhR6EY4n88fYM9GxLzrYsSnB Y4ICpHgB9OWcVXp/oG6AC8cXcMt2iWy4frKnbY9ws88yI4iMnXOlNum/4cp1HUOR4jU6B54Ey12 4HKBhT9Q= X-Gm-Gg: ATEYQzzC6+1eOVbHcH2UJpqzbbGHQgFOeTBoJjtqLegcwMaSiITiJbf+G22TV1HmWRt Ql/7CzAJGKeHe2CZFD/4AGs/29cMsXFq/1qUNtdVk96pPa2Nh6ubGsDpsy5SSb64z8QcFnU0PiH TAprR+5iN29jTPFKT5nUwZ3ePgWS6JDH3yYqqeO/1VyLhyfv1MBp/4jqxadV53Ik3FNhVoNoNSj wLKCerl28aaAegJ5gl0bwjzzRJoU/9y18hqZXX9F4WGSSct626IES1P2u+35bYPSNoh93ISDTbm Ieda5f2YzHKz8ed63wXu/iyrw8cuaXr7Hf9tDr2OACmKXUyd1uDPAnLivCW04cIcLn6h7qeKRPM 4QWM8WixVVY8rf4ggOq+UrUa9fNYgQ/lBX76fqOmDlfLkc3M0GEs3nDy0F6dZEQx1trHTfeaDkH SVOB3TSqevXwGqjcF6WwjLd+VoISVpnsLGCTvB/XTQ0tJWNGVuDjQMqrY62ycCdZX/7YTEgZEk X-Received: by 2002:a05:6000:2408:b0:43b:5003:e301 with SMTP id ffacd0b85a97d-43b642796afmr6789339f8f.42.1774022901665; Fri, 20 Mar 2026 09:08:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Xu , Fabiano Rosas , Jason Wang , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Hajnoczi Subject: [PATCH-for-11.1 01/10] monitor: Extract completion declarations to 'monitor/hmp-completion.h' Date: Fri, 20 Mar 2026 17:08:01 +0100 Message-ID: <20260320160811.28611-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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=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: 1774022966516154100 Many files include "monitor/hmp.h", but few of them really need the completion declarations: move them to a distinct header. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 1 + include/monitor/hmp-completion.h | 40 ++++++++++++++++++++++++++++++++ include/monitor/hmp.h | 21 ----------------- chardev/char-hmp-cmds.c | 1 + migration/migration-hmp-cmds.c | 1 + monitor/hmp-target.c | 1 + net/net-hmp-cmds.c | 1 + qom/qom-hmp-cmds.c | 1 + system/qdev-monitor.c | 1 + system/runstate-hmp-cmds.c | 1 + trace/trace-hmp-cmds.c | 1 + ui/ui-hmp-cmds.c | 1 + 12 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 include/monitor/hmp-completion.h diff --git a/MAINTAINERS b/MAINTAINERS index 48976138be7..969c3601beb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3409,6 +3409,7 @@ F: monitor/hmp* F: hmp.h F: hmp-commands*.hx F: include/monitor/hmp.h +F: include/monitor/hmp-completion.h F: tests/qtest/test-hmp.c F: include/qemu/qemu-print.h F: util/qemu-print.c diff --git a/include/monitor/hmp-completion.h b/include/monitor/hmp-complet= ion.h new file mode 100644 index 00000000000..dab21867dc9 --- /dev/null +++ b/include/monitor/hmp-completion.h @@ -0,0 +1,40 @@ +/* + * Human Monitor Completion handlers + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Anthony Liguori + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HMP_COMPLETION_H +#define HMP_COMPLETION_H + +#include "qemu/readline.h" + +void object_add_completion(ReadLineState *rs, int nb_args, const char *str= ); +void object_del_completion(ReadLineState *rs, int nb_args, const char *str= ); +void device_add_completion(ReadLineState *rs, int nb_args, const char *str= ); +void device_del_completion(ReadLineState *rs, int nb_args, const char *str= ); +void sendkey_completion(ReadLineState *rs, int nb_args, const char *str); +void chardev_remove_completion(ReadLineState *rs, int nb_args, const char = *str); +void chardev_add_completion(ReadLineState *rs, int nb_args, const char *st= r); +void set_link_completion(ReadLineState *rs, int nb_args, const char *str); +void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str= ); +void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str= ); +void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *= str); +void info_trace_events_completion(ReadLineState *rs, int nb_args, + const char *str); +void trace_event_completion(ReadLineState *rs, int nb_args, const char *st= r); +void watchdog_action_completion(ReadLineState *rs, int nb_args, + const char *str); +void migrate_set_capability_completion(ReadLineState *rs, int nb_args, + const char *str); +void migrate_set_parameter_completion(ReadLineState *rs, int nb_args, + const char *str); +void delvm_completion(ReadLineState *rs, int nb_args, const char *str); +void loadvm_completion(ReadLineState *rs, int nb_args, const char *str); + +#endif diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 26571d35e84..f17a50a3fed 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -126,27 +126,6 @@ void hmp_vhost_queue_status(Monitor *mon, const QDict = *qdict); void hmp_virtio_queue_element(Monitor *mon, const QDict *qdict); void hmp_xen_event_inject(Monitor *mon, const QDict *qdict); void hmp_xen_event_list(Monitor *mon, const QDict *qdict); -void object_add_completion(ReadLineState *rs, int nb_args, const char *str= ); -void object_del_completion(ReadLineState *rs, int nb_args, const char *str= ); -void device_add_completion(ReadLineState *rs, int nb_args, const char *str= ); -void device_del_completion(ReadLineState *rs, int nb_args, const char *str= ); -void sendkey_completion(ReadLineState *rs, int nb_args, const char *str); -void chardev_remove_completion(ReadLineState *rs, int nb_args, const char = *str); -void chardev_add_completion(ReadLineState *rs, int nb_args, const char *st= r); -void set_link_completion(ReadLineState *rs, int nb_args, const char *str); -void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str= ); -void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str= ); -void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *= str); -void info_trace_events_completion(ReadLineState *rs, int nb_args, const ch= ar *str); -void trace_event_completion(ReadLineState *rs, int nb_args, const char *st= r); -void watchdog_action_completion(ReadLineState *rs, int nb_args, - const char *str); -void migrate_set_capability_completion(ReadLineState *rs, int nb_args, - const char *str); -void migrate_set_parameter_completion(ReadLineState *rs, int nb_args, - const char *str); -void delvm_completion(ReadLineState *rs, int nb_args, const char *str); -void loadvm_completion(ReadLineState *rs, int nb_args, const char *str); void hmp_rocker(Monitor *mon, const QDict *qdict); void hmp_rocker_ports(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict); diff --git a/chardev/char-hmp-cmds.c b/chardev/char-hmp-cmds.c index 8e9e1c1c021..f377e00b699 100644 --- a/chardev/char-hmp-cmds.c +++ b/chardev/char-hmp-cmds.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "chardev/char.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-char.h" diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index 0a193b8f54a..d5712d11b8c 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -17,6 +17,7 @@ #include "block/qapi.h" #include "migration/snapshot.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 2574c5d8b4b..d07e545ef7e 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -28,6 +28,7 @@ #include "net/slirp.h" #include "system/device_tree.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "block/block-hmp-cmds.h" #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-misc.h" diff --git a/net/net-hmp-cmds.c b/net/net-hmp-cmds.c index e7c55d27876..2b24c9e6049 100644 --- a/net/net-hmp-cmds.c +++ b/net/net-hmp-cmds.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "migration/misc.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "net/net.h" #include "net/hub.h" diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c index 32e40630c96..47110ca58c0 100644 --- a/qom/qom-hmp-cmds.c +++ b/qom/qom-hmp-cmds.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "hw/core/qdev.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-qom.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 1ac6d9a8575..2ed95e83602 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/core/sysbus.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "monitor/qdev.h" #include "system/arch_init.h" diff --git a/system/runstate-hmp-cmds.c b/system/runstate-hmp-cmds.c index be1d6769926..02d1d42bf39 100644 --- a/system/runstate-hmp-cmds.c +++ b/system/runstate-hmp-cmds.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "exec/cpu-common.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-run-state.h" diff --git a/trace/trace-hmp-cmds.c b/trace/trace-hmp-cmds.c index 45f4335ff5d..390173095cf 100644 --- a/trace/trace-hmp-cmds.c +++ b/trace/trace-hmp-cmds.c @@ -24,6 +24,7 @@ =20 #include "qemu/osdep.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-trace.h" diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c index 6c93d452c9c..1e9bc77bd80 100644 --- a/ui/ui-hmp-cmds.c +++ b/ui/ui-hmp-cmds.c @@ -18,6 +18,7 @@ #include #endif #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-ui.h" --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774023032; cv=none; d=zohomail.com; s=zohoarc; b=LHWar3zzx9Pop4DDqf4sUL7IJFRdJMlEyRQrmXevuRGX5YKB67B8716Dt7cdQgXBqfVKKob/hZqoZBsC4X6G4XQrkCr9rHrEbK8Sg4FNAqi58sINdcpRsXfHpTMsLtFUDpaGlZpf1zSmjoQUae8j9Ra04CrptOlViCEq5v31UMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023032; 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=qqZSn4rWpHYuunVdESaCorjxnRKhbpVEjXem54koGI8=; b=g/dpwNzIq3sDrTsXT5WjERkqLoGL5D2/Xc7lsUi/lMP9DjC9sSoJsEvH2XX4jo+6dZRV1GJF21qFreTlv8NdW00mzIKK9NmedMSgFC2t/NgjLje2Ro+eIgcTIaBNs9tmxl2UOu1kaVgD6yg4XEUIGW967rlcFTaixf5+8sXjTRA= 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 1774023032984969.7229939277628; Fri, 20 Mar 2026 09:10:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cP8-0000Ct-56; Fri, 20 Mar 2026 12:08:55 -0400 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 1w3cOo-00005K-Af for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:37 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cOl-0008Tu-Tw for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:34 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-486b9675d36so16249175e9.0 for ; Fri, 20 Mar 2026 09:08:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b644bd38bsm7612924f8f.10.2026.03.20.09.08.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:08:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022909; x=1774627709; 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=qqZSn4rWpHYuunVdESaCorjxnRKhbpVEjXem54koGI8=; b=XMdCtTwgAbBytaMlyxQQf3GSwlVFOPBTf6igfBBRHuv5WFhJZPmq9+u/lkWlzd8wkZ dlwwIanHQrHfOoOT0reXKbkWwflSuh4BPf2pv1dZftNwZb1lI5o+ItVzts95pDYBVI2A h2mN/fPihPFv5gmRxj6o+sJqzxtZpsqpIXy4XKpW+JAniJ4HATN77IMdjPfOwPAJzQ/4 QyyNSVuZU5dDRKttp2DMplp0AvAVoCYjRPqAZnLy7xJ5uV0tGDlxL4QWlWTm3dczj4BO mkNsWsLWgN/wKWsYrU6TIEbjf1ZrvLQ3B9m1A0L0yknaloteL4AjU2A1N2s83snwz//9 j7mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022909; x=1774627709; 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=qqZSn4rWpHYuunVdESaCorjxnRKhbpVEjXem54koGI8=; b=K1mv0ann0rGTzfbYk88xB9//+DctcinpEvwGxMZz2JqKSGfsCo6g/Uk/rCLudXsB2Y qqrcla4YKHEPKUg2dgFqr0ux89DkpViquuMKJOo2mIM3qERfEtYWhRromLRiEHsM6CwI s4DSQnUy1lM9IAlflgffEV2CunUuqVvncbY49ExSQr20wQMuevy6UDRXeoLU94KeEu7j zVEEWflkukOlyrfypD22lU6IlUhParue/oqIkVabbmD/d2w7wGTlal+XxZK7Chg+nqVR UWtgLAxrEbNBuDyBVC5ryIO5oqh7GDgq2rtumoAa4dNo9WmUQQTti1ME73YLi3nwDUMY IWpw== X-Gm-Message-State: AOJu0YzzFVtqaBOWvvdNTzJbh9Wakjr2/w4qz88lXHi4pd1wzsusCrGz JZ5iceYKHfcyF3KDL6AtjQEoL63zcXlb/SXYo5hMiZNEYKfCnJ3yfMxPeIZpXY8wNEKUmzoaUNj NowihnLo= X-Gm-Gg: ATEYQzyZrYAeoiDeI587+5jXDQapTCqo7xC17bYFD4duQpRIbM8SnrknAiaw/KdPU0S rrelORClzsbPNeK9rPyvXjMrIEz9CWaNZGfG/uDVKnPyishMToqYJXIOafhKa2wjVXOu74Qki7I 32t82Ok7ZJ3JQTWBkf8DUAx+mGsWS5J1jLLIFJjS37Sc5BjmcJhb9mGIH4OkEfm1MNtUDwe5069 WC3EZDLCmnZNTCMv0hgnvFLqQCwi+aoLJpLjwOt0oDITjaG+KXI8VQP35kYlWUyRgVtHzzYgiaS +WLngyYwkDGf6RZOMzm4jrSPnoMadDLio6UWI0M/o6jy59XJp3ULJg1jrSif/8h8gWig0IET5lX Rw+lXIe/P2vHjRPK03bQYF+wt1B3kiAeIsx1h8WCwtx+SQOy/rdvnSMV6r996rIytHi7VAk67LN jia/EigqHWQSElgW/SFOxYYmK0qkIDVbMWZ4xqNDpdS7M/u7+aQKxhnADIs84Eje4cdwfJ1tID X-Received: by 2002:a05:600c:4705:b0:485:3af5:7e53 with SMTP id 5b1f17b1804b1-486fee04f94mr52097595e9.19.1774022908812; Fri, 20 Mar 2026 09:08:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 02/10] monitor: Forward-declare the MonitorDef type Date: Fri, 20 Mar 2026 17:08:02 +0100 Message-ID: <20260320160811.28611-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1774023035828154100 Rather than having core header forced to include "monitor/hmp.h" to get the MonitorDef type declaration, forward-declare it in "qemu/typedefs.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/monitor/hmp.h | 4 ++-- include/qemu/typedefs.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index f17a50a3fed..a22cab4ae37 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -17,11 +17,11 @@ #include "qemu/readline.h" #include "qapi/qapi-types-common.h" =20 -typedef struct MonitorDef { +struct MonitorDef { const char *name; int offset; int64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int of= fset); -} MonitorDef; +}; =20 const MonitorDef *target_monitor_defs(void); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 416a8c9acea..07f2ae7c9f1 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -72,6 +72,7 @@ typedef struct MemoryRegionSection MemoryRegionSection; typedef struct MigrationIncomingState MigrationIncomingState; typedef struct MigrationState MigrationState; typedef struct Monitor Monitor; +typedef struct MonitorDef MonitorDef; typedef struct MSIMessage MSIMessage; typedef struct NetClientState NetClientState; typedef struct NetFilterState NetFilterState; --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774022979; cv=none; d=zohomail.com; s=zohoarc; b=d/Whid5aQQBYl3sT5aMcOyosnpZfPjWkS/9B01o8ys7Inu4hQ766ZEVvXZee972wY6C+9um4RQZrvirUpFyFBvqN7YHYvKvo1MmOGMh7VYQi6udl7xn6AcV3NGDyVJ5AmmGY24qv86RgGQ9P6EfCXeyoqwQxIjmAUSyLn09uYLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774022979; 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=cjF8TKw+cr/1Oy3sc/nSY2zSxmQ8jlpXSNrnRMQupDY=; b=fbdkahOUMurwuoAhU/lW/L6w9NzPA/RZmAG0YuCMey9eAsOBNamUsJ+TH+qMKbLguXJjKT9cLnREg61d7YKF6UFwBAqjzkIj9CwvBa2r/RyNsWlqWGdPk2zx1bk4eH/Od64f/0HcuJDuE1d6VD7XDA7S9FwgSCPMazshcCnpKfY= 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 1774022979500410.9750726821177; Fri, 20 Mar 2026 09:09:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPS-0000LC-Je; Fri, 20 Mar 2026 12:09:14 -0400 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 1w3cP2-00009C-5E for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:48 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cOv-0008V6-1H for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:42 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4838c15e3cbso17636325e9.3 for ; Fri, 20 Mar 2026 09:08:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fc4d90f4sm125937545e9.1.2026.03.20.09.08.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022916; x=1774627716; 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=cjF8TKw+cr/1Oy3sc/nSY2zSxmQ8jlpXSNrnRMQupDY=; b=hhGLtYiSEJDZ4InXb6EBBlwu6XKJ1QvtSyf2vmFaBULZWLw2L3nCR2HA/8YSSj7DLw yyorR1zd8XJg+bfy/v8gbKhjf3+uclaI9+BQybnWxPhDYHeYw3+M/h47AKfXKgmH7G1c hidmJguCD/tLSQwHwoB88pIgK8r3Twf9tDMc6ufVrJbnz3g2mbC0ginzimUAK4ohBYbC GaIWa4Y+EG/yVvBQEiUCg3qaKeaoQd+FKon5cNYL9Gby/aEUkr7rvN0HrZ6VldJCNX89 DlL90RPbi8cFXLz2CInHzcB2AencuHjIRezloaSsqtzCpnOt5yd+Hp42yZpNoffTPZcR +LFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022916; x=1774627716; 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=cjF8TKw+cr/1Oy3sc/nSY2zSxmQ8jlpXSNrnRMQupDY=; b=ViHUL2PVKcedBRIexeFCe4Xbj4BoabV0U6QF9u4diLwKvzpzOvZQ0DdtduAAQqz3Za 4btvRBqSYggoKLlbHXH/BmhlvqXqZQ5drHHZMFRqvRGPUOOq0TMOaZhcKNfI8FBZ4P56 MDjMWw0M5ZcgIjfoHqIuftgM/9Lsa9SZJnqxAzw7Nek4lhL0vueaZblaVFWLsFfYU4cM gC4GVPkbnUBvC3G2QQbLAnN/hT9uuZcGrPqS/0u7iozIzdjDVlBITrCavb95iRztPxFo t+N1ha+xzJQ2Kgl0GSNpZiCngR/m5syyoZvDUPb0aDmoevM3M/CF6uTlMN+KdHdqYGUw g/yw== X-Gm-Message-State: AOJu0YzhXQsokPACZYChnmYe7iiuebJtRGKZh1iobFGfN4/Jguy+Gk46 zdR0+1qF56a0Ts3++BWF2FDyDJBuLiLYoYCo0mu8Gp3rvnIx0qy2E2Ec8eYQU4TjCpf5UOmbvFL X6lenaDI= X-Gm-Gg: ATEYQzxcc/BpwpWWcW+38isUdERbyao1M+JmaRsdc+dCzjikZXNx10i8tD8i5N0Oy35 kVsR3OubhHj6ZC4Pi/aM1mBlXLIYoxLU9M7k1wuqbSbSIRgDTFODVTIxAZTEuUeYXxKZx+h8j5b LyD/xHAaMBe7eGoVQtTkXnnG8BJz8vqkcDvYBwP3Opg+g7XgVFmtY36ljbIDQQY2/oZ/o9duJ68 Pr2lH9zELGJ77Jiq1vHIWYQ4vPKIcHGNvRkI6W5kWA6EznF05LGFCYxeFpyiqnk8HwEo/UyKO9T cgqMfNgQFwdiIJSUaFZQQefLmFskIAmVvbN2+e62NmQzi6xeTY/ERX1+6z2G7vzCXLRMUmAdmwH NGu6vrrtLkmBNjSELy9RXVyEIbhsyELRIKH91NHs6isOlPOfMceRgJbqC8bUkAcZwVzuWCgVwdD xOUnGS/3lMLAJF+Smvwukomc6E5Hs/XNLqV/w8iqD/Uu3FHXN00LOdNPVuP5nyX0PDIaFaZKEo X-Received: by 2002:a05:600c:a085:b0:485:3ec6:e634 with SMTP id 5b1f17b1804b1-486fedcc6e7mr56899415e9.15.1774022916268; Fri, 20 Mar 2026 09:08:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH-for-11.1 03/10] cpus: Introduce CPUClass::legacy_monitor_defs hook Date: Fri, 20 Mar 2026 17:08:03 +0100 Message-ID: <20260320160811.28611-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1774022980542154100 Allow targets to register their legacy target_monitor_defs() in CPUClass; check it first in get_monitor_def() otherwise fall back to previous per-target helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 3 +++ monitor/hmp.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 04e1f970caf..072f58bead5 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -148,6 +148,8 @@ struct SysemuCPUOps; * @max_as: Maximum valid index used to refer to the address spaces suppor= ted by * the architecture, i.e., to refer to CPUAddressSpaces in * CPUState::cpu_ases. + * @legacy_monitor_defs: Array of MonitorDef entries. This field is legacy, + * use @gdb_core_xml_file to dump registers instead. * * Represents a CPU family or model. */ @@ -174,6 +176,7 @@ struct CPUClass { const char *gdb_core_xml_file; const char * (*gdb_arch_name)(CPUState *cpu); const char * (*gdb_get_core_xml_file)(CPUState *cpu); + const MonitorDef *legacy_monitor_defs; =20 void (*disas_set_info)(const CPUState *cpu, disassemble_info *info); =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index c63da13e310..a2b6269d0ff 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -24,6 +24,7 @@ =20 #include "qemu/osdep.h" #include +#include "hw/core/cpu.h" #include "hw/core/qdev.h" #include "monitor-internal.h" #include "monitor/hmp.h" @@ -1603,8 +1604,8 @@ void monitor_register_hmp_info_hrt(const char *name, */ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) { - const MonitorDef *md =3D target_monitor_defs(); CPUState *cs =3D mon_get_cpu(mon); + const MonitorDef *md =3D cs->cc->legacy_monitor_defs ?: target_monitor= _defs(); void *ptr; uint64_t tmp =3D 0; int ret; --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774023103; cv=none; d=zohomail.com; s=zohoarc; b=noKPXDtZp2gnZUwO6UQaWUrlMoK66z1FVIgRD5Z0qCiLD9UwGqy5OQ70YQFpjEjT7kCjVZfpc5qyeBEsbyu2E9DfKHLJS5QyJvSzPH4X68UOCaHI/7Riak8c3Z47QxTwlm+qRy86wtgUjabU+UGo2/xf+hOm/4jbTx9cd50c8/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023103; 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=MxangKbcKg6DThVnOgtvYQODpyhNQKOeoUuVdNKo2bk=; b=bA7ShXI1z0/ATDYFbea/mDmxWX0gETc6N+p0/CNUvOrVfqnuho1NCdS7C3gwA0hfR03d5xHhuG6AyEvCHBm1SxJCYtjcPxy1qH5wpqbBMiySL20CwbVSE7l4eZlslRbosC0CnbM0er3ciRXJsvqx73XGfKukAAmH/gIO1Epnxmw= 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 1774023103721102.53307066055925; Fri, 20 Mar 2026 09:11:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPV-0000Ol-31; Fri, 20 Mar 2026 12:09:17 -0400 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 1w3cP4-0000BY-Q5 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:51 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cP2-0008WI-1P for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:50 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-486fd5360d4so17701165e9.1 for ; Fri, 20 Mar 2026 09:08:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fe8359acsm70490645e9.12.2026.03.20.09.08.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022924; x=1774627724; 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=MxangKbcKg6DThVnOgtvYQODpyhNQKOeoUuVdNKo2bk=; b=zk4IhcwnzNRB3cxoebI2usy+TH7RK8vxCo+JxV4RUDUaJeBjixPAcG9P5sAFQcnFG5 9ARaZ6oOAr8uGa9cYyKw41MNKjlbe3FLYIKMSxIoNWVCO+5JLia71VbY0gofk+blpMnF xwQstsn9qO5RaU77FK7G7V/9KwXT7WaDPnmchuIQCu1zmR3ZF3PF1cEUEouAP7yJD254 zFlPgyLar6S2wSSIit4f6TjnPYAzWjAZaS6OC91dw/FZscZDzXoddYW9qeFkpyTrRVli MxBHvbOirgIGoFoXN85xBhI2STMqpWKnqOiEMnWmQAlJjaix81BxG7ZgBn9tG7j3aO5C Td2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022924; x=1774627724; 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=MxangKbcKg6DThVnOgtvYQODpyhNQKOeoUuVdNKo2bk=; b=bvgveF+JNoySH8CbBXEwZcfws/NvuEmU/jctorplwqpSgj3BlNnRw9iAFXi4YsF/O/ XFHilaOOJpH067RnWI9J6yARFeEoTT1mas6twRpD3buCJlJAGwc3VcT7qOQfko/UKK4/ VmWSs8AUa4Gx8y1kAYmLV9xN1Ze6zzeAuIBfznmJexgpWzVC8kw+G7OErozpuLFWRaSi vZ3+FbQR3pP1Y7tdOrWsn0kCR1EqpvWMLG1Ywco2+v0tyL7D3Ej60lw1ixZvs9skUmk5 hYd5+mCNuLD4E8+264Ecjc0uuYeD68KN81yoHBjX3zTMFLCojo0kOTOqgwbjkuyl26VD VbAw== X-Gm-Message-State: AOJu0YwJ/UIn+EjAWt5yyXGonGahpifG+yEKABUDvS9qcgfpY+Pikw8F FzDBiQMF20uOx4P5UvZybi3LXHoZU/ztGkM6qZ2j1qA6ocrTff+rYH31EYvJA7JQtfipKCuIuk9 Pnk/R11Y= X-Gm-Gg: ATEYQzyion2WQkd5pIE5mmYjmQ8XwaW4PWeQC6w62+XMHeJoDFz5nIVK2QdupuzCjZS ENTfsWc3hbJexkEjQbvJcWlU8c5Q9RbmIsBFQXuLsOg2ac/51nG9pSGL2Xwym3F1KBri1aQoYjm dCBvi4PjkKZYbqasddvlNSKwUZt+0ZLYZ1nhsfuYa81Yly07zM8y7+hM3rJ/0wziCjnWoVJ4tXH rJ4azo/KXMYmAU+r/FdgergdaR+3R5tkIUCbHy1fN5M3kc0r2zXeebmkpLYY8E7duOpk1nCGcCF C8RUIYI8Hu6Ybl6b6T/xXqXSqgq3Ny7NibZuPDmw2aFWyLxqETkUaAWSwdIBNKPqhjTUzLFIbuQ 6olCskY/EX9QPRrSgukb2jwlHgVaJDw1n8gEvIDqYT3StkUVh2DgIivdUba2/Pb+5T//bcrOxwF hgIuyy7VH8iDTGYWxB1P4QR5c1TRXIeNL6NpT0MRY9WV9i2s6TNg3Q9X8CM4AEKtBL+AH4RO8K X-Received: by 2002:a05:600c:46cc:b0:485:3b9e:caa7 with SMTP id 5b1f17b1804b1-486fee230d1mr51481725e9.23.1774022923353; Fri, 20 Mar 2026 09:08:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 04/10] target/i386: Replace legacy target_monitor_defs -> legacy_monitor_defs Date: Fri, 20 Mar 2026 17:08:04 +0100 Message-ID: <20260320160811.28611-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1774023104510158500 Expose x86_monitor_defs within target/i386/ and register it as CPUClass::legacy_monitor_defs hook. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.h | 2 ++ target/i386/cpu.c | 1 + target/i386/monitor.c | 7 ++----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b0c730b3390..7420ee3b8ea 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -34,6 +34,8 @@ #include "qemu/timer.h" #include "standard-headers/asm-x86/kvm_para.h" =20 +extern const MonitorDef *x86_monitor_defs; + #define XEN_NR_VIRQS 24 =20 #ifdef TARGET_X86_64 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b5e483e8cd2..c5d9c51c1ad 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -10745,6 +10745,7 @@ static void x86_cpu_common_class_init(ObjectClass *= oc, const void *data) cc->gdb_core_xml_file =3D "i386-32bit.xml"; #endif cc->disas_set_info =3D x86_disas_set_info; + cc->legacy_monitor_defs =3D x86_monitor_defs; =20 dc->user_creatable =3D true; =20 diff --git a/target/i386/monitor.c b/target/i386/monitor.c index ddc666d3451..9a0cc73bbf4 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -599,7 +599,7 @@ static int64_t monitor_get_pc(Monitor *mon, const struc= t MonitorDef *md, return env->eip + env->segs[R_CS].base; } =20 -const MonitorDef monitor_defs[] =3D { +static const MonitorDef monitor_defs[] =3D { #define SEG(name, seg) \ { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, SEG("cs", R_CS) @@ -612,7 +612,4 @@ const MonitorDef monitor_defs[] =3D { { NULL }, }; =20 -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} +const MonitorDef *x86_monitor_defs =3D monitor_defs; --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774023111; cv=none; d=zohomail.com; s=zohoarc; b=D3bzaPKrscupBKSfgsBWXoUkNV7xtK2hFjVejCFEWEWsvLHbDnLkmJjRcI/ZuRigA+ApFc+CkLGLNIdqXqkt69IWp5ZKYZlQ+NHslYi2Qd/feaulIzN1cZUSJlWU65W2nG57HW6pw7PDGqJsN/Gc9wledx/U/qf2HIDNl9Qbgdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023111; 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=FMnOlXN+D9n0MPCt+seKokGBkveTPzJtDpLcR65ZSEc=; b=e2A7YPyxY84Ah1Gghuflf8bXQSpW2HjDWjhv9WnVg6muGDnaiTyu/wRSeh3hcm/uARSThsgZxp8rKS4nigxlIDq3Is5gagG0c8rL/zf9MqmfsFoMyLD7BqE2+gfjyaFeaapCBx3gdD1xB3zBB5aY2M+jK59h5T1mIDPZdnB3JnA= 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 1774023111903903.8104447177484; Fri, 20 Mar 2026 09:11:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPW-0000Pe-8j; Fri, 20 Mar 2026 12:09:18 -0400 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 1w3cP8-0000Dn-NY for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:55 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cP7-00007S-9j for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:08:54 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so6552095e9.0 for ; Fri, 20 Mar 2026 09:08:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-487017210dcsm36789405e9.10.2026.03.20.09.08.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022931; x=1774627731; 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=FMnOlXN+D9n0MPCt+seKokGBkveTPzJtDpLcR65ZSEc=; b=S2qcYzGOZPpL+Om0M7jlqMo1QWTfckPd05XsX4EHcN1UAzvL8FwvV/hBQXhf/Pmi4H NWnz5PNHE6ZYZO8o2j2Outp5vljHEXaSm4LmRzsv+2v54zFuk7rog+UmCxH2H+q40O9T 3KcGsxrl6m90xek4tllgR5krDptCfbmQdpEeYppP5yTE0jFpPPYmsoS4MSn56bBnYxwh OakDKBJstoDhhpBNfnFf89yLIdpWm7SocOfw33MZ75aR7GT3T9g4mu45PaLa7MpfBVaM ATcyDYjzBKq7m0Wvu+P1DDVxw8x9nLFuXMoMVGhXdbD6FLJIFbvemhvJgLkCCyvLf98E uWyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022931; x=1774627731; 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=FMnOlXN+D9n0MPCt+seKokGBkveTPzJtDpLcR65ZSEc=; b=dWpEPOoTKFjpwGy3OPvI1G1qlqlvAt0EQqpAYuKmDAbIu5+rAQGGhMLJPTw/DJWfwc OWaGgWcAb4T1CVo75wkQCIKWrLoFYN2WTuIKjuR3GwBYzQEzfQBS/vkm5Db+OiIHcfSV C8dhS4jSdVQNTSoAD5xKuZAsCE7ZCKCdGaAaDjOc0GxJGAXBtXsqc3MKYLV7em4OMBVE wEyiqMDe0ymy48xoL5VtmYYNHspK5oSG8r95xZxnmNB8eMwgd+OKq+3qIDIHyDgrI3cg cHT7OLOy9sh9o2asNQSNYZQag8+y0vT8EbCfhH6ZD/TcANPct2aD1zIm95HXMK0oc/zH R4dQ== X-Gm-Message-State: AOJu0YyHZlFCdyeOC0dVej2N6zhGnD9G4zt+EqWeRShpfCGnCihpT3qm /avzIwrQW9pNZjotOOkCy+gxKDeEj/BYPTlS2SgCuwHOq/up8l5pkhVWsLs/pv+rCYUWnYvjtvI qir2CFHE= X-Gm-Gg: ATEYQzyliTnRBB7IPTW3Czzcym//0t8BK9PgGlFFLvneiL10Gi5XpL5hIzJ7GIPGOGP Z+2rBrYXWpqUL4Jlgl1hBz0o5+Ib3vl+eayY5qAgB63RtaUt6pCS4jRegsdLLquWmMEb7j6s2SN aOvXoh0QI5OjB5RAr71sf+h7XGUBVJuZICVLwBGEm2QNjAchWU7umLOUF+zBSVPZAQVE7S2lSIX APmN4BdibaJq9+J1vxLs9yfblWj4N/FJwLPIdCUjFnZmub2JaQjZaTVX/QWW7U4Vsmu6kHJgZtK PbOjZP60m2stR/WH8fhJH+hnxq0KlsU1l5NUX7CokGjnQ78QXFmgN/VdPyyUv7FG/WtygUxWdPK 6nlrzLYOyCSBUUj/Dx+OmuAcCyXyF32SoMvuAMHXBfCIJl5WIeYykL6nqPs9yrboIXF/BnBYyKR h1BXZT9mNAAZjg+g9oF14kZCfWQ21Z4KMFAOY1hWy60Vq7WYJV243ZskwfuZloDTK4ZQZssGgz X-Received: by 2002:a05:600c:8b0a:b0:485:4136:99a8 with SMTP id 5b1f17b1804b1-486fee0fb9emr55283885e9.22.1774022930523; Fri, 20 Mar 2026 09:08:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PATCH-for-11.1 05/10] target/m68k: Replace legacy target_monitor_defs -> legacy_monitor_defs Date: Fri, 20 Mar 2026 17:08:05 +0100 Message-ID: <20260320160811.28611-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1774023112626158500 Expose m68k_monitor_defs within target/m68k/ and register it as CPUClass::legacy_monitor_defs hook. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/m68k/cpu.h | 2 ++ target/m68k/cpu.c | 1 + target/m68k/monitor.c | 5 +---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index d7f508a9e80..6f19b53158e 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -26,6 +26,8 @@ #include "qemu/cpu-float.h" #include "cpu-qom.h" =20 +extern const MonitorDef *m68k_monitor_defs; + #define OS_BYTE 0 #define OS_WORD 1 #define OS_LONG 2 diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index d849a4a90fc..fcb14a44793 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -655,6 +655,7 @@ static void m68k_cpu_class_init(ObjectClass *c, const v= oid *data) cc->sysemu_ops =3D &m68k_sysemu_ops; #endif cc->disas_set_info =3D m68k_cpu_disas_set_info; + cc->legacy_monitor_defs =3D m68k_monitor_defs; =20 cc->tcg_ops =3D &m68k_tcg_ops; } diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index be7411edca6..97ec2bd38bc 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -38,7 +38,4 @@ static const MonitorDef monitor_defs[] =3D { { NULL }, }; =20 -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} +const MonitorDef *m68k_monitor_defs =3D monitor_defs; --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774023117; cv=none; d=zohomail.com; s=zohoarc; b=dbZzy1b8K/0qz9IhXZzM7SxPENwcjR74bkI2gLtaUrHHpxlMqcfledU+6qbbQ7B8cCd2X4qOhi2mhzzioOLrjNyVDNe+XBrAnoSlPYzYK9xoc1d2OUbZ/fE5i/wV2A0tF1b9LZCsoyEyE463r+qYYfM4RgtfsOvINvnhLnoFO+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023117; 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=MlMfDpt1UrnWvCHRhzu62WEH4lx9fXnycrYi+XszbCY=; b=DitT1ZaNP0zzOz0kx2cukXoEJMj40bUDueGPxYa015esLTRX5UGqlKlwH+yQK4zL9AT8poumSht9krugWEELwAUNKJ/8xbi8JsDz49OzS1ClV9SIpg+f1rUzuWpEpJM1N5RnS4hhx+onml5L7hiBMYt3br6qvsoGjCYibbALieQ= 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 1774023117576514.6248217762179; Fri, 20 Mar 2026 09:11:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPa-0000TF-On; Fri, 20 Mar 2026 12:09:22 -0400 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 1w3cPF-0000FF-VC for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:06 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cPD-00008s-Pv for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:01 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-48538c5956bso19268745e9.0 for ; Fri, 20 Mar 2026 09:08:59 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fe7e2665sm82629185e9.6.2026.03.20.09.08.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022938; x=1774627738; 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=MlMfDpt1UrnWvCHRhzu62WEH4lx9fXnycrYi+XszbCY=; b=lu/w54jb97CXZaYjEfQCZ1Qti4cfIETEn2ej6NP3H3rsHkAlZXbTHSFrjYMzXX9UjB I7pPb5avVLcJX/nTq5QGKwEq5qU2R/KlrQppJDoPbk3T74Eq4DGii1GyYGMwIVwAhkf3 nXFbCX7NEfrwOdDde6aCkX2OcCMCDFSmpYsQq0w5UERnTGEeFIpfEFiX72ZNn5uNnouo t8BuNrHINgiig6RY4ejx23Ji4ugJC3QL8dyuFiUfR2PZCjqQG+eqCIi5QAR6YZ+BExHb jGO//TP/mAvMEkHjuuwnmZc6la2ZU/fSkV54LfKbRhIWpg1c2QAAb0BJvHd7fM67Wlr4 r8lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022938; x=1774627738; 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=MlMfDpt1UrnWvCHRhzu62WEH4lx9fXnycrYi+XszbCY=; b=kE7Kht8PxdRy84MGmb3iNqjqoOAFx/pWxrf1sARrE/H80uNXSKuvzcFPtll2NYqIGB P/gw5OZ6vgQHAyRKC/67e+zWIZkKOhztUOW0fXE1QNzkjQKK/V3iVhyWkQR0O4d2Na/n zHZUXxaOGZyHf94wV5dQZ6JbOOcwR1CRtMtDK6dxhtpJ1+iBGju1NFZjXI/4iDmQUPxd hQWk8xpcxfnzk42FC1m/xf95359evaRIdhGdIeWfF8YAy7kbIf8WsUbiPRJjOaDuWjQN Vb73/g0VqRTnlddFKx+ZPWtUj2Mr1DZd8I6CV4WCkzyf8ZO7ykGowlafj/FP4AncjMeQ 9eqg== X-Gm-Message-State: AOJu0YxzeMU7cFpNjzGZQmKylgdgew52ufx16DVEsPpELOmTzt1VuQxl O3onudLZghrxHidvIeZCaICqemXtbEUVvK9KizQXMf4nESjW2A+A7HUeULrbirNUKih5H2AYanC 2Ba7Abfk= X-Gm-Gg: ATEYQzzoAOjowMa0ktJIQdfUd4D73exMCylfeQWrfB9jM7fuWif80+2vVxX5r55rapT vNFdedbIn8rOzcsdzgwl6GyIw/LOkHFD/UNA9lmmMLtsOhNhxkPqtQgLBQhcfxGpNYcKfGrbXv+ 8JzPoHFqejUxpMSNiZP289kj9o8IVJClCgimE9wl/H556bEa1PlTFXptFjffJvPKMViYNRi+8aE BKo8b065+g+62sc7VAdHDLT5eEZZfSR7EteveOZ0uZn1OoglT0c3WW48ezxoik6UBq7cJ7a84vx DGaz5BE1VrlSpOo/CarM6XWipmKQMhm6JK+8KC84RW+u2SOO/uq5r+iK6kGucF7lWGQF/ZgjgLp oXVcm+1HYTy0yp7MWXHPxH+E1OkafEffXnBNZydz3umU7IFNCKCtHctHh1105nDvL7QNZILi+XV wg04mY40YSgY6S3ZzVokWsE28wWlHgfHebi4xC156agRAbmHzNUCt6obyxdWvtQnFhbkTHvvGz X-Received: by 2002:a05:600c:3483:b0:487:12c:e7ea with SMTP id 5b1f17b1804b1-487012ce938mr37256925e9.5.1774022937693; Fri, 20 Mar 2026 09:08:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 06/10] target/sparc: Replace legacy target_monitor_defs -> legacy_monitor_defs Date: Fri, 20 Mar 2026 17:08:06 +0100 Message-ID: <20260320160811.28611-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1774023118926154100 Expose sparc64_monitor_defs within target/sparc/ and register it as CPUClass::legacy_monitor_defs hook (taking care to not register it on 32-bit SPARC target). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.h | 2 ++ target/sparc/cpu.c | 3 +++ target/sparc/monitor.c | 9 +++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index ac0eb9f0faa..83f6859019d 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -7,6 +7,8 @@ #include "exec/target_long.h" #include "qemu/cpu-float.h" =20 +extern const MonitorDef *sparc64_monitor_defs; + #if !defined(TARGET_SPARC64) #define TARGET_DPREGS 16 #define TARGET_FCCREGS 1 diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 1493336e7a2..65468ceeb78 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -1096,6 +1096,9 @@ static void sparc_cpu_class_init(ObjectClass *oc, con= st void *data) cc->gdb_core_xml_file =3D "sparc64-cpu.xml"; #else cc->gdb_core_xml_file =3D "sparc32-cpu.xml"; +#endif +#if defined(TARGET_SPARC64) + cc->legacy_monitor_defs =3D sparc64_monitor_defs; #endif cc->tcg_ops =3D &sparc_tcg_ops; } diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index 99abddbf1e0..377c2b18cab 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -38,8 +38,8 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) dump_mmu(env1); } =20 -const MonitorDef monitor_defs[] =3D { #ifdef TARGET_SPARC64 +static const MonitorDef monitor_defs[] =3D { { "asi", offsetof(CPUSPARCState, asi) }, { "pstate", offsetof(CPUSPARCState, pstate) }, { "cansave", offsetof(CPUSPARCState, cansave) }, @@ -47,11 +47,8 @@ const MonitorDef monitor_defs[] =3D { { "otherwin", offsetof(CPUSPARCState, otherwin) }, { "wstate", offsetof(CPUSPARCState, wstate) }, { "cleanwin", offsetof(CPUSPARCState, cleanwin) }, -#endif { NULL }, }; =20 -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} +const MonitorDef *sparc64_monitor_defs =3D monitor_defs; +#endif --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774023032; cv=none; d=zohomail.com; s=zohoarc; b=i21bkroxoJ3gMGUk5eQqxXceHhuIwTty4Kfg5ZbeeWoghe3E4bxvJOyIj0ZyRb7CkZHOyNKHxxqo2crHWxMBBgiSoEhJhftyOqOKanlri/Db75XDITI+qagoTQbTgfFOgrFy3WJ1l3UkLOki8PZgvPdaiJTEoW6ZSshmRBMU9SI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023032; 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=XSHR+Q0/Lx+3SnuhBRTWXv5gGgManK5h34FNx34FzIA=; b=IAzOdct7Adr39YMxAJgALs6Bz5Sz9ZAqVAQfKB86vEEVcW+xmOFFXV1iEYTY9w0jH6oLNEiIX40bkJ08gJ8akBuLt95DtXEMP6b+sW6uq+vDot7AKLFUsOSk/2F947HFdCz0pKW/iX4VLYpaSzcl1yKlX2w++rQtwd2YLM7p16Y= 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 1774023032987711.4568885405622; Fri, 20 Mar 2026 09:10:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPo-0000YE-K8; Fri, 20 Mar 2026 12:09:37 -0400 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 1w3cPN-0000IH-7H for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:09 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cPL-0000AK-0R for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:08 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-439b6d9c981so1472999f8f.1 for ; Fri, 20 Mar 2026 09:09:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b644ae132sm7433997f8f.6.2026.03.20.09.09.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022945; x=1774627745; 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=XSHR+Q0/Lx+3SnuhBRTWXv5gGgManK5h34FNx34FzIA=; b=RhPSetb4x/hd9Um35A9PLjkg7I5AoEJlPhPxtc2RnmMbu2nAQ+TKh7EtOHeish7eEs qL0f9tw+mUdoGx6DnZCbDwaGBzdX96dRoPntxj0TzM688CchpqGQwymTH0LOV3tn1Z6K GrneQ5x+zqmtcXT/ZDwN/EFc97RJqvJ+yOJ21j+Ro22qTGc1wBtcOf0nSbBRnPEHSh55 NsQmiqc0xHcRA6FgzCubIJw2BkXDl5ZcHyuSNPDCZ+nCn7I+89blx64VE0bdgOjBRC6U vXdMc5DQga/2+M22Vt/Xx9DPevVxjts0wcbiv0pFdwOOrGmcZWZBovEsBfU62fa8lydf a8+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022945; x=1774627745; 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=XSHR+Q0/Lx+3SnuhBRTWXv5gGgManK5h34FNx34FzIA=; b=X18dtTD6o1J713uLUcQxNAzB3Qi2ZWchvDsaVdgKj55xo6byo/zQVpaWdXtfVlZYVm Th2YjHh7e02DVdQIbgdr+rIWHNZJGQwVPn0yu5eyPdteom90CX+OXIYTpmxozfUlMDM2 NWJAp+PwbLzQAlmglgq3T7boAsRnnShMPg0W2OB1LmLkAxWS8iDTTYB63FwcW7diT5IS 9UwuQfvfPpnAfF/0gv6vICzArLGyVQUgVm83xbXejEqw69poTis8Fr0Za1xUHa81FnzU QLwRg6Yi87Mxy0ajGDiIHhKadqi3DviDw6TnU9ptykU61OmcjbpDBAdcHge2qytky34p fwnA== X-Gm-Message-State: AOJu0Yx2oipQVR56/kUgPHnYtxQfQh4+Jy8ybVyo0lAoJFAS5uiaiKfV qLL4TO6WVTPOyZu++7QjoVLsZarUzlMJVoWqNTmyO81HyG6PwCJ9wOZCNmJPDEWXSjPV38uchss W6km7Lj0= X-Gm-Gg: ATEYQzzz2yjdRNatbYYv2q/ikNpuew1fiaA9natsu9hktsL4EhnyJydQCM8jh5FbWWY Ku0fzGoJuABdXVG1CdJslFuUkuQJQ0jfsb7UdvR2BFZJVzEssxldm9TG0wjZ5WaXplpbdNuF8DQ QuTs6cTZJA8EBIAlfBNfI5S4BHgXRaSyXUTR2P/4ZLSrVpBaKIUT2CiwYeQ4hqNPgfmqikOyEI4 y1KaxyRDO08OD+PrlhvemfppvORJjdHYkbBsjY+Nvvs8KCJ9T/uehC0qloqC1l86l9X3lO60WrL Px17Nu6CyvDkNswZEJbxry9PpWjoSpo8dNxQcjXT9hDzmIK2yltyTDPEXiEdbhAcoDCQGglMyr4 05G1HUFiJwYTYFNytqcjEM6qjNhp58c1kntlm8Hrif1ohFM/Bz8vwJ435w934ZiLwVtSG/Jl1gx 873C3tXISh4jY5gnY5dBJZqYC3dxfG1gbkcffB/qhBNiEoTs9dhxzy3FujlqjQ/eZDqIyIbhwr X-Received: by 2002:a05:6000:2f84:b0:43b:5462:1807 with SMTP id ffacd0b85a97d-43b64243233mr6619827f8f.11.1774022944644; Fri, 20 Mar 2026 09:09:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 07/10] monitor: Remove target_monitor_defs() Date: Fri, 20 Mar 2026 17:08:07 +0100 Message-ID: <20260320160811.28611-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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: 1774023035841154100 target_monitor_defs() is now only a stub. Remove as pointless. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/monitor/hmp.h | 1 - monitor/hmp.c | 2 +- stubs/target-monitor-defs.c | 7 ------- stubs/meson.build | 1 - 4 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 stubs/target-monitor-defs.c diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index a22cab4ae37..ea7e53060a0 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -23,7 +23,6 @@ struct MonitorDef { int64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int of= fset); }; =20 -const MonitorDef *target_monitor_defs(void); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); =20 CPUArchState *mon_get_cpu_env(Monitor *mon); diff --git a/monitor/hmp.c b/monitor/hmp.c index a2b6269d0ff..6dfc59725c2 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1605,7 +1605,7 @@ void monitor_register_hmp_info_hrt(const char *name, int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) { CPUState *cs =3D mon_get_cpu(mon); - const MonitorDef *md =3D cs->cc->legacy_monitor_defs ?: target_monitor= _defs(); + const MonitorDef *md =3D cs->cc->legacy_monitor_defs; void *ptr; uint64_t tmp =3D 0; int ret; diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c deleted file mode 100644 index 0dd4cdb34f6..00000000000 --- a/stubs/target-monitor-defs.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qemu/osdep.h" -#include "monitor/hmp.h" - -const MonitorDef *target_monitor_defs(void) -{ - return NULL; -} diff --git a/stubs/meson.build b/stubs/meson.build index 7189ff63ed5..10eb68ab55e 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -75,7 +75,6 @@ if have_system endif stub_ss.add(files('kvm.c')) stub_ss.add(files('target-get-monitor-def.c')) - stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) stub_ss.add(files('monitor-arm-gic.c')) --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774022980; cv=none; d=zohomail.com; s=zohoarc; b=huEPfPej3vGVuaSIQJLjCnw0rNs2UT8+dxwY4SegfVeDwQiEq7OIAMuD0noq0qhAjMoDo+fJOuUYSCKI5+jQZ/YbPUYrIpZEShg23tOZ+JW6Vfe+itHmD2+fWVO1F3/xxbaidLkOHRiJFYEkPf87hhNLUBAbI7CW8Zpvo3jXhv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774022980; 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=icGx1lKtn2JaeqNOWfyUHnero/ZziN4kze8hbSKogNs=; b=hf1gOLr1E9z1TRmFVGFr6AzJGYwsE4i/Ts6H4/ymCUO8sjrYXQ9UffWJLCH8T5illV3xvsncBQUwPHgGl2u00yUxtLd7daf8GQ5uhFHx/eFREEdiBW2OAiivoQ0LTlgM6vSlc6X0dpFIO1Dfd0KfKfwkol9nxhY8VbcNqCuiG/I= 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 1774022980916806.199226286664; Fri, 20 Mar 2026 09:09:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPg-0000Vy-2B; Fri, 20 Mar 2026 12:09:29 -0400 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 1w3cPU-0000OV-Jz for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:16 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cPR-0000BC-ST for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:15 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-439b9b1900bso624140f8f.1 for ; Fri, 20 Mar 2026 09:09:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b6470393fsm8059695f8f.17.2026.03.20.09.09.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022952; x=1774627752; 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=icGx1lKtn2JaeqNOWfyUHnero/ZziN4kze8hbSKogNs=; b=yWaFrriQ3/q80clj9oiZGd5iiHwCr8NkOCndjOPNqdcV/fbfTy/IQjuDRFQVPruVMa xezUeBDIEznFfraW1H5NN+bF+iOyTNmr6xirpbVR+vR714lcVMEoR9WSS0aeT22F24I3 wcGWuePWS6oISkSBLtYPWwKWkMvqJgSQ1NkkGn3PpWZZ91vQ+BUsQGIjEBOvYvR76OXP YShYQS9Jv1frMwnzV7BBztoETgfj5OmCyK6YluFfj6RHW06YWU/JWK0JIRJ7kXzMVWrR lUpQ8ohsxwmOlf2EFUbJiuGG5M/4mp02p9ZcMLjFm9iuxeKs6ULnGf/+RKRQgl/YTyNS upkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022952; x=1774627752; 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=icGx1lKtn2JaeqNOWfyUHnero/ZziN4kze8hbSKogNs=; b=QySs0aBfjhnOdcjhWpFmoNNCsBg3lyzqze4auEOGyT7yga8f9tehO0Ws1OBvvgbnsq FVcLQyLb4vE9GEKVDD4PZNn8H5PT2+fF+9w/pLBA7rEUgXPp/o4oHrVEGJj8drj6zNY7 AoHoE9G1xQ0rtQ1wS9esqUyfrKkWK4HdiQzUkqnog29aIzwW6G+Isny4x/2E/7wvhCWZ RtK6wRxeFK51q+TpuODObrrDTw6OKjyzhTITKSOn/5pyyNDgNZLBQlhAdOzYsd4pgWN4 zWIh0gCkpgUypadl3T46Fg6/wcetM26uS4PEkkvpGzkLgB0HYFB22RrYBpzOTdCJde9H PH3A== X-Gm-Message-State: AOJu0YyPLjUREHeZPcJ4nYEd+Htyxa0VXC1GdPBO6gCud3zjLOrviHar hlkT7sOnX4YW1JqbkFLGNMEEvAsjNrJRjHQPggwh1/s6FBZ+0quTXQeJo+EBNiYlUKVOCGuDsHx k11jgR1w= X-Gm-Gg: ATEYQzx/6VBpH1NJyLlrDc9rSHlQfVDJzdnSIhP7qNn+baVcI3FATnjgDM5SBcXdgy5 NztKZHtjMB40rOU7NszP8KORQD9kDCN9emsvfd5dxSD+zbE61f2eXBQcqlrVZ3IMvp+cetSsHx0 s58/RK/YpWntOYepLbaGgHcl3PvuwLHR00T6k/KIt7l1mZLvLwdB2x46Ltr4A3oIBGW+hm9mUuV 5aK6Eoh2Iwq93P774jt+BRfS4aYD5xyhZq5CL0+LMUvjQZeGesv1xhUl84a5R6g1UN/d0L7flWm VWaqcKfFRbft0tNHQB69fKe8+XtxE1W7aFaeduBYptRK7wMwWFNBq90ioN2pwp5op3HKYwO9vrH 1Z8lICi+tcWUqVw6Fl9SSuMbyupSPATmX6/2W6N7XV81oFRnLr2qFp+gc/Q0tR1bBYCWryHgcgq jEXFzRmzXm6qQ88uruRubYLVH1ixqLx86uDCraa/C0gRlHPwSGDPYRD79SPL0fBS6egId+uusi X-Received: by 2002:a05:6000:2089:b0:43b:5188:f59f with SMTP id ffacd0b85a97d-43b64281b07mr6347628f8f.45.1774022951762; Fri, 20 Mar 2026 09:09:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH-for-11.1 08/10] cpus: Introduce CPUClass::legacy_monitor_get_register() hook Date: Fri, 20 Mar 2026 17:08:08 +0100 Message-ID: <20260320160811.28611-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1774022981945158500 Allow targets to register their legacy target_get_monitor_def() in CPUClass; check it first in get_monitor_def() otherwise fall back to previous per-target helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 5 +++++ monitor/hmp.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 072f58bead5..8f9d62bfafb 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -150,6 +150,9 @@ struct SysemuCPUOps; * CPUState::cpu_ases. * @legacy_monitor_defs: Array of MonitorDef entries. This field is legacy, * use @gdb_core_xml_file to dump registers instead. + * @legacy_monitor_get_register: Callback to fill @pval with register @nam= e. + * This field is legacy, use @gdb_core_xml_f= ile + * to dump registers instead. * * Represents a CPU family or model. */ @@ -177,6 +180,8 @@ struct CPUClass { const char * (*gdb_arch_name)(CPUState *cpu); const char * (*gdb_get_core_xml_file)(CPUState *cpu); const MonitorDef *legacy_monitor_defs; + int (*legacy_monitor_get_register)(CPUState *cs, const char *name, + uint64_t *pval); =20 void (*disas_set_info)(const CPUState *cpu, disassemble_info *info); =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index 6dfc59725c2..ad253347892 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1628,7 +1628,11 @@ int get_monitor_def(Monitor *mon, int64_t *pval, con= st char *name) } } =20 - ret =3D target_get_monitor_def(cs, name, &tmp); + if (cs->cc->legacy_monitor_get_register) { + ret =3D cs->cc->legacy_monitor_get_register(cs, name, &tmp); + } else { + ret =3D target_get_monitor_def(cs, name, &tmp); + } if (!ret) { *pval =3D target_long_bits() =3D=3D 32 ? (int32_t)tmp : tmp; } --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774023085; cv=none; d=zohomail.com; s=zohoarc; b=QYHdLweisQvZk5FmGWGs6L/vSy+XgiFy6abJ7gS04eKOTdnEprEs+0a0mEV7cawvEsDEw0gzAM/QpT0Cy6iOt/WynGhRIJmJG9X6YKpGYq0IsiuDt45sd/AOugzP/J9LgVOBHbs0bmZN5PvykamyQtFtDsd1fogQalntP9KJYDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023085; 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=ls+6UcXld1NtMIbY4Nw5EuiQUjc1V4AaOnaDRbb7rxs=; b=FmWLILnpoyRRLgQzHfDHr5yhayW6qnCtVh7npmugxjhUPClVQBycHEd5dzzWz1kgh4paUBQapyKEVTAZY4/vqNPyxscqswR+fqu7Qdh4W7BoqYQwdvjvi2UTEoV+axvdpmYUCISDzL0M5n1hfgf/xhf1MquvbM3jT4UZ4tYqydI= 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 1774023085188893.383506501872; Fri, 20 Mar 2026 09:11:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cPn-0000Y8-Om; Fri, 20 Mar 2026 12:09:37 -0400 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 1w3cPb-0000Ve-42 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:24 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cPY-0000DD-NG for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:22 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so20855195e9.1 for ; Fri, 20 Mar 2026 09:09:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b644bdaf8sm8333196f8f.13.2026.03.20.09.09.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022959; x=1774627759; 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=ls+6UcXld1NtMIbY4Nw5EuiQUjc1V4AaOnaDRbb7rxs=; b=RoGb6w5U3fPQyc8ia85VMhaj20uRuemdhh7riK/XGqS3I3mIVZHJUWCOp/Gcmh34uY ZXjwUmAzssmP11feSMxR73ezLXZv0SIkTTU+d6YyM2RR5qj9X3mOcWASSMR/EJzxOBto +fP/VEv+oh/nhXEKlGVzf7kJ/ebtdKXKhAgzbn6q8z0+2l2phnlvJdPld0R526OEvK7w 78bImdguJVsPrvVUKRIjkbrUNGeHC4lCg92DJ9WiEIBODkyTW/DV+1w+HpaFyJsxDeVc R+RWUzjqDULJEOUs+N3dcy5KVjn8SdpazBKBXLbNaaeLXBMRjHcAWxkFhamuMvtknTuf RoJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022959; x=1774627759; 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=ls+6UcXld1NtMIbY4Nw5EuiQUjc1V4AaOnaDRbb7rxs=; b=V5d/6Zuxkixtg0YlFu3jC54D33YInK8WWtfrJ4YGlonamkmCV1D0RoJgj1/nDrUhn8 fQw0DGLTw1k1+J29VXnNyqpiLFOfnEnTP28CecgEx0id8goed2AIPKRoPKx9SSGM9bsT tak0sEfTHMYTsF+nKxsteuU/FOwiJfxTVS1MddExxwBLm305X143vhtLH3cO3WPGAu9l w4YqSFqXi7c0E8EjGnRe07NpOWhzm4N1YXVbDtbxgRujuI0rpgeaS+TDJ3TQTYaoOuwc o9/MqVGhqOmLsVPQ/0/b3GHgJBmP769mSwc/tepyHbe4D8RNSE0DF/qOfFYVGRuyJnSN +jxQ== X-Gm-Message-State: AOJu0YwRTUyGXYCGy4dJR30iFUvMufQLO2s4eZ5wuoVgPF1mW06fgHDq +3RsaqpllhqoES9CalKSomUqI304NLtxXEvqFsWrwINM46p9KiGmtpxZe30Gp4ZwV7WuMu7ZlTf g7n49Kso= X-Gm-Gg: ATEYQzyS3a63rXtuKLkAAbawjlVB0Xav4kihCs2L+YzpIxPAEyctG80ApS1+9TodxmF 7Y8b/osA+8228ODualjNyMqna8Ji8gm2dBMv8DiB5d5itpVrGuoZOmYSPVbSObwwgRBwfxkZw2G EnBfkq+Z1TjF+cmNnNY+Uj3ev31lZn4I5cACUkmcxaDQqFdR6prGNosBtCjeDvb5jwYAg4z/SjI gbD+VYoLcweRMISNvl7awlAzeU5pj7EVWHs7Vqs6nN2ULO1kaQXKOBVw4JQHv0Sr2MoYib4Ftay knMaWiJYezkvfBvJXG1bKOOVX6T+peHiaKi9eyyTSYG0AhCeO8H3X2K4H9hYixoh4kPKwe0Qad3 CplWBTgQav6YuoMDBoRQHmBztEBryH9TvVNaPCZxyVyl4N6hdlJiuWzHChMuarmqpNUX0JgEkXs 88ruBsMWpEvV7l0GAdSwn6zEm4wBmqQe4RA4f8nOwhxQ++GaG29aunvp5y2ZiMpfIjkwMe8wJq X-Received: by 2002:a05:600c:c173:b0:485:5981:1411 with SMTP id 5b1f17b1804b1-486fee1a26bmr50416455e9.23.1774022958872; Fri, 20 Mar 2026 09:09:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt , Weiwei Li , Liu Zhiwei , Chao Liu Subject: [PATCH-for-11.1 09/10] target/riscv: Register target_get_monitor_def in CPUClass Date: Fri, 20 Mar 2026 17:08:09 +0100 Message-ID: <20260320160811.28611-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1774023086386154100 Rename target_get_monitor_def() as riscv_monitor_get_register_legacy() and register it as CPUClass::legacy_monitor_get_register() handler. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/riscv/internals.h | 3 +++ target/riscv/cpu.c | 1 + target/riscv/monitor.c | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 460346dd6de..90225d322ff 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -245,4 +245,7 @@ static inline int insn_len(uint16_t first_word) return (first_word & 3) =3D=3D 3 ? 4 : 2; } =20 +int riscv_monitor_get_register_legacy(CPUState *cs, const char *name, + uint64_t *pval); + #endif diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 8ac935ac06e..e73d15476a7 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2750,6 +2750,7 @@ static void riscv_cpu_common_class_init(ObjectClass *= c, const void *data) cc->get_arch_id =3D riscv_get_arch_id; #endif cc->gdb_arch_name =3D riscv_gdb_arch_name; + cc->legacy_monitor_get_register =3D riscv_monitor_get_register_legacy; #ifdef CONFIG_TCG cc->tcg_ops =3D &riscv_tcg_ops; #endif /* CONFIG_TCG */ diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index 3f206b9fca5..1c90c779534 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -26,6 +26,7 @@ #include "monitor/monitor.h" #include "monitor/hmp.h" #include "system/memory.h" +#include "internals.h" =20 #ifdef TARGET_RISCV64 #define PTE_HEADER_FIELDS "vaddr paddr "\ @@ -310,7 +311,8 @@ static bool reg_is_vreg(const char *name) return false; } =20 -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval) +int riscv_monitor_get_register_legacy(CPUState *cs, const char *name, + uint64_t *pval) { CPURISCVState *env =3D &RISCV_CPU(cs)->env; target_ulong val =3D 0; --=20 2.53.0 From nobody Sun Mar 22 14:11:53 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=1774023043; cv=none; d=zohomail.com; s=zohoarc; b=LXlIfvsCEoKQoS6ZreCEaQBpNbDNsK2DrE4rDGmzTSAzKgqxaYnlyy9UKrfy84ceUbN+VFT582LddOUlyLzdiN4GCYVhLTwHU44V/pgueGb1vvgJRBo0wbLwYdOpelGMFoi5eS15rtXX9qKeL7hi7Mx47w2wwCzcOfTV81iPpvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774023043; 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=XRYSLmqunllpzQ/lnCaZwfgg4b9UisGSGzPJEZG7tJw=; b=IhrvX/4MiJ20EQMFnwdseHQVehNlGFdtjnORyZVFNF5Dpy08JqDnDEdrIodJG5d6UAoHebH4auo5/IbBlKGVoS011U46dB2y+yyVYsqtIE3gMWtzC7gViYIKaB5u69M2k0fURlmRgxSe+0PS7HwPMvL9lWWMNlUNpD5UR2amlLI= 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 1774023043638492.8909929356373; Fri, 20 Mar 2026 09:10:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3cQe-0001GR-Vp; Fri, 20 Mar 2026 12:10:29 -0400 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 1w3cPi-0000X6-ID for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:32 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3cPg-0000ER-17 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:09:30 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-486fd5360d4so17709105e9.1 for ; Fri, 20 Mar 2026 09:09:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486ff1ce05fsm28094485e9.5.2026.03.20.09.09.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774022966; x=1774627766; 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=XRYSLmqunllpzQ/lnCaZwfgg4b9UisGSGzPJEZG7tJw=; b=x1PW4tdtDx6Qqcw8cuG9uGpG00MKp09eSA9nyilUcU0kXyAQMjmaad//1+Zd4oSXOp OIkCinAT8Tm6/m+cT4bq3pfA4B7LyhBrUx0cIrHQDhJcmUwIkjLDe3e1xtZjt+gOU7NQ brFyulUwG49+45rslaruzYJQnwG9+Oz+kbmCD9LPwWQsEJd1+A/cChN9ZuRDFb2P3XnG c++0fpuMnw0EcFii6Sv+PMeHGnFtweVQ+tktogs1Pblmhy+Rwg2PeSNOJW86q1jtfj9s wQdut+4RQJ0TPcxO3rs3GDQ9BiFA6QkmxQlBqhk8op0CdNd+DQzAWsRfoATc8AzwvKCS bNuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774022966; x=1774627766; 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=XRYSLmqunllpzQ/lnCaZwfgg4b9UisGSGzPJEZG7tJw=; b=Soj9rVNT9ll4A0T9p3B7WZd6POOajpvyFTm40AFl+W0IjuyzP7wCcZj1qyQZ5s8VPc v9b4jGqlV6oNHLVfeYXKM9Ks3i1h2cz6f7vDssa2LoxIwekCrPof36cd3sf5PX+m4Q+s e3yEwd37xhBGzaPVFuwv90TECAOGy6+M2H+sZau84ucyABm+W3sOBwZhVmjRR6PMgz7T p2PtPkS3HA/fpoeNB0jUIyoINHwA81r0WxRhPtsnUWnUDk7tm7xyv7v5823tOwWpGNTW Y/lUeV45u3p5YcFt1uOKr+ZOmbcdVfsBO3b104+YNQkSZo3Tcv1xbz0d72DtXRlzmCWW 0sCw== X-Gm-Message-State: AOJu0Yy8otoJdkaCwpqdVath1sejVkf70ioqkYVfUgMsPL7eTxhNmoU9 +TOxMJnPbq7kwUqn+rWubyCnT6BMtMxgVp2MJPeZOtcHoRaQCkg3LjLKkLMayqXbEuNWoDcs5u6 UVyW5yZg= X-Gm-Gg: ATEYQzyNNHcG54jtXuW8hzPFecde+Vcr/efKfEFkw6jvd+BCvkLw2xqhwONilcji2kj vSZtj3eBcGKoV5d3Eab2p/Sopf0knQNUIPlJ1M0Wwa29jaZab2osxEYn4R2eo+I0Ll9s+2JdFh6 6gibRycq+JkySPuseuqN8RoxAuQWDWCY5tLNWElh8F+eQGvMrwSScquglQl+pG3KephZHlG72mc agbqNpHoXlTtupyoTeX8DrUHZAUYT68Tyw1nf8a3rnbLayTDOpQu0+fbGNxQ6xHvHn0Nw1/2TzE HFiyi8BEg4H7qd4WvOpNz1/Jcl8ZuY/MBN067c5f5y4qXL65zPBlEiyRj2uWxMOBNpuVMBQx0YA ryfLBkO6eB5/6PNsABiZkFnVsE+TLn35bf1fGBBUTYLoT5ekEF09Du0bzB0bCwilBT/+Sz+HnLN tUPEo/Iu0SKDeRhkozvOmZPWWgvl/BE3cbvdyUsbOVkYGhPFIz22+5eFYNBfrN25O0fC6rt8eG X-Received: by 2002:a05:600c:8b31:b0:485:9a50:3369 with SMTP id 5b1f17b1804b1-486fee304c4mr55060035e9.29.1774022966042; Fri, 20 Mar 2026 09:09:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Dr . David Alan Gilbert" , Daniel Henrique Barboza , Alistair Francis , Mark Cave-Ayland , Artyom Tarasenko , Zhao Liu , Paolo Bonzini , qemu-riscv@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 10/10] monitor: Remove target_get_monitor_def() Date: Fri, 20 Mar 2026 17:08:10 +0100 Message-ID: <20260320160811.28611-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320160811.28611-1-philmd@linaro.org> References: <20260320160811.28611-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1774023044308158500 target_get_monitor_def() is now only a stub. Remove as pointless. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/monitor/hmp.h | 2 -- monitor/hmp.c | 7 +++---- stubs/target-get-monitor-def.c | 29 ----------------------------- stubs/meson.build | 1 - 4 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 stubs/target-get-monitor-def.c diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index ea7e53060a0..a335e4ccd3e 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -23,8 +23,6 @@ struct MonitorDef { int64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int of= fset); }; =20 -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); - CPUArchState *mon_get_cpu_env(Monitor *mon); CPUState *mon_get_cpu(Monitor *mon); =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index ad253347892..33197b35e41 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1628,11 +1628,10 @@ int get_monitor_def(Monitor *mon, int64_t *pval, co= nst char *name) } } =20 - if (cs->cc->legacy_monitor_get_register) { - ret =3D cs->cc->legacy_monitor_get_register(cs, name, &tmp); - } else { - ret =3D target_get_monitor_def(cs, name, &tmp); + if (!cs->cc->legacy_monitor_get_register) { + return -1; } + ret =3D cs->cc->legacy_monitor_get_register(cs, name, &tmp); if (!ret) { *pval =3D target_long_bits() =3D=3D 32 ? (int32_t)tmp : tmp; } diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-def.c deleted file mode 100644 index 394e0f9a7d2..00000000000 --- a/stubs/target-get-monitor-def.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Stub for target_get_monitor_def. - * - * Copyright IBM Corp., 2015 - * - * Author: Alexey Kardashevskiy - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "qemu/osdep.h" - -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); - -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval) -{ - return -1; -} diff --git a/stubs/meson.build b/stubs/meson.build index 10eb68ab55e..85f9e3a4f23 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -74,7 +74,6 @@ if have_system stub_ss.add(files('igvm.c')) endif stub_ss.add(files('kvm.c')) - stub_ss.add(files('target-get-monitor-def.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) stub_ss.add(files('monitor-arm-gic.c')) --=20 2.53.0