From bb1573600b2d3435a9572ab65ac366f824ac00f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 10 Apr 2026 19:09:57 +0200 Subject: [PATCH] monitor: Do not check multiple TARGET_* to build 'info tlb' command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This command is filtered at build-time for a selection of binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter them at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on a pair of distinct targets, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-19-philmd@linaro.org> --- hmp-commands-info.hx | 5 ++--- stubs/hmp-cmd-info_tlb.c | 12 ++++++++++++ stubs/meson.build | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 stubs/hmp-cmd-info_tlb.c diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index c93c049dae..82134eb6c2 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -186,16 +186,15 @@ SRST Show PCI information. ERST -#if defined(TARGET_I386) || defined(TARGET_SH4) || defined(TARGET_SPARC) || \ - defined(TARGET_PPC) || defined(TARGET_XTENSA) || defined(TARGET_M68K) { .name = "tlb", .args_type = "", .params = "", .help = "show virtual to physical memory mappings", .cmd = hmp_info_tlb, + .arch_bitmask = QEMU_ARCH_I386 | QEMU_ARCH_SH4 | QEMU_ARCH_SPARC \ + | QEMU_ARCH_PPC | QEMU_ARCH_XTENSA | QEMU_ARCH_M68K, }, -#endif SRST ``info tlb`` diff --git a/stubs/hmp-cmd-info_tlb.c b/stubs/hmp-cmd-info_tlb.c new file mode 100644 index 0000000000..a144e68c1c --- /dev/null +++ b/stubs/hmp-cmd-info_tlb.c @@ -0,0 +1,12 @@ +/* + * Human Monitor 'info tlb' stub + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(info_tlb) diff --git a/stubs/meson.build b/stubs/meson.build index 33053d932c..2f4e1ab430 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -89,6 +89,7 @@ if have_system stub_ss.add(files('qmp-cpu-s390x-kvm.c')) stub_ss.add(files('hmp-cmd-info_mem.c')) stub_ss.add(files('hmp-cmd-info_sev.c')) + stub_ss.add(files('hmp-cmd-info_tlb.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) stub_ss.add(files('hmp-cmds-target-i386.c')) endif