@samitouri / QOSamiQemu / commits / bd2ecc733a

target-info: Move TARGET_PAGE_BITS sanity check

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 <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20260217095106.598486-4-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Richard Henderson committed Feb 17, 2026 at 19:51 UTC bd2ecc733adea64a71966bd554d115852149287b
2 files changed +6 -4
page-vary-target.c
-4
@@ -23,10 +23,6 @@
23 #include "exec/page-vary.h"
24 #include "exec/target_page.h"
25
26 -#ifndef TARGET_PAGE_BITS_VARY
27 -QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN);
28 -#endif
29 -
26 #ifndef CONFIG_USER_ONLY
27 #include "exec/tlb-flags.h"
28
target-info-stub.c
+6
@@ -11,11 +11,17 @@
11 #include "qemu/target-info-impl.h"
12 #include "hw/core/boards.h"
13 #include "cpu.h"
14 +#include "exec/page-vary.h"
15
16 /* Validate correct placement of CPUArchState. */
17 QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0);
18 QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState));
19
20 +/* Validate target page size, if invariant. */
21 +#ifndef TARGET_PAGE_BITS_VARY
22 +QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN);
23 +#endif
24 +
25 static const TargetInfo target_info_stub = {
26 .target_name = TARGET_NAME,
27 .target_arch = glue(SYS_EMU_TARGET_, TARGET_ARCH),