| Message ID | 20210730105947.28215-8-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | softmmu: Clean up arch_init.c | expand |
On 7/30/21 12:59 PM, Peter Maydell wrote: > arch_init.h only defines the QEMU_ARCH_* enumeration and the > arch_type global. Don't include it in files that don't use those. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > blockdev.c | 1 - > hw/i386/pc.c | 1 - > hw/i386/pc_piix.c | 1 - > hw/i386/pc_q35.c | 1 - > hw/mips/jazz.c | 1 - > hw/mips/malta.c | 1 - > hw/ppc/prep.c | 1 - > hw/riscv/sifive_e.c | 1 - > hw/riscv/sifive_u.c | 1 - > hw/riscv/spike.c | 1 - > hw/riscv/virt.c | 1 - > monitor/qmp-cmds.c | 1 - > target/ppc/cpu_init.c | 1 - > target/s390x/cpu-sysemu.c | 1 - > 14 files changed, 14 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 7/30/21 12:59 AM, Peter Maydell wrote: > arch_init.h only defines the QEMU_ARCH_* enumeration and the > arch_type global. Don't include it in files that don't use those. > > Signed-off-by: Peter Maydell<peter.maydell@linaro.org> > --- Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On Fri, Jul 30, 2021 at 9:04 PM Peter Maydell <peter.maydell@linaro.org> wrote: > > arch_init.h only defines the QEMU_ARCH_* enumeration and the > arch_type global. Don't include it in files that don't use those. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > blockdev.c | 1 - > hw/i386/pc.c | 1 - > hw/i386/pc_piix.c | 1 - > hw/i386/pc_q35.c | 1 - > hw/mips/jazz.c | 1 - > hw/mips/malta.c | 1 - > hw/ppc/prep.c | 1 - > hw/riscv/sifive_e.c | 1 - > hw/riscv/sifive_u.c | 1 - > hw/riscv/spike.c | 1 - > hw/riscv/virt.c | 1 - > monitor/qmp-cmds.c | 1 - > target/ppc/cpu_init.c | 1 - > target/s390x/cpu-sysemu.c | 1 - > 14 files changed, 14 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index 3d8ac368a19..e79c5f3b5e8 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -56,7 +56,6 @@ > #include "sysemu/iothread.h" > #include "block/block_int.h" > #include "block/trace.h" > -#include "sysemu/arch_init.h" > #include "sysemu/runstate.h" > #include "sysemu/replay.h" > #include "qemu/cutils.h" > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index c2b9d62a358..102b2239468 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -65,7 +65,6 @@ > #include "hw/xen/start_info.h" > #include "ui/qemu-spice.h" > #include "exec/memory.h" > -#include "sysemu/arch_init.h" > #include "qemu/bitmap.h" > #include "qemu/config-file.h" > #include "qemu/error-report.h" > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 30b8bd6ea92..1bc30167acc 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -43,7 +43,6 @@ > #include "sysemu/kvm.h" > #include "hw/kvm/clock.h" > #include "hw/sysbus.h" > -#include "sysemu/arch_init.h" > #include "hw/i2c/smbus_eeprom.h" > #include "hw/xen/xen-x86.h" > #include "exec/memory.h" > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 04b4a4788d7..eeb0b185b11 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -31,7 +31,6 @@ > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "hw/loader.h" > -#include "sysemu/arch_init.h" > #include "hw/i2c/smbus_eeprom.h" > #include "hw/rtc/mc146818rtc.h" > #include "sysemu/kvm.h" > diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c > index d6183e18821..f5a26e174d5 100644 > --- a/hw/mips/jazz.c > +++ b/hw/mips/jazz.c > @@ -35,7 +35,6 @@ > #include "hw/isa/isa.h" > #include "hw/block/fdc.h" > #include "sysemu/sysemu.h" > -#include "sysemu/arch_init.h" > #include "hw/boards.h" > #include "net/net.h" > #include "hw/scsi/esp.h" > diff --git a/hw/mips/malta.c b/hw/mips/malta.c > index 7dcf175d726..b770b8d3671 100644 > --- a/hw/mips/malta.c > +++ b/hw/mips/malta.c > @@ -38,7 +38,6 @@ > #include "hw/mips/mips.h" > #include "hw/mips/cpudevs.h" > #include "hw/pci/pci.h" > -#include "sysemu/arch_init.h" > #include "qemu/log.h" > #include "hw/mips/bios.h" > #include "hw/ide.h" > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index acfc2a91d8e..25a2e86b421 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -40,7 +40,6 @@ > #include "hw/rtc/mc146818rtc.h" > #include "hw/isa/pc87312.h" > #include "hw/qdev-properties.h" > -#include "sysemu/arch_init.h" > #include "sysemu/kvm.h" > #include "sysemu/reset.h" > #include "trace.h" > diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c > index ddc658c8d68..5b7b245e1f3 100644 > --- a/hw/riscv/sifive_e.c > +++ b/hw/riscv/sifive_e.c > @@ -45,7 +45,6 @@ > #include "hw/intc/sifive_plic.h" > #include "hw/misc/sifive_e_prci.h" > #include "chardev/char.h" > -#include "sysemu/arch_init.h" > #include "sysemu/sysemu.h" > > static const MemMapEntry sifive_e_memmap[] = { > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 87bbd10b211..6cc1a62b0f7 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -55,7 +55,6 @@ > #include "hw/intc/sifive_plic.h" > #include "chardev/char.h" > #include "net/eth.h" > -#include "sysemu/arch_init.h" > #include "sysemu/device_tree.h" > #include "sysemu/runstate.h" > #include "sysemu/sysemu.h" > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c > index fead77f0c48..aae36f2cb4d 100644 > --- a/hw/riscv/spike.c > +++ b/hw/riscv/spike.c > @@ -37,7 +37,6 @@ > #include "hw/char/riscv_htif.h" > #include "hw/intc/sifive_clint.h" > #include "chardev/char.h" > -#include "sysemu/arch_init.h" > #include "sysemu/device_tree.h" > #include "sysemu/sysemu.h" > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 4a3cd2599a5..0e55411045a 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -36,7 +36,6 @@ > #include "hw/intc/sifive_plic.h" > #include "hw/misc/sifive_test.h" > #include "chardev/char.h" > -#include "sysemu/arch_init.h" > #include "sysemu/device_tree.h" > #include "sysemu/sysemu.h" > #include "hw/pci/pci.h" > diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c > index 9ddb9352e65..5c0d5e116b9 100644 > --- a/monitor/qmp-cmds.c > +++ b/monitor/qmp-cmds.c > @@ -27,7 +27,6 @@ > #include "sysemu/kvm.h" > #include "sysemu/runstate.h" > #include "sysemu/runstate-action.h" > -#include "sysemu/arch_init.h" > #include "sysemu/blockdev.h" > #include "sysemu/block-backend.h" > #include "qapi/error.h" > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c > index 505a0ed6ac0..319a272d4c9 100644 > --- a/target/ppc/cpu_init.c > +++ b/target/ppc/cpu_init.c > @@ -22,7 +22,6 @@ > #include "disas/dis-asm.h" > #include "exec/gdbstub.h" > #include "kvm_ppc.h" > -#include "sysemu/arch_init.h" > #include "sysemu/cpus.h" > #include "sysemu/hw_accel.h" > #include "sysemu/tcg.h" > diff --git a/target/s390x/cpu-sysemu.c b/target/s390x/cpu-sysemu.c > index df2c6bf6941..5471e01ee82 100644 > --- a/target/s390x/cpu-sysemu.c > +++ b/target/s390x/cpu-sysemu.c > @@ -34,7 +34,6 @@ > > #include "hw/s390x/pv.h" > #include "hw/boards.h" > -#include "sysemu/arch_init.h" > #include "sysemu/sysemu.h" > #include "sysemu/tcg.h" > #include "hw/core/sysemu-cpu-ops.h" > -- > 2.20.1 > >
diff --git a/blockdev.c b/blockdev.c index 3d8ac368a19..e79c5f3b5e8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -56,7 +56,6 @@ #include "sysemu/iothread.h" #include "block/block_int.h" #include "block/trace.h" -#include "sysemu/arch_init.h" #include "sysemu/runstate.h" #include "sysemu/replay.h" #include "qemu/cutils.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c2b9d62a358..102b2239468 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -65,7 +65,6 @@ #include "hw/xen/start_info.h" #include "ui/qemu-spice.h" #include "exec/memory.h" -#include "sysemu/arch_init.h" #include "qemu/bitmap.h" #include "qemu/config-file.h" #include "qemu/error-report.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 30b8bd6ea92..1bc30167acc 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -43,7 +43,6 @@ #include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/sysbus.h" -#include "sysemu/arch_init.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/xen/xen-x86.h" #include "exec/memory.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 04b4a4788d7..eeb0b185b11 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -31,7 +31,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/loader.h" -#include "sysemu/arch_init.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/rtc/mc146818rtc.h" #include "sysemu/kvm.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index d6183e18821..f5a26e174d5 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -35,7 +35,6 @@ #include "hw/isa/isa.h" #include "hw/block/fdc.h" #include "sysemu/sysemu.h" -#include "sysemu/arch_init.h" #include "hw/boards.h" #include "net/net.h" #include "hw/scsi/esp.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 7dcf175d726..b770b8d3671 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -38,7 +38,6 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" -#include "sysemu/arch_init.h" #include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index acfc2a91d8e..25a2e86b421 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -40,7 +40,6 @@ #include "hw/rtc/mc146818rtc.h" #include "hw/isa/pc87312.h" #include "hw/qdev-properties.h" -#include "sysemu/arch_init.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" #include "trace.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index ddc658c8d68..5b7b245e1f3 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -45,7 +45,6 @@ #include "hw/intc/sifive_plic.h" #include "hw/misc/sifive_e_prci.h" #include "chardev/char.h" -#include "sysemu/arch_init.h" #include "sysemu/sysemu.h" static const MemMapEntry sifive_e_memmap[] = { diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 87bbd10b211..6cc1a62b0f7 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -55,7 +55,6 @@ #include "hw/intc/sifive_plic.h" #include "chardev/char.h" #include "net/eth.h" -#include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/runstate.h" #include "sysemu/sysemu.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index fead77f0c48..aae36f2cb4d 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -37,7 +37,6 @@ #include "hw/char/riscv_htif.h" #include "hw/intc/sifive_clint.h" #include "chardev/char.h" -#include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 4a3cd2599a5..0e55411045a 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -36,7 +36,6 @@ #include "hw/intc/sifive_plic.h" #include "hw/misc/sifive_test.h" #include "chardev/char.h" -#include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 9ddb9352e65..5c0d5e116b9 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -27,7 +27,6 @@ #include "sysemu/kvm.h" #include "sysemu/runstate.h" #include "sysemu/runstate-action.h" -#include "sysemu/arch_init.h" #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "qapi/error.h" diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 505a0ed6ac0..319a272d4c9 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -22,7 +22,6 @@ #include "disas/dis-asm.h" #include "exec/gdbstub.h" #include "kvm_ppc.h" -#include "sysemu/arch_init.h" #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" #include "sysemu/tcg.h" diff --git a/target/s390x/cpu-sysemu.c b/target/s390x/cpu-sysemu.c index df2c6bf6941..5471e01ee82 100644 --- a/target/s390x/cpu-sysemu.c +++ b/target/s390x/cpu-sysemu.c @@ -34,7 +34,6 @@ #include "hw/s390x/pv.h" #include "hw/boards.h" -#include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h" #include "hw/core/sysemu-cpu-ops.h"
arch_init.h only defines the QEMU_ARCH_* enumeration and the arch_type global. Don't include it in files that don't use those. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- blockdev.c | 1 - hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - hw/mips/jazz.c | 1 - hw/mips/malta.c | 1 - hw/ppc/prep.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/sifive_u.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/virt.c | 1 - monitor/qmp-cmds.c | 1 - target/ppc/cpu_init.c | 1 - target/s390x/cpu-sysemu.c | 1 - 14 files changed, 14 deletions(-)