From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Dr. David Alan Gilbert" <dave@treblig.org>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
qemu-riscv@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
qemu-s390x@nongnu.org, kvm@vger.kernel.org, qemu-ppc@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PATCH v2 08/27] target/m68k: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs
Date: Fri, 10 Apr 2026 21:53:02 +0200 [thread overview]
Message-ID: <20260410195323.17937-9-philmd@linaro.org> (raw)
In-Reply-To: <20260410195323.17937-1-philmd@linaro.org>
Restrict m68k_monitor_defs[] to cpu.c, register it as
SysemuCPUOps::monitor_defs hook, allowing to remove
the target_monitor_defs() method.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/m68k/cpu.c | 18 ++++++++++++++++++
target/m68k/monitor.c | 21 ---------------------
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index d849a4a90fc..f704a6af613 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -25,6 +25,7 @@
#ifndef CONFIG_USER_ONLY
#include "migration/vmstate.h"
+#include "monitor/hmp.h"
#endif
#include "cpu.h"
@@ -602,11 +603,28 @@ static const VMStateDescription vmstate_m68k_cpu = {
},
};
+static const MonitorDef m68k_monitor_defs[] = {
+ { "ssp", offsetof(CPUM68KState, sp[0]) },
+ { "usp", offsetof(CPUM68KState, sp[1]) },
+ { "isp", offsetof(CPUM68KState, sp[2]) },
+ { "sfc", offsetof(CPUM68KState, sfc) },
+ { "dfc", offsetof(CPUM68KState, dfc) },
+ { "urp", offsetof(CPUM68KState, mmu.urp) },
+ { "srp", offsetof(CPUM68KState, mmu.srp) },
+ { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) },
+ { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) },
+ { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) },
+ { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) },
+ { "mmusr", offsetof(CPUM68KState, mmu.mmusr) },
+ { NULL },
+};
+
#include "hw/core/sysemu-cpu-ops.h"
static const struct SysemuCPUOps m68k_sysemu_ops = {
.has_work = m68k_cpu_has_work,
.get_phys_page_debug = m68k_cpu_get_phys_page_debug,
+ .monitor_defs = m68k_monitor_defs,
};
#endif /* !CONFIG_USER_ONLY */
diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c
index be7411edca6..3e0df40a6b8 100644
--- a/target/m68k/monitor.c
+++ b/target/m68k/monitor.c
@@ -21,24 +21,3 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
dump_mmu(env1);
}
-
-static const MonitorDef monitor_defs[] = {
- { "ssp", offsetof(CPUM68KState, sp[0]) },
- { "usp", offsetof(CPUM68KState, sp[1]) },
- { "isp", offsetof(CPUM68KState, sp[2]) },
- { "sfc", offsetof(CPUM68KState, sfc) },
- { "dfc", offsetof(CPUM68KState, dfc) },
- { "urp", offsetof(CPUM68KState, mmu.urp) },
- { "srp", offsetof(CPUM68KState, mmu.srp) },
- { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) },
- { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) },
- { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) },
- { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) },
- { "mmusr", offsetof(CPUM68KState, mmu.mmusr) },
- { NULL },
-};
-
-const MonitorDef *target_monitor_defs(void)
-{
- return monitor_defs;
-}
--
2.53.0
next prev parent reply other threads:[~2026-04-10 19:54 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-10 19:52 [PATCH v2 00/27] monitor: Remove need of per-target handlers Philippe Mathieu-Daudé
2026-04-10 19:52 ` [PATCH v2 01/27] monitor: Have MonitorDef::get_value() always return int64_t type Philippe Mathieu-Daudé
2026-04-10 19:52 ` [PATCH v2 02/27] monitor: Remove target_long use in get_monitor_def() Philippe Mathieu-Daudé
2026-04-10 19:52 ` [PATCH v2 03/27] monitor: Reduce target-specific methods further Philippe Mathieu-Daudé
2026-04-10 19:52 ` [PATCH v2 04/27] monitor: Remove 'monitor/hmp-target.h' header Philippe Mathieu-Daudé
2026-04-10 19:52 ` [PATCH v2 05/27] monitor: Forward-declare the MonitorDef type Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 06/27] cpus: Introduce SysemuCPUOps::monitor_defs hook Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 07/27] target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Philippe Mathieu-Daudé
2026-04-10 19:53 ` Philippe Mathieu-Daudé [this message]
2026-04-10 19:53 ` [PATCH v2 09/27] target/sparc: " Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 10/27] monitor: Remove target_monitor_defs() Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 11/27] cpus: Introduce SysemuCPUOps::monitor_get_register() hook Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 12/27] target/riscv: Register target_get_monitor_def in SysemuCPUOps Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 13/27] monitor: Remove target_get_monitor_def() Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 14/27] monitor/meson: Use SPICE with migration HMP commands Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 15/27] stubs: Rename monitor* -> qmp* files Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 16/27] monitor: Make 'info via' a generic command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 17/27] monitor: Make Xen emulation commands generic ones Philippe Mathieu-Daudé
2026-04-10 20:03 ` David Woodhouse
2026-04-10 19:53 ` [PATCH v2 18/27] system: Expose 'arch_init.h' as 'qemu/target-arch-defs.h' Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 19/27] monitor: Introduce HMPCommand::arch_bitmask field Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 20/27] hw/s390x: Reduce 'monitor/monitor.h' inclusions Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 21/27] monitor: Do not check TARGET_S390X to build s390x commands Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 22/27] monitor: Do not check TARGET_I386 to build target/i386/ commands Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 23/27] monitor: Do not check TARGET_I386 to build 'info sgx' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 24/27] monitor: Do not check TARGET_I386 to build 'info sev' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 25/27] monitor: Do not check TARGET_I386/RISCV to build 'info mem' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 26/27] monitor: Do not check multiple TARGET_* to build 'info tlb' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 27/27] monitor: Merge hmp-target.c code within hmp-cmds.c Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260410195323.17937-9-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=dave@treblig.org \
--cc=kvm@vger.kernel.org \
--cc=laurent@vivier.eu \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox