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 <peter.maydell@linaro.org>
---
Based-on: 1626384156-6248-1-git-send-email-tsimpson@quicinc.com
("[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

Peter Maydell <peter.maydell@linaro.org> writes:

> 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 <peter.maydell@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée

On 7/17/21 3:30 AM, Peter Maydell wrote:
> 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<peter.maydell@linaro.org>
> ---
> Based-on:1626384156-6248-1-git-send-email-tsimpson@quicinc.com
> ("[PATCH v3 0/2] SIGSEGV fixes")

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

> -----Original Message-----
> From: Peter Maydell <peter.maydell@linaro.org>
> Sent: Saturday, July 17, 2021 4:30 AM
> To: qemu-devel@nongnu.org
> Cc: Taylor Simpson <tsimpson@quicinc.com>
> Subject: [PATCH] target/hexagon: Drop include of qemu.h
> 
> 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 <peter.maydell@linaro.org>
> ---
> Based-on: 1626384156-6248-1-git-send-email-tsimpson@quicinc.com
> ("[PATCH v3 0/2] SIGSEGV fixes")


Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>

Thanks Peter,
I'll add this to the series and send you a pull request.


Taylor