The qemu.h file is a CONFIG_USER_ONLY header; it doesn't appear on the include path for softmmu builds. Currently we include it unconditionally in target/hexagon/op_helper.c. We used to need it for the put_user_*() and get_user_*() functions, but now that we have removed the uses of those from op_helper.c, the only reason it's still there is that we're implicitly relying on it pulling in some other headers.
Explicitly include the headers we need for other functions, and drop the include of qemu.h. Signed-off-by: Peter Maydell <[email protected]> --- Based-on: [email protected] ("[PATCH v3 0/2] SIGSEGV fixes") I noticed this because it's the only place in the tree where we include qemu.h that isn't either (a) a linux-user specific file or (b) wrapping the #include line in an ifdef CONFIG_USER_ONLY. target/hexagon/op_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index a959dba56ee..61d5cde939a 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -16,7 +16,8 @@ */ #include "qemu/osdep.h" -#include "qemu.h" +#include "qemu/log.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" -- 2.20.1
