| Message ID | 20211129200510.1233037-3-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qemu-common.h include cleanup | expand |
> -----Original Message----- > From: Peter Maydell <peter.maydell@linaro.org> > Sent: Monday, November 29, 2021 2:05 PM > To: qemu-arm@nongnu.org; qemu-devel@nongnu.org > Cc: Paolo Bonzini <pbonzini@redhat.com>; Sergio Lopez <slp@redhat.com>; > Taylor Simpson <tsimpson@quicinc.com>; Yoshinori Sato > <ysato@users.sourceforge.jp>; Marcel Apfelbaum > <marcel.apfelbaum@gmail.com> > Subject: [PATCH for-7.0 2/4] target/hexagon/cpu.h: don't include qemu- > common.h > > The qemu-common.h header is not supposed to be included from any other > header files, only from .c files (as documented in a comment at the start of > it). > > Move the include to linux-user/hexagon/cpu_loop.c, which needs it for the > declaration of cpu_exec_step_atomic(). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > target/hexagon/cpu.h | 1 - > linux-user/hexagon/cpu_loop.c | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index de121d950f2..58a0d3870bb 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -23,7 +23,6 @@ typedef struct CPUHexagonState CPUHexagonState; #include "fpu/softfloat-types.h" -#include "qemu-common.h" #include "exec/cpu-defs.h" #include "hex_regs.h" #include "mmvec/mmvec.h" diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c index 6b24cbaba93..e47f8348d56 100644 --- a/linux-user/hexagon/cpu_loop.c +++ b/linux-user/hexagon/cpu_loop.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu.h" #include "user-internals.h" #include "cpu_loop-common.h"
The qemu-common.h header is not supposed to be included from any other header files, only from .c files (as documented in a comment at the start of it). Move the include to linux-user/hexagon/cpu_loop.c, which needs it for the declaration of cpu_exec_step_atomic(). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target/hexagon/cpu.h | 1 - linux-user/hexagon/cpu_loop.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)