exec: Restrict inclusion of 'user/guest-base.h'

Declare 'have_guest_base' in "user/guest-base.h".

Very few files require this header, so explicitly include
it there instead of "exec/cpu-all.h" which is used in many
source files.

Assert this user-specific header is only included from user
emulation.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231211212003.21686-23-philmd@linaro.org>
Reviewed-by: Anton Johansson <anjo@rev.ng>

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 01b313756e371ef73d732ce73ffec4dcfac2381f..29a629d8779be401b81dda5e798c7e4e5345ee95 100644 (file)
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -36,6 +36,7 @@
 #include "qemu/help_option.h"
 #include "qemu/module.h"
 #include "exec/exec-all.h"
+#include "user/guest-base.h"
 #include "tcg/startup.h"
 #include "qemu/timer.h"
 #include "qemu/envlist.h"

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 027f19e0529481ecb5c70f46a47b4650751f90f7..e75ec13cd0283311d08c7b52b49b9dd328c48202 100644 (file)
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -65,9 +65,6 @@
 
 #if defined(CONFIG_USER_ONLY)
 #include "exec/user/abitypes.h"
-#include "user/guest-base.h"
-
-extern bool have_guest_base;
 
 /*
  * If non-zero, the guest virtual address space is a contiguous subset

diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index f3c2a3ca74094feb4ee3c5c0882c20ecab6922cf..7d0a0412adb3e39bb5e92092937e313de3a215ca 100644 (file)
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -74,6 +74,8 @@
 
 #if defined(CONFIG_USER_ONLY)
 
+#include "user/guest-base.h"
+
 #ifndef TARGET_TAGGED_ADDRESSES
 static inline abi_ptr cpu_untagged_addr(CPUState *cs, abi_ptr x)
 {

diff --git a/include/user/guest-base.h b/include/user/guest-base.h
index 1e42bca5db8d64294e3db69364f08b5a96d1237d..055c1d14fe459237255b53d171240f315fdaac5c 100644 (file)
--- a/include/user/guest-base.h
+++ b/include/user/guest-base.h
@@ -7,6 +7,12 @@
 #ifndef USER_GUEST_BASE_H
 #define USER_GUEST_BASE_H
 
+#ifndef CONFIG_USER_ONLY
+#error Cannot include this header from system emulation
+#endif
+
 extern uintptr_t guest_base;
 
+extern bool have_guest_base;
+
 #endif

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 207455c1baa1a6f88419869bf7827b69700a3b92..f9461d2844ce1520646f73b6ddda1c87c5dcdb92 100644 (file)
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -8,6 +8,7 @@
 
 #include "qemu.h"
 #include "user/tswap-target.h"
+#include "user/guest-base.h"
 #include "user-internals.h"
 #include "signal-common.h"
 #include "loader.h"

diff --git a/linux-user/main.c b/linux-user/main.c
index 149e35432e8f475be677814f4347095afd265cc2..94e4c47f05295701831a2b508a3dfe0284b400af 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -38,6 +38,7 @@
 #include "qemu/help_option.h"
 #include "qemu/module.h"
 #include "qemu/plugin.h"
+#include "user/guest-base.h"
 #include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "gdbstub/user.h"