From bd2ecc733adea64a71966bd554d115852149287b Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 17 Feb 2026 19:51:02 +1000 Subject: [PATCH] target-info: Move TARGET_PAGE_BITS sanity check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the check from page-vary-target.c to target-info-stub.c, in the process of removing page-vary-target.c entirely. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20260217095106.598486-4-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- page-vary-target.c | 4 ---- target-info-stub.c | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/page-vary-target.c b/page-vary-target.c index ab92da4539..7c0565dd8d 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -23,10 +23,6 @@ #include "exec/page-vary.h" #include "exec/target_page.h" -#ifndef TARGET_PAGE_BITS_VARY -QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN); -#endif - #ifndef CONFIG_USER_ONLY #include "exec/tlb-flags.h" diff --git a/target-info-stub.c b/target-info-stub.c index 896f16e582..f5896a7262 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -11,11 +11,17 @@ #include "qemu/target-info-impl.h" #include "hw/core/boards.h" #include "cpu.h" +#include "exec/page-vary.h" /* Validate correct placement of CPUArchState. */ QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0); QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState)); +/* Validate target page size, if invariant. */ +#ifndef TARGET_PAGE_BITS_VARY +QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN); +#endif + static const TargetInfo target_info_stub = { .target_name = TARGET_NAME, .target_arch = glue(SYS_EMU_TARGET_, TARGET_ARCH),