accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (1/4)

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>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20241212185341.2857-12-philmd@linaro.org>

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 61ca73c4781049c0daad0c39ed75ac0d9819dba0..0a5bc578365a895a31fad64dbb61d7082abe2553 100644 (file)
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -38,6 +38,7 @@
 #include "qemu/plugin.h"
 #include "exec/exec-all.h"
 #include "user/guest-base.h"
+#include "user/page-protection.h"
 #include "tcg/startup.h"
 #include "qemu/timer.h"
 #include "qemu/envlist.h"

diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 775e905960b05a76874c04bda8d1168e471511d6..346f2cefd32e3dbc83dfdb2f3161156d8091bf32 100644 (file)
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -18,6 +18,7 @@
  */
 #include "qemu/osdep.h"
 #include "exec/page-protection.h"
+#include "user/page-protection.h"
 
 #include "qemu.h"
 

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 1c8e0446d0684f22edf7c56d320e6d377b93e739..3d97323893b797d467d9d73da9b499db53a3f383 100644 (file)
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -127,11 +127,6 @@ extern const TargetPageBits target_page;
 #define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE)
 
 #if defined(CONFIG_USER_ONLY)
-void page_dump(FILE *f);
-
-typedef int (*walk_memory_regions_fn)(void *, target_ulong,
-                                      target_ulong, unsigned long);
-int walk_memory_regions(void *, walk_memory_regions_fn);
 
 int page_get_flags(target_ulong address);
 

diff --git a/include/user/page-protection.h b/include/user/page-protection.h
index 448c7a034490412767a6dc63fa48238819fa32c7..ea11cf9e328d1ff746c78a8724c0e44fa73e7829 100644 (file)
--- a/include/user/page-protection.h
+++ b/include/user/page-protection.h
@@ -12,9 +12,17 @@
 #error Cannot include this header from system emulation
 #endif
 
+#include "cpu-param.h"
+#include "exec/target_long.h"
 #include "exec/translation-block.h"
 
 void page_protect(tb_page_addr_t page_addr);
 int page_unprotect(tb_page_addr_t address, uintptr_t pc);
+typedef int (*walk_memory_regions_fn)(void *, target_ulong,
+                                      target_ulong, unsigned long);
+
+int walk_memory_regions(void *, walk_memory_regions_fn);
+
+void page_dump(FILE *f);
 
 #endif

diff --git a/linux-user/main.c b/linux-user/main.c
index b09af8d436521e4c207209a632fb802e0ed8300c..06037304cb146f5b7b8d49346125d3e1962ee175 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -39,6 +39,7 @@
 #include "qemu/module.h"
 #include "qemu/plugin.h"
 #include "user/guest-base.h"
+#include "user/page-protection.h"
 #include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "gdbstub/user.h"

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index e4bf5d5f39ca5713960d22ada310a431bc56da12..4e0444b4cbcd4eb6c3282cfb85ffe2f8e175ae6c 100644 (file)
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -22,6 +22,7 @@
 #include "exec/log.h"
 #include "exec/page-protection.h"
 #include "qemu.h"
+#include "user/page-protection.h"
 #include "user-internals.h"
 #include "user-mmap.h"
 #include "target_mman.h"

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1ce4c79784f09844d715f571883fd8ffa7ed851f..c54b199b6d3b9de4ed62f055751efc950c46ce17 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -135,6 +135,7 @@
 #include "signal-common.h"
 #include "loader.h"
 #include "user-mmap.h"
+#include "user/page-protection.h"
 #include "user/safe-syscall.h"
 #include "qemu/guest-random.h"
 #include "qemu/selfmap.h"