On 12/12/24 10:53, Philippe Mathieu-Daudé wrote:
> Move declarations related to page protection under user
> emulation from "exec/cpu-all.h" to "user/page-protection.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> include/exec/cpu-all.h | 6 ------
> include/user/page-protection.h | 2 ++
> accel/tcg/tb-maint.c | 3 +++
> bsd-user/signal.c | 1 +
> cpu-target.c | 1 +
> linux-user/arm/cpu_loop.c | 1 +
> linux-user/signal.c | 1 +
> target/arm/tcg/helper-a64.c | 3 +++
> target/s390x/tcg/mem_helper.c | 4 +++-
> 9 files changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
> index 73b11f58abb..f7eea33b101 100644
> --- a/include/exec/cpu-all.h
> +++ b/include/exec/cpu-all.h
> @@ -126,12 +126,6 @@ extern const TargetPageBits target_page;
>
> #define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE)
>
> -#if defined(CONFIG_USER_ONLY)
> -
> -int page_get_flags(target_ulong address);
> -
> -#endif
> -
> CPUArchState *cpu_copy(CPUArchState *env);
>
> /* Flags for use in ENV->INTERRUPT_PENDING.
> diff --git a/include/user/page-protection.h b/include/user/page-protection.h
> index bdd98a37de1..51daa186480 100644
> --- a/include/user/page-protection.h
> +++ b/include/user/page-protection.h
> @@ -19,6 +19,8 @@
> void page_protect(tb_page_addr_t page_addr);
> int page_unprotect(tb_page_addr_t address, uintptr_t pc);
>
> +int page_get_flags(target_ulong address);
> +
> /**
> * page_set_flags:
> * @start: first byte of range
> diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
> index 8e272cf790f..3f1bebf6ab5 100644
> --- a/accel/tcg/tb-maint.c
> +++ b/accel/tcg/tb-maint.c
> @@ -33,6 +33,9 @@
> #include "tb-internal.h"
> #include "internal-common.h"
> #include "internal-target.h"
> +#ifdef CONFIG_USER_ONLY
> +#include "user/page-protection.h"
> +#endif
>
>
> /* List iterators for lists of tagged pointers in TranslationBlock. */
> diff --git a/bsd-user/signal.c b/bsd-user/signal.c
> index da49b9bffc1..edbcd461bfa 100644
> --- a/bsd-user/signal.c
> +++ b/bsd-user/signal.c
> @@ -22,6 +22,7 @@
> #include "qemu/log.h"
> #include "qemu.h"
> #include "exec/page-protection.h"
> +#include "user/page-protection.h"
> #include "user/tswap-target.h"
> #include "gdbstub/user.h"
> #include "signal-common.h"
> diff --git a/cpu-target.c b/cpu-target.c
> index 4a88f1c6db8..69a49202110 100644
> --- a/cpu-target.c
> +++ b/cpu-target.c
> @@ -29,6 +29,7 @@
> #include "migration/vmstate.h"
> #ifdef CONFIG_USER_ONLY
> #include "qemu.h"
> +#include "user/page-protection.h"
> #else
> #include "hw/core/sysemu-cpu-ops.h"
> #include "exec/address-spaces.h"
> diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
> index ec665862d93..709f718a99d 100644
> --- a/linux-user/arm/cpu_loop.c
> +++ b/linux-user/arm/cpu_loop.c
> @@ -25,6 +25,7 @@
> #include "signal-common.h"
> #include "semihosting/common-semi.h"
> #include "exec/page-protection.h"
> +#include "user/page-protection.h"
> #include "target/arm/syndrome.h"
>
> #define get_user_code_u32(x, gaddr, env) \
> diff --git a/linux-user/signal.c b/linux-user/signal.c
> index 9b6d772882d..a191e9b26f2 100644
> --- a/linux-user/signal.c
> +++ b/linux-user/signal.c
> @@ -33,6 +33,7 @@
> #include "trace.h"
> #include "signal-common.h"
> #include "host-signal.h"
> +#include "user/page-protection.h"
> #include "user/safe-syscall.h"
> #include "tcg/tcg.h"
>
> diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c
> index 8f42a28d07b..bc144688dd5 100644
> --- a/target/arm/tcg/helper-a64.c
> +++ b/target/arm/tcg/helper-a64.c
> @@ -34,6 +34,9 @@
> #include "qemu/atomic128.h"
> #include "fpu/softfloat.h"
> #include <zlib.h> /* for crc32 */
> +#ifdef CONFIG_USER_ONLY
> +#include "user/page-protection.h"
> +#endif
>
> /* C2.4.7 Multiply and divide */
> /* special cases for 0 and LLONG_MIN are mandated by the standard */
> diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
> index 0e12dae2aa8..307388e5bd1 100644
> --- a/target/s390x/tcg/mem_helper.c
> +++ b/target/s390x/tcg/mem_helper.c
> @@ -31,7 +31,9 @@
> #include "qemu/int128.h"
> #include "qemu/atomic128.h"
>
> -#if !defined(CONFIG_USER_ONLY)
> +#if defined(CONFIG_USER_ONLY)
> +#include "user/page-protection.h"
> +#else
> #include "hw/s390x/storage-keys.h"
> #include "hw/boards.h"
> #endif
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>