Le 29/09/2021 à 18:31, Philippe Mathieu-Daudé a écrit : > 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/sysemu/misc_helper.c | 1 + > target/i386/tcg/sysemu/seg_helper.c | 1 + > target/i386/whpx/whpx-all.c | 1 + > 15 files changed, 17 insertions(+), 4 deletions(-) > ... > diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c > index 02b635a52cf..0158fd2bf28 100644 > --- a/target/i386/cpu-dump.c > +++ b/target/i386/cpu-dump.c > @@ -22,6 +22,7 @@ > #include "qemu/qemu-print.h" > #ifndef CONFIG_USER_ONLY > #include "hw/i386/apic_internal.h" > +#include "hw/i386/apic.h" > #endif > > /***********************************************************/ Why do you add this part compared to v1? ... > diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c > index 4ba6e82fab3..50058a24f2a 100644 > --- a/target/i386/hvf/hvf.c > +++ b/target/i386/hvf/hvf.c > @@ -70,6 +70,7 @@ > #include <sys/sysctl.h> > > #include "hw/i386/apic_internal.h" > +#include "hw/i386/apic.h" > #include "qemu/main-loop.h" > #include "qemu/accel.h" > #include "target/i386/cpu.h" Same question Thanks, Laurent
