Message ID | 20210317183013.25772-30-cfontana@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm cleanup experiment for kvm-only build | expand |
On 3/17/21 7:29 PM, Claudio Fontana wrote: > cpu.c, > cpu32.c, > cpu64.c, > tcg/sysemu/tcg-cpu.c, > > all need a good cleanup when it comes to included header files. > > Signed-off-by: Claudio Fontana <cfontana@suse.de> > --- > target/arm/cpu.c | 8 ++------ > target/arm/cpu32.c | 14 -------------- > target/arm/cpu64.c | 6 ------ > target/arm/tcg/sysemu/tcg-cpu.c | 22 +--------------------- > roms/SLOF | 2 +- > 5 files changed, 4 insertions(+), 48 deletions(-) > diff --git a/roms/SLOF b/roms/SLOF > index 33a7322de1..e18ddad851 160000 > --- a/roms/SLOF > +++ b/roms/SLOF > @@ -1 +1 @@ > -Subproject commit 33a7322de13e9dca4b38851a345a58d37e7a441d > +Subproject commit e18ddad8516ff2cfe36ec130200318f7251aa78c Besides this dubious change, the rest LGTM :)
On 3/17/21 8:01 PM, Philippe Mathieu-Daudé wrote: > On 3/17/21 7:29 PM, Claudio Fontana wrote: >> cpu.c, >> cpu32.c, >> cpu64.c, >> tcg/sysemu/tcg-cpu.c, >> >> all need a good cleanup when it comes to included header files. >> >> Signed-off-by: Claudio Fontana <cfontana@suse.de> >> --- >> target/arm/cpu.c | 8 ++------ >> target/arm/cpu32.c | 14 -------------- >> target/arm/cpu64.c | 6 ------ >> target/arm/tcg/sysemu/tcg-cpu.c | 22 +--------------------- >> roms/SLOF | 2 +- >> 5 files changed, 4 insertions(+), 48 deletions(-) > >> diff --git a/roms/SLOF b/roms/SLOF >> index 33a7322de1..e18ddad851 160000 >> --- a/roms/SLOF >> +++ b/roms/SLOF >> @@ -1 +1 @@ >> -Subproject commit 33a7322de13e9dca4b38851a345a58d37e7a441d >> +Subproject commit e18ddad8516ff2cfe36ec130200318f7251aa78c > > Besides this dubious change, the rest LGTM :) > Oops thanks, no idea how that got in there. Ciao, C
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 97cb6ec8a8..3491e615c3 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -19,28 +19,24 @@ */ #include "qemu/osdep.h" -#include "qemu/qemu-print.h" #include "qemu-common.h" #include "target/arm/idau.h" -#include "qemu/module.h" #include "qapi/error.h" -#include "qapi/visitor.h" #include "cpu.h" #include "cpregs.h" + #ifdef CONFIG_TCG #include "tcg/tcg-cpu.h" #endif /* CONFIG_TCG */ #include "cpu32.h" -#include "internals.h" #include "exec/exec-all.h" #include "hw/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" #include "hw/boards.h" #endif -#include "sysemu/sysemu.h" + #include "sysemu/tcg.h" -#include "sysemu/hw_accel.h" #include "kvm/kvm_arm.h" #include "disas/capstone.h" #include "fpu/softfloat.h" diff --git a/target/arm/cpu32.c b/target/arm/cpu32.c index 655f0a4263..52b5411af6 100644 --- a/target/arm/cpu32.c +++ b/target/arm/cpu32.c @@ -20,26 +20,12 @@ #include "qemu/osdep.h" #include "qemu/qemu-print.h" -#include "qemu-common.h" -#include "target/arm/idau.h" #include "qemu/module.h" -#include "qapi/error.h" -#include "qapi/visitor.h" #include "cpu.h" #include "cpregs.h" -#include "internals.h" -#include "exec/exec-all.h" -#include "hw/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) -#include "hw/loader.h" #include "hw/boards.h" #endif -#include "sysemu/sysemu.h" -#include "sysemu/tcg.h" -#include "sysemu/hw_accel.h" -#include "kvm/kvm_arm.h" -#include "disas/capstone.h" -#include "fpu/softfloat.h" #include "cpu-mmu.h" #include "cpu32.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index d7e9a812cd..b3475a93cc 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -22,13 +22,7 @@ #include "qapi/error.h" #include "qemu/qemu-print.h" #include "cpu.h" -#ifdef CONFIG_TCG -#include "hw/core/tcg-cpu-ops.h" -#endif /* CONFIG_TCG */ #include "qemu/module.h" -#if !defined(CONFIG_USER_ONLY) -#include "hw/loader.h" -#endif #include "sysemu/kvm.h" #include "kvm/kvm_arm.h" #include "qapi/visitor.h" diff --git a/target/arm/tcg/sysemu/tcg-cpu.c b/target/arm/tcg/sysemu/tcg-cpu.c index 6ab49ba614..327b2a5073 100644 --- a/target/arm/tcg/sysemu/tcg-cpu.c +++ b/target/arm/tcg/sysemu/tcg-cpu.c @@ -19,29 +19,9 @@ */ #include "qemu/osdep.h" -#include "qemu/qemu-print.h" -#include "qemu-common.h" -#include "target/arm/idau.h" -#include "qemu/module.h" -#include "qapi/error.h" -#include "qapi/visitor.h" #include "cpu.h" -#include "hw/core/tcg-cpu-ops.h" #include "semihosting/common-semi.h" -#include "cpregs.h" -#include "internals.h" -#include "exec/exec-all.h" -#include "hw/qdev-properties.h" -#if !defined(CONFIG_USER_ONLY) -#include "hw/loader.h" -#include "hw/boards.h" -#endif -#include "sysemu/sysemu.h" -#include "sysemu/tcg.h" -#include "sysemu/hw_accel.h" -#include "disas/capstone.h" -#include "fpu/softfloat.h" -#include "cpu-mmu.h" +#include "qemu/log.h" #include "tcg/tcg-cpu.h" /* diff --git a/roms/SLOF b/roms/SLOF index 33a7322de1..e18ddad851 160000 --- a/roms/SLOF +++ b/roms/SLOF @@ -1 +1 @@ -Subproject commit 33a7322de13e9dca4b38851a345a58d37e7a441d +Subproject commit e18ddad8516ff2cfe36ec130200318f7251aa78c
cpu.c, cpu32.c, cpu64.c, tcg/sysemu/tcg-cpu.c, all need a good cleanup when it comes to included header files. Signed-off-by: Claudio Fontana <cfontana@suse.de> --- target/arm/cpu.c | 8 ++------ target/arm/cpu32.c | 14 -------------- target/arm/cpu64.c | 6 ------ target/arm/tcg/sysemu/tcg-cpu.c | 22 +--------------------- roms/SLOF | 2 +- 5 files changed, 4 insertions(+), 48 deletions(-)