On 9/29/21 18:25, Philippe Mathieu-Daudé wrote:
> Instead of including a sysemu-specific header in "cpu.h"
> (which is shared with user-mode emulations), include it
> locally when required.
>
> Acked-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>
> ---
> target/i386/cpu.h | 4 ----
> hw/i386/kvmvapic.c | 1 +
> hw/i386/x86.c | 1 +
> target/i386/cpu-dump.c | 1 +
> target/i386/cpu-sysemu.c | 1 +
> target/i386/cpu.c | 1 +
> target/i386/gdbstub.c | 4 ++++
> target/i386/hax/hax-all.c | 1 +
> target/i386/helper.c | 1 +
> target/i386/hvf/hvf.c | 1 +
> target/i386/hvf/x86_emu.c | 1 +
> target/i386/nvmm/nvmm-all.c | 1 +
> target/i386/tcg/seg_helper.c | 4 ++++
> target/i386/tcg/sysemu/misc_helper.c | 1 +
> target/i386/tcg/sysemu/seg_helper.c | 1 +
> target/i386/whpx/whpx-all.c | 1 +
> 16 files changed, 21 insertions(+), 4 deletions(-)
> diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c
> index baa905a0cd6..76b4ad918a7 100644
> --- a/target/i386/tcg/seg_helper.c
> +++ b/target/i386/tcg/seg_helper.c
> @@ -28,6 +28,10 @@
> #include "helper-tcg.h"
> #include "seg_helper.h"
>
> +#ifndef CONFIG_USER_ONLY
> +#include "hw/i386/apic.h"
> +#endif
> +
Self-NAck (incorrectly rebased on top of commit 0792e6c88d4
("target/i386: Move x86_cpu_exec_interrupt() under sysemu/ folder").
> diff --git a/target/i386/tcg/sysemu/seg_helper.c b/target/i386/tcg/sysemu/seg_helper.c
> index bf3444c26b0..34f2c65d47f 100644
> --- a/target/i386/tcg/sysemu/seg_helper.c
> +++ b/target/i386/tcg/sysemu/seg_helper.c
> @@ -24,6 +24,7 @@
> #include "exec/cpu_ldst.h"
> #include "tcg/helper-tcg.h"
> #include "../seg_helper.h"
> +#include "hw/i386/apic.h"
