* [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h
@ 2016-01-26 18:16 Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 01/37] migration: Clean up includes Peter Maydell
` (37 more replies)
0 siblings, 38 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:16 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
This is a big fat patchset that touches nearly 800 files,
but it's all automated use of scripts/clean-includes.
This doesn't cover the whole tree, but it does get all
of target-* and hw/ and some other bits.
I split the patches up mostly roughly by entries in
MAINTAINERS, and also with some more ad-hoc splitting
at the end of the series. The final larger patch is
the "everything else in hw" bit -- I stopped when I
got down to a diffstat that wasn't too stupidly huge and
there weren't any more obvious neat carve-outs.
I propose to apply this directly to master in the not too
distant future, since the consensus appears to be that that's
overall less painful than trying to split it all between
maintainer trees for a purely mechanical change.
There will then be another similar series which picks up
the remaining stuff.
thanks
-- PMM
Peter Maydell (37):
migration: Clean up includes
crypto: Clean up includes
exec: Clean up includes
lm32: Clean up includes
ppc: Clean up includes
sparc: Clean up includes
s390: Clean up includes
unicore: Clean up includes
linux-user: Clean up includes
x86: Clean up includes
alpha: Clean up includes
arm: Clean up includes
xen: Clean up includes
virtio: Clean up includes
tcg: Clean up includes
ide: Clean up includes
9pfs: Clean up includes
hw/net: Clean up includes
usb: Clean up includes
hw/display: Clean up includes
hw/vfio: Clean up includes
pci: Clean up includes
hw/scsi: Clean up includes
hw/misc: Clean up includes
hw/timer: Clean up includes
hw/intc: Clean up includes
sh4: Clean up includes
xtensa: Clean up includes
openrisc: Clean up includes
m68k: Clean up includes
cris: Clean up includes
moxie: Clean up includes
tricore: Clean up includes
tilegx: Clean up includes
arm devices: Clean up includes
hw/core: Clean up includes
hw: Clean up includes
cpu-exec-common.c | 2 +-
cpu-exec.c | 2 +-
cpus.c | 2 +-
cputlb.c | 2 +-
crypto/aes.c | 1 +
crypto/cipher-builtin.c | 1 +
crypto/cipher-gcrypt.c | 1 +
crypto/cipher-nettle.c | 1 +
crypto/cipher.c | 1 +
crypto/desrfb.c | 1 +
crypto/hash.c | 1 +
crypto/init.c | 1 +
crypto/secret.c | 1 +
crypto/tlscreds.c | 1 +
crypto/tlscredsanon.c | 1 +
crypto/tlscredsx509.c | 1 +
crypto/tlssession.c | 1 +
disas/alpha.c | 2 +-
disas/arm.c | 1 +
disas/cris.c | 1 +
disas/lm32.c | 2 +-
disas/moxie.c | 2 +-
disas/ppc.c | 1 +
disas/sh4.c | 2 +-
exec.c | 4 +---
fsdev/9p-iov-marshal.c | 7 +------
fsdev/9p-marshal.c | 7 +------
fsdev/qemu-fsdev-dummy.c | 3 +--
fsdev/qemu-fsdev-opts.c | 1 +
fsdev/qemu-fsdev.c | 4 +---
fsdev/virtfs-proxy-helper.c | 1 +
hw/9pfs/9p-handle.c | 2 +-
hw/9pfs/9p-local.c | 1 +
hw/9pfs/9p-posix-acl.c | 2 +-
hw/9pfs/9p-proxy.c | 1 +
hw/9pfs/9p-synth.c | 2 +-
hw/9pfs/9p-xattr-user.c | 2 +-
hw/9pfs/9p-xattr.c | 1 +
hw/9pfs/9p.c | 1 +
hw/9pfs/codir.c | 1 +
hw/9pfs/cofile.c | 1 +
hw/9pfs/cofs.c | 1 +
hw/9pfs/coth.c | 1 +
hw/9pfs/coxattr.c | 1 +
hw/9pfs/virtio-9p-device.c | 1 +
hw/acpi/acpi_interface.c | 1 +
hw/acpi/aml-build.c | 6 +-----
hw/acpi/bios-linker-loader.c | 1 +
hw/acpi/core.c | 1 +
hw/acpi/cpu_hotplug.c | 1 +
hw/acpi/cpu_hotplug_acpi_table.c | 1 +
hw/acpi/ich9.c | 1 +
hw/acpi/memory_hotplug.c | 1 +
hw/acpi/memory_hotplug_acpi_table.c | 2 +-
hw/acpi/nvdimm.c | 1 +
hw/acpi/pcihp.c | 1 +
hw/acpi/piix4.c | 1 +
hw/acpi/tco.c | 1 +
hw/alpha/dp264.c | 1 +
hw/alpha/pci.c | 2 +-
hw/alpha/typhoon.c | 1 +
hw/bt/core.c | 1 +
hw/bt/hci-csr.c | 1 +
hw/bt/hci.c | 1 +
hw/bt/hid.c | 1 +
hw/bt/l2cap.c | 1 +
hw/bt/sdp.c | 1 +
hw/char/cadence_uart.c | 1 +
hw/char/debugcon.c | 1 +
hw/char/digic-uart.c | 1 +
hw/char/escc.c | 1 +
hw/char/etraxfs_ser.c | 1 +
hw/char/exynos4210_uart.c | 1 +
hw/char/grlib_apbuart.c | 1 +
hw/char/imx_serial.c | 1 +
hw/char/ipoctal232.c | 1 +
hw/char/lm32_juart.c | 1 +
hw/char/lm32_uart.c | 1 +
hw/char/mcf_uart.c | 1 +
hw/char/milkymist-uart.c | 1 +
hw/char/omap_uart.c | 1 +
hw/char/parallel.c | 1 +
hw/char/pl011.c | 1 +
hw/char/sclpconsole-lm.c | 1 +
hw/char/sclpconsole.c | 1 +
hw/char/serial-isa.c | 1 +
hw/char/serial-pci.c | 1 +
hw/char/serial.c | 1 +
hw/char/sh_serial.c | 1 +
hw/char/spapr_vty.c | 1 +
hw/char/stm32f2xx_usart.c | 1 +
hw/char/virtio-console.c | 1 +
hw/char/virtio-serial-bus.c | 1 +
hw/char/xen_console.c | 7 +------
hw/char/xilinx_uartlite.c | 1 +
hw/core/empty_slot.c | 1 +
hw/core/fw-path-provider.c | 1 +
hw/core/hotplug.c | 1 +
hw/core/irq.c | 1 +
hw/core/loader.c | 1 +
hw/core/machine.c | 1 +
hw/core/nmi.c | 1 +
hw/core/null-machine.c | 1 +
hw/core/platform-bus.c | 1 +
hw/core/ptimer.c | 1 +
hw/core/qdev-properties-system.c | 1 +
hw/core/qdev-properties.c | 1 +
hw/core/qdev.c | 2 +-
hw/core/stream.c | 1 +
hw/core/sysbus.c | 1 +
hw/cpu/a15mpcore.c | 1 +
hw/cpu/a9mpcore.c | 1 +
hw/cpu/arm11mpcore.c | 1 +
hw/cpu/realview_mpcore.c | 1 +
hw/cris/axis_dev88.c | 1 +
hw/cris/boot.c | 1 +
hw/display/ads7846.c | 1 +
hw/display/blizzard.c | 1 +
hw/display/cg3.c | 1 +
hw/display/cirrus_vga.c | 1 +
hw/display/exynos4210_fimd.c | 1 +
hw/display/framebuffer.c | 1 +
hw/display/g364fb.c | 1 +
hw/display/jazz_led.c | 1 +
hw/display/milkymist-tmu2.c | 1 +
hw/display/milkymist-vgafb.c | 1 +
hw/display/omap_dss.c | 1 +
hw/display/omap_lcdc.c | 1 +
hw/display/pl110.c | 1 +
hw/display/pxa2xx_lcd.c | 1 +
hw/display/qxl-logger.c | 1 +
hw/display/qxl-render.c | 1 +
hw/display/qxl.c | 2 +-
hw/display/sm501.c | 2 +-
hw/display/ssd0303.c | 1 +
hw/display/ssd0323.c | 1 +
hw/display/tc6393xb.c | 1 +
hw/display/tcx.c | 1 +
hw/display/vga-isa-mm.c | 1 +
hw/display/vga-isa.c | 1 +
hw/display/vga-pci.c | 1 +
hw/display/vga.c | 1 +
hw/display/virtio-gpu-3d.c | 1 +
hw/display/virtio-gpu-pci.c | 1 +
hw/display/virtio-gpu.c | 1 +
hw/display/virtio-vga.c | 1 +
hw/display/vmware_vga.c | 1 +
hw/display/xenfb.c | 10 +---------
hw/dma/etraxfs_dma.c | 3 +--
hw/dma/i82374.c | 1 +
hw/dma/i8257.c | 1 +
hw/dma/omap_dma.c | 1 +
hw/dma/pl080.c | 1 +
hw/dma/pl330.c | 1 +
hw/dma/puv3_dma.c | 1 +
hw/dma/pxa2xx_dma.c | 1 +
hw/dma/rc4030.c | 1 +
hw/dma/soc_dma.c | 1 +
hw/dma/sparc32_dma.c | 1 +
hw/dma/sun4m_iommu.c | 1 +
hw/dma/xilinx_axidma.c | 1 +
hw/gpio/imx_gpio.c | 1 +
hw/gpio/max7310.c | 1 +
hw/gpio/mpc8xxx.c | 1 +
hw/gpio/omap_gpio.c | 1 +
hw/gpio/pl061.c | 1 +
hw/gpio/puv3_gpio.c | 1 +
hw/gpio/zaurus.c | 1 +
hw/i2c/bitbang_i2c.c | 1 +
hw/i2c/core.c | 1 +
hw/i2c/exynos4210_i2c.c | 1 +
hw/i2c/imx_i2c.c | 1 +
hw/i2c/omap_i2c.c | 1 +
hw/i2c/pm_smbus.c | 1 +
hw/i2c/smbus.c | 1 +
hw/i2c/smbus_eeprom.c | 1 +
hw/i2c/smbus_ich9.c | 1 +
hw/i2c/versatile_i2c.c | 1 +
hw/i386/acpi-build.c | 3 +--
hw/i386/intel_iommu.c | 1 +
hw/i386/kvm/apic.c | 1 +
hw/i386/kvm/clock.c | 1 +
hw/i386/kvm/i8254.c | 1 +
hw/i386/kvm/i8259.c | 1 +
hw/i386/kvm/ioapic.c | 1 +
hw/i386/kvm/pci-assign.c | 5 +----
hw/i386/kvmvapic.c | 1 +
hw/i386/multiboot.c | 1 +
hw/i386/pc.c | 1 +
hw/i386/pc_piix.c | 1 +
hw/i386/pc_q35.c | 1 +
hw/i386/pc_sysfw.c | 1 +
hw/i386/pci-assign-load-rom.c | 5 +----
hw/i386/xen/xen_apic.c | 1 +
hw/i386/xen/xen_platform.c | 1 +
hw/i386/xen/xen_pvdevice.c | 1 +
hw/ide/ahci.c | 1 +
hw/ide/atapi.c | 1 +
hw/ide/cmd646.c | 1 +
hw/ide/core.c | 1 +
hw/ide/ich.c | 1 +
hw/ide/isa.c | 1 +
hw/ide/macio.c | 1 +
hw/ide/microdrive.c | 1 +
hw/ide/mmio.c | 1 +
hw/ide/pci.c | 1 +
hw/ide/piix.c | 1 +
hw/ide/qdev.c | 1 +
hw/ide/via.c | 1 +
hw/input/adb.c | 1 +
hw/input/hid.c | 1 +
hw/input/lm832x.c | 1 +
hw/input/milkymist-softusb.c | 1 +
hw/input/pckbd.c | 1 +
hw/input/pl050.c | 1 +
hw/input/ps2.c | 1 +
hw/input/pxa2xx_keypad.c | 1 +
hw/input/stellaris_input.c | 1 +
hw/input/tsc2005.c | 1 +
hw/input/tsc210x.c | 1 +
hw/input/virtio-input-hid.c | 1 +
hw/input/virtio-input-host.c | 1 +
hw/input/virtio-input.c | 1 +
hw/input/vmmouse.c | 1 +
hw/intc/allwinner-a10-pic.c | 1 +
hw/intc/apic.c | 1 +
hw/intc/apic_common.c | 1 +
hw/intc/arm_gic.c | 1 +
hw/intc/arm_gic_common.c | 1 +
hw/intc/arm_gic_kvm.c | 1 +
hw/intc/arm_gicv2m.c | 1 +
hw/intc/arm_gicv3_common.c | 1 +
hw/intc/arm_gicv3_kvm.c | 1 +
hw/intc/armv7m_nvic.c | 1 +
hw/intc/etraxfs_pic.c | 1 +
hw/intc/exynos4210_combiner.c | 1 +
hw/intc/exynos4210_gic.c | 1 +
hw/intc/grlib_irqmp.c | 1 +
hw/intc/heathrow_pic.c | 1 +
hw/intc/i8259.c | 1 +
hw/intc/i8259_common.c | 1 +
hw/intc/imx_avic.c | 1 +
hw/intc/ioapic.c | 1 +
hw/intc/ioapic_common.c | 1 +
hw/intc/lm32_pic.c | 2 +-
hw/intc/omap_intc.c | 1 +
hw/intc/openpic.c | 1 +
hw/intc/openpic_kvm.c | 1 +
hw/intc/pl190.c | 1 +
hw/intc/puv3_intc.c | 1 +
hw/intc/realview_gic.c | 1 +
hw/intc/s390_flic.c | 1 +
hw/intc/s390_flic_kvm.c | 1 +
hw/intc/sh_intc.c | 1 +
hw/intc/slavio_intctl.c | 1 +
hw/intc/xics.c | 1 +
hw/intc/xics_kvm.c | 1 +
hw/intc/xilinx_intc.c | 1 +
hw/ipack/ipack.c | 1 +
hw/ipack/tpci200.c | 2 +-
hw/ipmi/ipmi.c | 1 +
hw/ipmi/ipmi_bmc_extern.c | 2 +-
hw/ipmi/ipmi_bmc_sim.c | 4 +---
hw/ipmi/isa_ipmi_bt.c | 1 +
hw/ipmi/isa_ipmi_kcs.c | 1 +
hw/isa/apm.c | 1 +
hw/isa/i82378.c | 1 +
hw/isa/isa-bus.c | 1 +
hw/isa/lpc_ich9.c | 1 +
hw/isa/pc87312.c | 1 +
hw/isa/piix4.c | 1 +
hw/isa/vt82c686.c | 1 +
hw/lm32/lm32_boards.c | 1 +
hw/lm32/milkymist.c | 1 +
hw/m68k/an5206.c | 1 +
hw/m68k/dummy_m68k.c | 1 +
hw/m68k/mcf5206.c | 1 +
hw/m68k/mcf5208.c | 1 +
hw/m68k/mcf_intc.c | 1 +
hw/mem/nvdimm.c | 1 +
hw/mem/pc-dimm.c | 1 +
hw/misc/a9scu.c | 1 +
hw/misc/applesmc.c | 1 +
hw/misc/arm11scu.c | 1 +
hw/misc/arm_integrator_debug.c | 1 +
hw/misc/arm_l2x0.c | 1 +
hw/misc/arm_sysctl.c | 1 +
hw/misc/cbus.c | 1 +
hw/misc/debugexit.c | 1 +
hw/misc/eccmemctl.c | 1 +
hw/misc/edu.c | 1 +
hw/misc/exynos4210_pmu.c | 1 +
hw/misc/hyperv_testdev.c | 1 +
hw/misc/imx25_ccm.c | 1 +
hw/misc/imx31_ccm.c | 1 +
hw/misc/imx_ccm.c | 1 +
hw/misc/ivshmem.c | 3 +--
hw/misc/macio/cuda.c | 1 +
hw/misc/macio/mac_dbdma.c | 1 +
hw/misc/macio/macio.c | 1 +
hw/misc/max111x.c | 1 +
hw/misc/milkymist-hpdmc.c | 1 +
hw/misc/milkymist-pfpu.c | 1 +
hw/misc/mst_fpga.c | 1 +
hw/misc/omap_clk.c | 1 +
hw/misc/omap_gpmc.c | 1 +
hw/misc/omap_l4.c | 1 +
hw/misc/omap_sdrc.c | 1 +
hw/misc/omap_tap.c | 1 +
hw/misc/pc-testdev.c | 2 +-
hw/misc/pci-testdev.c | 2 +-
hw/misc/puv3_pm.c | 1 +
hw/misc/pvpanic.c | 1 +
hw/misc/sga.c | 1 +
hw/misc/slavio_misc.c | 1 +
hw/misc/stm32f2xx_syscfg.c | 1 +
hw/misc/tmp105.c | 1 +
hw/misc/vmport.c | 1 +
hw/misc/zynq-xadc.c | 1 +
hw/misc/zynq_slcr.c | 1 +
hw/moxie/moxiesim.c | 1 +
hw/net/allwinner_emac.c | 1 +
hw/net/cadence_gem.c | 1 +
hw/net/dp8393x.c | 1 +
hw/net/e1000.c | 1 +
hw/net/eepro100.c | 2 +-
hw/net/etraxfs_eth.c | 2 +-
hw/net/fsl_etsec/etsec.c | 1 +
hw/net/fsl_etsec/miim.c | 1 +
hw/net/fsl_etsec/registers.c | 1 +
hw/net/fsl_etsec/rings.c | 1 +
hw/net/imx_fec.c | 1 +
hw/net/lan9118.c | 1 +
hw/net/lance.c | 1 +
hw/net/mcf_fec.c | 1 +
hw/net/milkymist-minimac2.c | 1 +
hw/net/mipsnet.c | 1 +
hw/net/ne2000-isa.c | 1 +
hw/net/ne2000.c | 1 +
hw/net/opencores_eth.c | 1 +
hw/net/pcnet-pci.c | 1 +
hw/net/pcnet.c | 1 +
hw/net/rocker/qmp-norocker.c | 1 +
hw/net/rocker/rocker.c | 1 +
hw/net/rocker/rocker_desc.c | 1 +
hw/net/rocker/rocker_fp.c | 1 +
hw/net/rocker/rocker_of_dpa.c | 1 +
hw/net/rocker/rocker_world.c | 1 +
hw/net/rtl8139.c | 1 +
hw/net/smc91c111.c | 1 +
hw/net/spapr_llan.c | 1 +
hw/net/stellaris_enet.c | 1 +
hw/net/vhost_net.c | 4 +---
hw/net/virtio-net.c | 1 +
hw/net/vmxnet3.c | 1 +
hw/net/vmxnet_rx_pkt.c | 1 +
hw/net/vmxnet_tx_pkt.c | 1 +
hw/net/xen_nic.c | 11 +----------
hw/net/xgmac.c | 1 +
hw/net/xilinx_axienet.c | 1 +
hw/net/xilinx_ethlite.c | 1 +
hw/nvram/ds1225y.c | 1 +
hw/nvram/eeprom93xx.c | 1 +
hw/nvram/fw_cfg.c | 1 +
hw/nvram/mac_nvram.c | 1 +
hw/nvram/spapr_nvram.c | 1 +
hw/openrisc/cputimer.c | 1 +
hw/openrisc/openrisc_sim.c | 1 +
hw/openrisc/pic_cpu.c | 1 +
hw/pci-bridge/dec.c | 1 +
hw/pci-bridge/i82801b11.c | 1 +
hw/pci-bridge/ioh3420.c | 1 +
hw/pci-bridge/pci_bridge_dev.c | 1 +
hw/pci-bridge/pci_expander_bridge.c | 1 +
hw/pci-bridge/xio3130_downstream.c | 1 +
hw/pci-bridge/xio3130_upstream.c | 1 +
hw/pci-host/apb.c | 1 +
hw/pci-host/bonito.c | 2 +-
hw/pci-host/gpex.c | 1 +
hw/pci-host/grackle.c | 1 +
hw/pci-host/pam.c | 1 +
hw/pci-host/piix.c | 1 +
hw/pci-host/ppce500.c | 1 +
hw/pci-host/prep.c | 1 +
hw/pci-host/q35.c | 1 +
hw/pci-host/uninorth.c | 1 +
hw/pci-host/versatile.c | 1 +
hw/pci/msi.c | 1 +
hw/pci/msix.c | 1 +
hw/pci/pci-stub.c | 1 +
hw/pci/pci.c | 1 +
hw/pci/pci_bridge.c | 1 +
hw/pci/pci_host.c | 1 +
hw/pci/pcie.c | 1 +
hw/pci/pcie_aer.c | 1 +
hw/pci/pcie_host.c | 1 +
hw/pci/pcie_port.c | 1 +
hw/pci/shpc.c | 2 +-
hw/pci/slotid_cap.c | 1 +
hw/pcmcia/pcmcia.c | 1 +
hw/pcmcia/pxa2xx.c | 1 +
hw/ppc/e500.c | 2 +-
hw/ppc/e500plat.c | 2 +-
hw/ppc/mac_newworld.c | 1 +
hw/ppc/mac_oldworld.c | 1 +
hw/ppc/mpc8544_guts.c | 1 +
hw/ppc/mpc8544ds.c | 2 +-
hw/ppc/ppc.c | 1 +
hw/ppc/ppc405_boards.c | 1 +
hw/ppc/ppc405_uc.c | 1 +
hw/ppc/ppc440_bamboo.c | 2 +-
hw/ppc/ppc4xx_devs.c | 1 +
hw/ppc/ppc4xx_pci.c | 1 +
hw/ppc/ppc_booke.c | 1 +
hw/ppc/ppce500_spin.c | 1 +
hw/ppc/prep.c | 1 +
hw/ppc/spapr.c | 1 +
hw/ppc/spapr_drc.c | 1 +
hw/ppc/spapr_events.c | 1 +
hw/ppc/spapr_hcall.c | 1 +
hw/ppc/spapr_iommu.c | 1 +
hw/ppc/spapr_pci.c | 1 +
hw/ppc/spapr_pci_vfio.c | 1 +
hw/ppc/spapr_rng.c | 1 +
hw/ppc/spapr_rtas.c | 1 +
hw/ppc/spapr_rtc.c | 1 +
hw/ppc/spapr_vio.c | 1 +
hw/ppc/virtex_ml507.c | 1 +
hw/s390x/css.c | 1 +
hw/s390x/event-facility.c | 1 +
hw/s390x/ipl.c | 1 +
hw/s390x/s390-pci-bus.c | 1 +
hw/s390x/s390-pci-inst.c | 1 +
hw/s390x/s390-skeys-kvm.c | 1 +
hw/s390x/s390-skeys.c | 1 +
hw/s390x/s390-virtio-ccw.c | 1 +
hw/s390x/s390-virtio-hcall.c | 1 +
hw/s390x/s390-virtio.c | 1 +
hw/s390x/sclp.c | 1 +
hw/s390x/sclpcpu.c | 1 +
hw/s390x/sclpquiesce.c | 1 +
hw/s390x/virtio-ccw.c | 1 +
hw/scsi/esp-pci.c | 1 +
hw/scsi/esp.c | 1 +
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/megasas.c | 1 +
hw/scsi/scsi-bus.c | 1 +
hw/scsi/scsi-disk.c | 1 +
hw/scsi/scsi-generic.c | 5 +----
hw/scsi/spapr_vscsi.c | 1 +
hw/scsi/vhost-scsi.c | 2 +-
hw/scsi/virtio-scsi-dataplane.c | 1 +
hw/scsi/virtio-scsi.c | 1 +
hw/scsi/vmw_pvscsi.c | 1 +
hw/sd/milkymist-memcard.c | 1 +
hw/sd/omap_mmc.c | 1 +
hw/sd/pl181.c | 1 +
hw/sd/pxa2xx_mmci.c | 1 +
hw/sd/sd.c | 1 +
hw/sd/sdhci.c | 2 +-
hw/sd/ssi-sd.c | 1 +
hw/sh4/r2d.c | 1 +
hw/sh4/sh7750.c | 2 +-
hw/sh4/sh7750_regnames.c | 1 +
hw/sh4/sh_pci.c | 1 +
hw/sh4/shix.c | 1 +
hw/smbios/smbios.c | 1 +
hw/sparc/leon3.c | 1 +
hw/sparc/sun4m.c | 1 +
hw/sparc64/sun4u.c | 1 +
hw/ssi/omap_spi.c | 1 +
hw/ssi/pl022.c | 1 +
hw/ssi/ssi.c | 1 +
hw/ssi/xilinx_spi.c | 1 +
hw/ssi/xilinx_spips.c | 1 +
hw/timer/a9gtimer.c | 1 +
hw/timer/allwinner-a10-pit.c | 1 +
hw/timer/arm_mptimer.c | 1 +
hw/timer/arm_timer.c | 1 +
hw/timer/cadence_ttc.c | 1 +
hw/timer/digic-timer.c | 1 +
hw/timer/ds1338.c | 1 +
hw/timer/etraxfs_timer.c | 1 +
hw/timer/exynos4210_mct.c | 1 +
hw/timer/exynos4210_pwm.c | 1 +
hw/timer/exynos4210_rtc.c | 1 +
hw/timer/grlib_gptimer.c | 1 +
hw/timer/hpet.c | 1 +
hw/timer/i8254.c | 1 +
hw/timer/i8254_common.c | 1 +
hw/timer/imx_epit.c | 1 +
hw/timer/imx_gpt.c | 1 +
hw/timer/lm32_timer.c | 1 +
hw/timer/m48t59.c | 1 +
hw/timer/mc146818rtc.c | 1 +
hw/timer/milkymist-sysctl.c | 1 +
hw/timer/omap_gptimer.c | 1 +
hw/timer/omap_synctimer.c | 1 +
hw/timer/pl031.c | 1 +
hw/timer/puv3_ost.c | 1 +
hw/timer/pxa2xx_timer.c | 1 +
hw/timer/sh_timer.c | 1 +
hw/timer/slavio_timer.c | 1 +
hw/timer/stm32f2xx_timer.c | 1 +
hw/timer/tusb6010.c | 1 +
hw/timer/twl92230.c | 1 +
hw/timer/xilinx_timer.c | 1 +
hw/tpm/tpm_passthrough.c | 2 +-
hw/tpm/tpm_tis.c | 1 +
hw/tpm/tpm_util.c | 1 +
hw/tricore/tricore_testboard.c | 1 +
hw/unicore32/puv3.c | 1 +
hw/usb/bus.c | 1 +
hw/usb/ccid-card-emulated.c | 1 +
hw/usb/ccid-card-passthru.c | 1 +
hw/usb/combined-packet.c | 1 +
hw/usb/core.c | 1 +
hw/usb/desc-msos.c | 1 +
hw/usb/desc.c | 2 +-
hw/usb/dev-audio.c | 1 +
hw/usb/dev-bluetooth.c | 1 +
hw/usb/dev-hid.c | 1 +
hw/usb/dev-hub.c | 1 +
hw/usb/dev-mtp.c | 3 +--
hw/usb/dev-network.c | 1 +
hw/usb/dev-serial.c | 1 +
hw/usb/dev-smartcard-reader.c | 1 +
hw/usb/dev-storage.c | 1 +
hw/usb/dev-uas.c | 1 +
hw/usb/dev-wacom.c | 1 +
hw/usb/hcd-ehci-pci.c | 1 +
hw/usb/hcd-ehci-sysbus.c | 1 +
hw/usb/hcd-ehci.c | 1 +
hw/usb/hcd-musb.c | 1 +
hw/usb/hcd-ohci.c | 1 +
hw/usb/hcd-uhci.c | 1 +
hw/usb/hcd-xhci.c | 1 +
hw/usb/host-legacy.c | 1 +
hw/usb/host-libusb.c | 1 +
hw/usb/host-stub.c | 1 +
hw/usb/libhw.c | 1 +
hw/usb/quirks.c | 1 +
hw/usb/redirect.c | 1 +
hw/vfio/calxeda-xgmac.c | 1 +
hw/vfio/common.c | 1 +
hw/vfio/pci-quirks.c | 1 +
hw/vfio/pci.c | 5 +----
hw/vfio/platform.c | 1 +
hw/virtio/dataplane/vring.c | 1 +
hw/virtio/vhost-backend.c | 1 +
hw/virtio/vhost-user.c | 3 +--
hw/virtio/vhost.c | 1 +
hw/virtio/virtio-balloon.c | 1 +
hw/virtio/virtio-bus.c | 1 +
hw/virtio/virtio-mmio.c | 1 +
hw/virtio/virtio-pci.c | 2 +-
hw/virtio/virtio-rng.c | 1 +
hw/virtio/virtio.c | 2 +-
hw/watchdog/watchdog.c | 1 +
hw/watchdog/wdt_diag288.c | 1 +
hw/watchdog/wdt_i6300esb.c | 2 +-
hw/watchdog/wdt_ib700.c | 1 +
hw/xen/xen-host-pci-device.c | 1 +
hw/xen/xen_backend.c | 10 +---------
hw/xen/xen_devconfig.c | 1 +
hw/xen/xen_pt.c | 1 +
hw/xen/xen_pt_config_init.c | 1 +
hw/xen/xen_pt_graphics.c | 1 +
hw/xen/xen_pt_msi.c | 1 +
hw/xenpv/xen_domainbuild.c | 2 +-
hw/xenpv/xen_machine_pv.c | 1 +
hw/xtensa/pic_cpu.c | 1 +
hw/xtensa/sim.c | 1 +
hw/xtensa/xtfpga.c | 1 +
linux-user/arm/nwfpe/double_cpdo.c | 1 +
linux-user/arm/nwfpe/extended_cpdo.c | 1 +
linux-user/arm/nwfpe/fpa11.c | 2 +-
linux-user/arm/nwfpe/fpa11_cpdo.c | 1 +
linux-user/arm/nwfpe/fpa11_cpdt.c | 1 +
linux-user/arm/nwfpe/fpa11_cprt.c | 1 +
linux-user/arm/nwfpe/fpopcode.c | 1 +
linux-user/arm/nwfpe/single_cpdo.c | 1 +
linux-user/elfload.c | 10 +---------
linux-user/flatload.c | 5 +----
linux-user/linuxload.c | 8 +-------
linux-user/m68k-sim.c | 9 +--------
linux-user/main.c | 7 +------
linux-user/mmap.c | 9 +--------
linux-user/signal.c | 7 +------
linux-user/strace.c | 4 +---
linux-user/syscall.c | 14 +-------------
linux-user/uaccess.c | 3 +--
linux-user/uname.c | 2 +-
linux-user/vm86.c | 7 +------
migration/block.c | 2 +-
migration/exec.c | 2 +-
migration/fd.c | 1 +
migration/migration.c | 1 +
migration/postcopy-ram.c | 4 +---
migration/qemu-file-buf.c | 1 +
migration/qemu-file-stdio.c | 1 +
migration/qemu-file-unix.c | 1 +
migration/qemu-file.c | 1 +
migration/ram.c | 2 +-
migration/rdma.c | 4 +---
migration/savevm.c | 2 +-
migration/tcp.c | 2 +-
migration/unix.c | 2 +-
migration/vmstate.c | 1 +
migration/xbzrle.c | 1 +
target-alpha/cpu.c | 1 +
target-alpha/fpu_helper.c | 1 +
target-alpha/gdbstub.c | 2 +-
target-alpha/helper.c | 4 +---
target-alpha/int_helper.c | 1 +
target-alpha/machine.c | 1 +
target-alpha/mem_helper.c | 1 +
target-alpha/sys_helper.c | 1 +
target-alpha/translate.c | 1 +
target-alpha/vax_helper.c | 1 +
target-arm/arch_dump.c | 1 +
target-cris/cpu.c | 1 +
target-cris/gdbstub.c | 2 +-
target-cris/helper.c | 1 +
target-cris/machine.c | 1 +
target-cris/op_helper.c | 1 +
target-cris/translate.c | 1 +
target-cris/translate_v10.c | 1 +
target-i386/arch_dump.c | 1 +
target-i386/arch_memory_mapping.c | 1 +
target-i386/bpt_helper.c | 1 +
target-i386/cc_helper.c | 1 +
target-i386/excp_helper.c | 1 +
target-i386/fpu_helper.c | 1 +
target-i386/gdbstub.c | 2 +-
target-i386/helper.c | 1 +
target-i386/hyperv.c | 1 +
target-i386/int_helper.c | 1 +
target-i386/kvm-stub.c | 1 +
target-i386/kvm.c | 2 +-
target-i386/machine.c | 1 +
target-i386/mem_helper.c | 1 +
target-i386/misc_helper.c | 1 +
target-i386/monitor.c | 1 +
target-i386/seg_helper.c | 1 +
target-i386/smm_helper.c | 1 +
target-i386/svm_helper.c | 1 +
target-i386/translate.c | 6 +-----
target-lm32/cpu.c | 1 +
target-lm32/gdbstub.c | 2 +-
target-lm32/helper.c | 1 +
target-lm32/lm32-semi.c | 5 +----
target-lm32/machine.c | 1 +
target-lm32/op_helper.c | 2 +-
target-lm32/translate.c | 1 +
target-m68k/cpu.c | 1 +
target-m68k/gdbstub.c | 2 +-
target-m68k/helper.c | 1 +
target-m68k/m68k-semi.c | 10 +---------
target-m68k/op_helper.c | 1 +
target-m68k/translate.c | 1 +
target-moxie/cpu.c | 1 +
target-moxie/helper.c | 4 +---
target-moxie/machine.c | 1 +
target-moxie/mmu.c | 5 +----
target-moxie/translate.c | 6 +-----
target-openrisc/cpu.c | 1 +
target-openrisc/exception.c | 1 +
target-openrisc/exception_helper.c | 1 +
target-openrisc/fpu_helper.c | 1 +
target-openrisc/gdbstub.c | 2 +-
target-openrisc/int_helper.c | 1 +
target-openrisc/interrupt.c | 1 +
target-openrisc/interrupt_helper.c | 1 +
target-openrisc/machine.c | 1 +
target-openrisc/mmu.c | 1 +
target-openrisc/mmu_helper.c | 1 +
target-openrisc/sys_helper.c | 1 +
target-openrisc/translate.c | 2 +-
target-ppc/arch_dump.c | 1 +
target-ppc/cpu-models.c | 1 +
target-ppc/dfp_helper.c | 1 +
target-ppc/excp_helper.c | 1 +
target-ppc/fpu_helper.c | 1 +
target-ppc/gdbstub.c | 2 +-
target-ppc/int_helper.c | 1 +
target-ppc/kvm-stub.c | 1 +
target-ppc/kvm.c | 2 +-
target-ppc/machine.c | 1 +
target-ppc/mem_helper.c | 1 +
target-ppc/mfrom_table_gen.c | 3 +--
target-ppc/misc_helper.c | 1 +
target-ppc/mmu-hash32.c | 1 +
target-ppc/mmu-hash64.c | 1 +
target-ppc/mmu_helper.c | 1 +
target-ppc/monitor.c | 1 +
target-ppc/timebase_helper.c | 1 +
target-ppc/translate.c | 1 +
target-ppc/translate_init.c | 4 +---
target-ppc/user_only_helper.c | 1 +
target-s390x/arch_dump.c | 1 +
target-s390x/cc_helper.c | 1 +
target-s390x/cpu.c | 1 +
target-s390x/fpu_helper.c | 1 +
target-s390x/gdbstub.c | 2 +-
target-s390x/helper.c | 1 +
target-s390x/int_helper.c | 1 +
target-s390x/interrupt.c | 1 +
target-s390x/ioinst.c | 2 +-
target-s390x/kvm.c | 2 +-
target-s390x/machine.c | 1 +
target-s390x/mem_helper.c | 1 +
target-s390x/misc_helper.c | 2 +-
target-s390x/mmu_helper.c | 1 +
target-s390x/translate.c | 1 +
target-sh4/cpu.c | 1 +
target-sh4/gdbstub.c | 2 +-
target-sh4/helper.c | 6 +-----
target-sh4/monitor.c | 1 +
target-sh4/op_helper.c | 2 +-
target-sh4/translate.c | 1 +
target-sparc/cc_helper.c | 1 +
target-sparc/cpu.c | 1 +
target-sparc/fop_helper.c | 1 +
target-sparc/gdbstub.c | 2 +-
target-sparc/helper.c | 1 +
target-sparc/int32_helper.c | 1 +
target-sparc/int64_helper.c | 1 +
target-sparc/ldst_helper.c | 1 +
target-sparc/machine.c | 1 +
target-sparc/mmu_helper.c | 1 +
target-sparc/monitor.c | 1 +
target-sparc/translate.c | 6 +-----
target-sparc/vis_helper.c | 1 +
target-sparc/win_helper.c | 1 +
target-tilegx/cpu.c | 1 +
target-tilegx/helper.c | 1 +
target-tilegx/simd_helper.c | 1 +
target-tilegx/translate.c | 1 +
target-tricore/cpu.c | 1 +
target-tricore/helper.c | 6 +-----
target-tricore/op_helper.c | 2 +-
target-tricore/translate.c | 1 +
target-unicore32/cpu.c | 1 +
target-unicore32/helper.c | 1 +
target-unicore32/op_helper.c | 1 +
target-unicore32/softmmu.c | 1 +
target-unicore32/translate.c | 6 +-----
target-unicore32/ucf64_helper.c | 1 +
target-xtensa/core-dc232b.c | 1 +
target-xtensa/core-dc233c.c | 1 +
target-xtensa/core-fsf.c | 1 +
target-xtensa/cpu.c | 1 +
target-xtensa/gdbstub.c | 2 +-
target-xtensa/helper.c | 1 +
target-xtensa/monitor.c | 1 +
target-xtensa/op_helper.c | 1 +
target-xtensa/translate.c | 2 +-
target-xtensa/xtensa-semi.c | 5 +----
tcg/aarch64/tcg-target.c | 1 +
tcg/arm/tcg-target.c | 1 +
tcg/i386/tcg-target.c | 1 +
tcg/mips/tcg-target.c | 2 +-
tcg/optimize.c | 4 +---
tcg/ppc/tcg-target.c | 8 +-------
tcg/s390/tcg-target.c | 1 +
tcg/sparc/tcg-target.c | 1 +
tcg/tcg-common.c | 1 +
tcg/tcg-op.c | 1 +
tcg/tcg.c | 2 +-
tcg/tci/tcg-target.c | 1 +
tests/ahci-test.c | 4 +---
tests/ide-test.c | 4 +---
tests/libqos/ahci.c | 1 +
tests/usb-hcd-ehci-test.c | 4 +---
tests/usb-hcd-ohci-test.c | 3 +--
tests/usb-hcd-uhci-test.c | 3 +--
tests/usb-hcd-xhci-test.c | 3 +--
tests/virtio-9p-test.c | 4 +---
translate-all.c | 9 +--------
translate-common.c | 1 +
xen-common-stub.c | 1 +
xen-common.c | 1 +
xen-hvm-stub.c | 1 +
xen-hvm.c | 1 +
xen-mapcache.c | 2 +-
786 files changed, 786 insertions(+), 339 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 01/37] migration: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
@ 2016-01-26 18:16 ` Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 02/37] crypto: " Peter Maydell
` (36 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:16 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
migration/block.c | 2 +-
migration/exec.c | 2 +-
migration/fd.c | 1 +
migration/migration.c | 1 +
migration/postcopy-ram.c | 4 +---
migration/qemu-file-buf.c | 1 +
migration/qemu-file-stdio.c | 1 +
migration/qemu-file-unix.c | 1 +
migration/qemu-file.c | 1 +
migration/ram.c | 2 +-
migration/rdma.c | 4 +---
migration/savevm.c | 2 +-
migration/tcp.c | 2 +-
migration/unix.c | 2 +-
migration/vmstate.c | 1 +
migration/xbzrle.c | 1 +
16 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/migration/block.c b/migration/block.c
index 656f38f..a444058 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -13,6 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "block/block.h"
#include "qemu/error-report.h"
@@ -24,7 +25,6 @@
#include "migration/migration.h"
#include "sysemu/blockdev.h"
#include "sysemu/block-backend.h"
-#include <assert.h>
#define BLOCK_SIZE (1 << 20)
#define BDRV_SECTORS_PER_DIRTY_CHUNK (BLOCK_SIZE >> BDRV_SECTOR_BITS)
diff --git a/migration/exec.c b/migration/exec.c
index 8406d2b..f1b5e47 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -15,13 +15,13 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qemu/main-loop.h"
#include "migration/migration.h"
#include "migration/qemu-file.h"
#include "block/block.h"
-#include <sys/types.h>
#include <sys/wait.h>
//#define DEBUG_MIGRATION_EXEC
diff --git a/migration/fd.c b/migration/fd.c
index 3e4bed0..c0afc96 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -13,6 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/main-loop.h"
#include "qemu/sockets.h"
diff --git a/migration/migration.c b/migration/migration.c
index aaca451..2c76998 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -13,6 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 3946aa9..02b28ed 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -16,9 +16,8 @@
* source to the destination before all the data has been copied.
*/
+#include "qemu/osdep.h"
#include <glib.h>
-#include <stdio.h>
-#include <unistd.h>
#include "qemu-common.h"
#include "migration/migration.h"
@@ -57,7 +56,6 @@ struct PostcopyDiscardState {
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/syscall.h>
-#include <sys/types.h>
#include <asm/types.h> /* for __u64 */
#endif
diff --git a/migration/qemu-file-buf.c b/migration/qemu-file-buf.c
index 49516b8..7b8e78e 100644
--- a/migration/qemu-file-buf.c
+++ b/migration/qemu-file-buf.c
@@ -25,6 +25,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/iov.h"
diff --git a/migration/qemu-file-stdio.c b/migration/qemu-file-stdio.c
index 9bde9db..f402e8f 100644
--- a/migration/qemu-file-stdio.c
+++ b/migration/qemu-file-stdio.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/coroutine.h"
#include "migration/qemu-file.h"
diff --git a/migration/qemu-file-unix.c b/migration/qemu-file-unix.c
index 6ca53e7..61b059b 100644
--- a/migration/qemu-file-unix.c
+++ b/migration/qemu-file-unix.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/iov.h"
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 0bbd257..6f4a129 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <zlib.h>
#include "qemu-common.h"
#include "qemu/error-report.h"
diff --git a/migration/ram.c b/migration/ram.c
index e49749d..40d0533 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -25,7 +25,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include <stdint.h>
+#include "qemu/osdep.h"
#include <zlib.h>
#include "qapi-event.h"
#include "qemu/bitops.h"
diff --git a/migration/rdma.c b/migration/rdma.c
index dcabb91..86a13b8 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -11,6 +11,7 @@
* later. See the COPYING file in the top-level directory.
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "migration/migration.h"
#include "migration/qemu-file.h"
@@ -20,12 +21,9 @@
#include "qemu/sockets.h"
#include "qemu/bitmap.h"
#include "qemu/coroutine.h"
-#include <stdio.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <arpa/inet.h>
-#include <string.h>
#include <rdma/rdma_cma.h>
#include "trace.h"
diff --git a/migration/savevm.c b/migration/savevm.c
index b9caf59..954988d 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -26,7 +26,7 @@
* THE SOFTWARE.
*/
-#include "config-host.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/boards.h"
#include "hw/hw.h"
diff --git a/migration/tcp.c b/migration/tcp.c
index ae89172..ae80e94 100644
--- a/migration/tcp.c
+++ b/migration/tcp.c
@@ -13,7 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include <string.h>
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
diff --git a/migration/unix.c b/migration/unix.c
index b591813..a721c4a 100644
--- a/migration/unix.c
+++ b/migration/unix.c
@@ -13,7 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include <string.h>
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
diff --git a/migration/vmstate.c b/migration/vmstate.c
index a7ad7f2..bf3d5db 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "migration/migration.h"
#include "migration/qemu-file.h"
diff --git a/migration/xbzrle.c b/migration/xbzrle.c
index 8e220bf..4db3f6c 100644
--- a/migration/xbzrle.c
+++ b/migration/xbzrle.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "include/migration/migration.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 02/37] crypto: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 01/37] migration: Clean up includes Peter Maydell
@ 2016-01-26 18:16 ` Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 03/37] exec: " Peter Maydell
` (35 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:16 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
crypto/aes.c | 1 +
crypto/cipher-builtin.c | 1 +
crypto/cipher-gcrypt.c | 1 +
crypto/cipher-nettle.c | 1 +
crypto/cipher.c | 1 +
crypto/desrfb.c | 1 +
crypto/hash.c | 1 +
crypto/init.c | 1 +
crypto/secret.c | 1 +
crypto/tlscreds.c | 1 +
crypto/tlscredsanon.c | 1 +
crypto/tlscredsx509.c | 1 +
crypto/tlssession.c | 1 +
13 files changed, 13 insertions(+)
diff --git a/crypto/aes.c b/crypto/aes.c
index 244a388..3456eac 100644
--- a/crypto/aes.c
+++ b/crypto/aes.c
@@ -27,6 +27,7 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "crypto/aes.h"
diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c
index 39e31a7..138b7a0 100644
--- a/crypto/cipher-builtin.c
+++ b/crypto/cipher-builtin.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/aes.h"
#include "crypto/desrfb.h"
diff --git a/crypto/cipher-gcrypt.c b/crypto/cipher-gcrypt.c
index c4f8114..56d4c9d 100644
--- a/crypto/cipher-gcrypt.c
+++ b/crypto/cipher-gcrypt.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include <gcrypt.h>
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
index 7449338..cd2675c 100644
--- a/crypto/cipher-nettle.c
+++ b/crypto/cipher-nettle.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include <nettle/nettle-types.h>
#include <nettle/aes.h>
#include <nettle/des.h>
diff --git a/crypto/cipher.c b/crypto/cipher.c
index 7c33348..076dff0 100644
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/cipher.h"
diff --git a/crypto/desrfb.c b/crypto/desrfb.c
index fc20a30..ec47dea 100644
--- a/crypto/desrfb.c
+++ b/crypto/desrfb.c
@@ -26,6 +26,7 @@
* (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
*/
+#include "qemu/osdep.h"
#include "crypto/desrfb.h"
static void scrunch(unsigned char *, unsigned long *);
diff --git a/crypto/hash.c b/crypto/hash.c
index 6e83f43..33324b6 100644
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/hash.h"
#ifdef CONFIG_GNUTLS_HASH
diff --git a/crypto/init.c b/crypto/init.c
index d94faac..31eea19 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/init.h"
#include "qemu/thread.h"
diff --git a/crypto/secret.c b/crypto/secret.c
index a799da1..90592c0 100644
--- a/crypto/secret.c
+++ b/crypto/secret.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/secret.h"
#include "crypto/cipher.h"
#include "qom/object_interfaces.h"
diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index e7d9c1c..38bb671 100644
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/tlscredspriv.h"
#include "trace.h"
diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index c3fcdaf..55e2047 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/tlscredsanon.h"
#include "crypto/tlscredspriv.h"
#include "qom/object_interfaces.h"
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index d58fdea..8664b82 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/tlscredsx509.h"
#include "crypto/tlscredspriv.h"
#include "crypto/secret.h"
diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index 3735529..e0d9658 100644
--- a/crypto/tlssession.c
+++ b/crypto/tlssession.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "crypto/tlssession.h"
#include "crypto/tlscredsanon.h"
#include "crypto/tlscredsx509.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 03/37] exec: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 01/37] migration: Clean up includes Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 02/37] crypto: " Peter Maydell
@ 2016-01-26 18:16 ` Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 04/37] lm32: " Peter Maydell
` (34 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:16 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
cpu-exec-common.c | 2 +-
cpu-exec.c | 2 +-
cpus.c | 2 +-
cputlb.c | 2 +-
exec.c | 4 +---
translate-all.c | 9 +--------
translate-common.c | 1 +
7 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/cpu-exec-common.c b/cpu-exec-common.c
index 43edf36..1b1731c 100644
--- a/cpu-exec-common.c
+++ b/cpu-exec-common.c
@@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/cpus.h"
#include "exec/memory-internal.h"
diff --git a/cpu-exec.c b/cpu-exec.c
index c88d0ff..c459364 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "cpu.h"
#include "trace.h"
#include "disas/disas.h"
diff --git a/cpus.c b/cpus.c
index 3efff6b..d42e8ed 100644
--- a/cpus.c
+++ b/cpus.c
@@ -23,7 +23,7 @@
*/
/* Needed early for CONFIG_BSD etc. */
-#include "config-host.h"
+#include "qemu/osdep.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
diff --git a/cputlb.c b/cputlb.c
index f6fb161..3973030 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/memory.h"
diff --git a/exec.c b/exec.c
index 7115403..9e076bc 100644
--- a/exec.c
+++ b/exec.c
@@ -16,9 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#ifndef _WIN32
-#include <sys/types.h>
#include <sys/mman.h>
#endif
@@ -30,7 +29,6 @@
#include "hw/boards.h"
#endif
#include "hw/qdev.h"
-#include "qemu/osdep.h"
#include "sysemu/kvm.h"
#include "sysemu/sysemu.h"
#include "hw/xen/xen.h"
diff --git a/translate-all.c b/translate-all.c
index 042a857..ab61fac 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -19,16 +19,10 @@
#ifdef _WIN32
#include <windows.h>
#else
-#include <sys/types.h>
#include <sys/mman.h>
#endif
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
-#include "config.h"
#include "qemu-common.h"
#define NO_CPU_IO_DEFS
@@ -43,7 +37,6 @@
#if __FreeBSD_version >= 700104
#define HAVE_KINFO_GETVMMAP
#define sigqueue sigqueue_freebsd /* avoid redefinition */
-#include <sys/time.h>
#include <sys/proc.h>
#include <machine/profile.h>
#define _KERNEL
diff --git a/translate-common.c b/translate-common.c
index 171222d..ffbfe85 100644
--- a/translate-common.c
+++ b/translate-common.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qom/cpu.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 04/37] lm32: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (2 preceding siblings ...)
2016-01-26 18:16 ` [Qemu-devel] [PATCH 03/37] exec: " Peter Maydell
@ 2016-01-26 18:16 ` Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 05/37] ppc: " Peter Maydell
` (33 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:16 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
disas/lm32.c | 2 +-
hw/char/lm32_juart.c | 1 +
hw/char/lm32_uart.c | 1 +
hw/char/milkymist-uart.c | 1 +
hw/display/milkymist-tmu2.c | 1 +
hw/display/milkymist-vgafb.c | 1 +
hw/input/milkymist-softusb.c | 1 +
hw/intc/lm32_pic.c | 2 +-
hw/lm32/lm32_boards.c | 1 +
hw/lm32/milkymist.c | 1 +
hw/misc/milkymist-hpdmc.c | 1 +
hw/misc/milkymist-pfpu.c | 1 +
hw/net/milkymist-minimac2.c | 1 +
hw/sd/milkymist-memcard.c | 1 +
hw/timer/lm32_timer.c | 1 +
hw/timer/milkymist-sysctl.c | 1 +
target-lm32/cpu.c | 1 +
target-lm32/gdbstub.c | 2 +-
target-lm32/helper.c | 1 +
target-lm32/lm32-semi.c | 5 +----
target-lm32/machine.c | 1 +
target-lm32/op_helper.c | 2 +-
target-lm32/translate.c | 1 +
23 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/disas/lm32.c b/disas/lm32.c
index 1718c86..fcc2cde 100644
--- a/disas/lm32.c
+++ b/disas/lm32.c
@@ -18,7 +18,7 @@
*
*/
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "disas/bfd.h"
typedef enum {
diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 62763f2..5bf8acf 100644
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 837a46e..036813d 100644
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -22,6 +22,7 @@
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index 9b89b7e..03b36b2 100644
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -21,6 +21,7 @@
* http://www.milkymist.org/socdoc/uart.pdf
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
index e2de281..9bc88f9 100644
--- a/hw/display/milkymist-tmu2.c
+++ b/hw/display/milkymist-tmu2.c
@@ -24,6 +24,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c
index ab3074f..19ca256 100644
--- a/hw/display/milkymist-vgafb.c
+++ b/hw/display/milkymist-vgafb.c
@@ -22,6 +22,7 @@
* http://www.milkymist.org/socdoc/vgafb.pdf
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index 8a02d35..64b9292 100644
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -21,6 +21,7 @@
* not available yet
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c
index 641ee47..edc08f1 100644
--- a/hw/intc/lm32_pic.c
+++ b/hw/intc/lm32_pic.c
@@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <assert.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index eb553a1..efa6f91 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 13976b3..5a37b4a 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c
index f5f4c1b..b97000f 100644
--- a/hw/misc/milkymist-hpdmc.c
+++ b/hw/misc/milkymist-hpdmc.c
@@ -21,6 +21,7 @@
* http://www.milkymist.org/socdoc/hpdmc.pdf
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c
index 08b604f..57acd7b 100644
--- a/hw/misc/milkymist-pfpu.c
+++ b/hw/misc/milkymist-pfpu.c
@@ -22,6 +22,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index 6302b8b..d35d39a 100644
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -22,6 +22,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index b430d56..c04ff02 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -21,6 +21,7 @@
* http://www.milkymist.org/socdoc/memcard.pdf
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index d2ab1e7..3198355 100644
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -21,6 +21,7 @@
* http://www.latticesemi.com/documents/mico32timer.pdf
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c
index 30535a4..5f29480 100644
--- a/hw/timer/milkymist-sysctl.c
+++ b/hw/timer/milkymist-sysctl.c
@@ -21,6 +21,7 @@
* http://www.milkymist.org/socdoc/sysctl.pdf
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c
index 0bc544c..f93bb5d 100644
--- a/target-lm32/cpu.c
+++ b/target-lm32/cpu.c
@@ -18,6 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
diff --git a/target-lm32/gdbstub.c b/target-lm32/gdbstub.c
index 4979a98..8ac1288 100644
--- a/target-lm32/gdbstub.c
+++ b/target-lm32/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
#include "hw/lm32/lm32_pic.h"
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index e26c133..3ebec68 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "sysemu/sysemu.h"
diff --git a/target-lm32/lm32-semi.c b/target-lm32/lm32-semi.c
index ec6524f..20f1a1c 100644
--- a/target-lm32/lm32-semi.c
+++ b/target-lm32/lm32-semi.c
@@ -10,10 +10,7 @@
* See the COPYING file in the top-level directory.
*/
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stddef.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/log.h"
diff --git a/target-lm32/machine.c b/target-lm32/machine.c
index 8327c6d..91c943d 100644
--- a/target-lm32/machine.c
+++ b/target-lm32/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index 61209c1..b6759e0 100644
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -1,4 +1,4 @@
-#include <assert.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index fa5b0b9..477d428 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "exec/helper-proto.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 05/37] ppc: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (3 preceding siblings ...)
2016-01-26 18:16 ` [Qemu-devel] [PATCH 04/37] lm32: " Peter Maydell
@ 2016-01-26 18:16 ` Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 06/37] sparc: " Peter Maydell
` (32 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:16 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
disas/ppc.c | 1 +
hw/char/spapr_vty.c | 1 +
hw/intc/xics.c | 1 +
hw/intc/xics_kvm.c | 1 +
hw/isa/pc87312.c | 1 +
hw/misc/macio/cuda.c | 1 +
hw/misc/macio/mac_dbdma.c | 1 +
hw/misc/macio/macio.c | 1 +
hw/net/spapr_llan.c | 1 +
hw/nvram/spapr_nvram.c | 1 +
hw/pci-bridge/dec.c | 1 +
hw/pci-host/grackle.c | 1 +
hw/pci-host/prep.c | 1 +
hw/pci-host/uninorth.c | 1 +
hw/ppc/e500.c | 2 +-
hw/ppc/e500plat.c | 2 +-
hw/ppc/mac_newworld.c | 1 +
hw/ppc/mac_oldworld.c | 1 +
hw/ppc/mpc8544_guts.c | 1 +
hw/ppc/mpc8544ds.c | 2 +-
hw/ppc/ppc.c | 1 +
hw/ppc/ppc405_boards.c | 1 +
hw/ppc/ppc405_uc.c | 1 +
hw/ppc/ppc440_bamboo.c | 2 +-
hw/ppc/ppc4xx_devs.c | 1 +
hw/ppc/ppc4xx_pci.c | 1 +
hw/ppc/ppc_booke.c | 1 +
hw/ppc/ppce500_spin.c | 1 +
hw/ppc/prep.c | 1 +
hw/ppc/spapr.c | 1 +
hw/ppc/spapr_drc.c | 1 +
hw/ppc/spapr_events.c | 1 +
hw/ppc/spapr_hcall.c | 1 +
hw/ppc/spapr_iommu.c | 1 +
hw/ppc/spapr_pci.c | 1 +
hw/ppc/spapr_pci_vfio.c | 1 +
hw/ppc/spapr_rng.c | 1 +
hw/ppc/spapr_rtas.c | 1 +
hw/ppc/spapr_rtc.c | 1 +
hw/ppc/spapr_vio.c | 1 +
hw/ppc/virtex_ml507.c | 1 +
hw/scsi/spapr_vscsi.c | 1 +
target-ppc/arch_dump.c | 1 +
target-ppc/cpu-models.c | 1 +
target-ppc/dfp_helper.c | 1 +
target-ppc/excp_helper.c | 1 +
target-ppc/fpu_helper.c | 1 +
target-ppc/gdbstub.c | 2 +-
target-ppc/int_helper.c | 1 +
target-ppc/kvm-stub.c | 1 +
target-ppc/kvm.c | 2 +-
target-ppc/machine.c | 1 +
target-ppc/mem_helper.c | 1 +
target-ppc/mfrom_table_gen.c | 3 +--
target-ppc/misc_helper.c | 1 +
target-ppc/mmu-hash32.c | 1 +
target-ppc/mmu-hash64.c | 1 +
target-ppc/mmu_helper.c | 1 +
target-ppc/monitor.c | 1 +
target-ppc/timebase_helper.c | 1 +
target-ppc/translate.c | 1 +
target-ppc/translate_init.c | 4 +---
target-ppc/user_only_helper.c | 1 +
63 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/disas/ppc.c b/disas/ppc.c
index 99c4cbc..478332b 100644
--- a/disas/ppc.c
+++ b/disas/ppc.c
@@ -18,6 +18,7 @@ the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this file; see the file COPYING. If not,
see <http://www.gnu.org/licenses/>. */
+#include "qemu/osdep.h"
#include "disas/bfd.h"
#define BFD_DEFAULT_TARGET_SIZE 64
diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 36b328b..747c69d 100644
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/qdev.h"
#include "sysemu/char.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 9ff5796..cd91ddc 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -25,6 +25,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "trace.h"
#include "qemu/timer.h"
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index d58729c..9fe0667 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -25,6 +25,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "trace.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 3803065..6b5c7a2 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/isa/pc87312.h"
#include "qemu/error-report.h"
#include "sysemu/block-backend.h"
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 9db4c64..8d450cf 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/input/adb.h"
diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index 5ee8f02..c6d5b96 100644
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -36,6 +36,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/ppc/mac_dbdma.h"
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index adb990e..42325bf 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 1ca5e9c..5237b4d 100644
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "net/net.h"
#include "hw/qdev.h"
diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index fcaa77d..32d5a36 100644
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <libfdt.h>
#include "sysemu/block-backend.h"
diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c
index 28d0ff9..40ff0d0 100644
--- a/hw/pci-bridge/dec.c
+++ b/hw/pci-bridge/dec.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "dec.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index ea31b72..8f91216 100644
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci_host.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index f434596..5dc550f 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 215b64f..778f8e6 100644
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index bd7da47..bd84e9a 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -14,7 +14,7 @@
* (at your option) any later version.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "e500.h"
#include "e500-ccsr.h"
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 384b6e8..b00565c 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -9,7 +9,7 @@
* (at your option) any later version.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "e500.h"
#include "hw/boards.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index ca3d6a8..f95086b 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -46,6 +46,7 @@
* 0001:05:0c.0 IDE interface [0101]: Broadcom K2 SATA [1166:0240]
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/mac.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index c3f9fe3..8984398 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -23,6 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "mac.h"
diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index a10abe9..ce399d1 100644
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -17,6 +17,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 0afbd34..27b8289 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -9,7 +9,7 @@
* (at your option) any later version.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "e500.h"
#include "hw/boards.h"
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index 2c604ef..ce90b09 100644
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc_e500.h"
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 31bc186..6797808 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index 10f5dda..ec81f65 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/boards.h"
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index b66c113..e535a9f 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -11,7 +11,7 @@
*
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "net/net.h"
#include "hw/hw.h"
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 2f38ff7..7d59018 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 0bb3cdb..683218e 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -19,6 +19,7 @@
/* This file implements emulation of the 32-bit PCI controller found in some
* 4xx SoCs, such as the 440EP. */
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
index 8b94da6..a8d4e76 100644
--- a/hw/ppc/ppc_booke.c
+++ b/hw/ppc/ppc_booke.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "qemu/timer.h"
diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
index a99f7b0..76bd78b 100644
--- a/hw/ppc/ppce500_spin.c
+++ b/hw/ppc/ppce500_spin.c
@@ -27,6 +27,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 0e102fc..793b9ed 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/timer/m48t59.h"
#include "hw/i386/pc.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 50e5a26..08da895 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "sysemu/numa.h"
#include "hw/hw.h"
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index dccb908..90016e6 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/ppc/spapr_drc.h"
#include "qom/object.h"
#include "hw/qdev.h"
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index 333e6ff..f5eac4b 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/sysemu.h"
#include "sysemu/char.h"
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index cebceea..51083cd 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "helper_regs.h"
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index ed28565..7dd4588 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/kvm.h"
#include "hw/qdev.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 55fa8db..cca9257 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
index a61b418..2f3752e 100644
--- a/hw/ppc/spapr_pci_vfio.c
+++ b/hw/ppc/spapr_pci_vfio.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
#include "hw/pci/msix.h"
diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c
index ed43d5e..8484fcf 100644
--- a/hw/ppc/spapr_rng.c
+++ b/hw/ppc/spapr_rng.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index 34b12a3..f3ead8c 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/sysemu.h"
#include "sysemu/char.h"
diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index b591a8e..02fa373 100644
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -25,6 +25,7 @@
* THE SOFTWARE.
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 46f3b8d..ac6666a 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -19,6 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index c2b5e44..a902c88 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/char/serial.h"
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index f4f5140..e4833d5 100644
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -31,6 +31,7 @@
* - Add indirect descriptors support
* - Maybe do autosense (PAPR seems to mandate it, linux doesn't care)
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/scsi/scsi.h"
#include "block/scsi.h"
diff --git a/target-ppc/arch_dump.c b/target-ppc/arch_dump.c
index 816dbc2..df1fd8c 100644
--- a/target-ppc/arch_dump.c
+++ b/target-ppc/arch_dump.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "elf.h"
#include "exec/cpu-all.h"
diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c
index 4d5ab4b..884e31d 100644
--- a/target-ppc/cpu-models.c
+++ b/target-ppc/cpu-models.c
@@ -24,6 +24,7 @@
* inside "#if defined(TODO) ... #endif" statements to make tests easier.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "cpu-models.h"
diff --git a/target-ppc/dfp_helper.c b/target-ppc/dfp_helper.c
index 451e434..db0ede6 100644
--- a/target-ppc/dfp_helper.c
+++ b/target-ppc/dfp_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c
index dbc070c..c890853 100644
--- a/target-ppc/excp_helper.c
+++ b/target-ppc/excp_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c
index 9f2d53d..b67ebca 100644
--- a/target-ppc/fpu_helper.c
+++ b/target-ppc/fpu_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-ppc/gdbstub.c b/target-ppc/gdbstub.c
index 14675f4..ef4be23 100644
--- a/target-ppc/gdbstub.c
+++ b/target-ppc/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c
index b122868..27b0258 100644
--- a/target-ppc/int_helper.c
+++ b/target-ppc/int_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
diff --git a/target-ppc/kvm-stub.c b/target-ppc/kvm-stub.c
index ee3f5d2..627bcb4 100644
--- a/target-ppc/kvm-stub.c
+++ b/target-ppc/kvm-stub.c
@@ -9,6 +9,7 @@
* See the COPYING file in the top-level directory.
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/ppc/openpic.h"
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 9940a90..c2e8912 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -14,8 +14,8 @@
*
*/
+#include "qemu/osdep.h"
#include <dirent.h>
-#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/vfs.h>
diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index f4ac761..8e30b7a 100644
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/kvm.h"
diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index 7e1f234..581d9fa 100644
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
diff --git a/target-ppc/mfrom_table_gen.c b/target-ppc/mfrom_table_gen.c
index a140ded..6317918 100644
--- a/target-ppc/mfrom_table_gen.c
+++ b/target-ppc/mfrom_table_gen.c
@@ -1,6 +1,5 @@
#define _GNU_SOURCE
-#include <stdint.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
#include <math.h>
int main (void)
diff --git a/target-ppc/misc_helper.c b/target-ppc/misc_helper.c
index 6b12ca8..73e3b05 100644
--- a/target-ppc/misc_helper.c
+++ b/target-ppc/misc_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c
index a00ae3c..022e947 100644
--- a/target-ppc/mmu-hash32.c
+++ b/target-ppc/mmu-hash32.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "sysemu/kvm.h"
diff --git a/target-ppc/mmu-hash64.c b/target-ppc/mmu-hash64.c
index 34e20fa..8d28ed4 100644
--- a/target-ppc/mmu-hash64.c
+++ b/target-ppc/mmu-hash64.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "sysemu/kvm.h"
diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 5217691..d4f7926 100644
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "sysemu/kvm.h"
diff --git a/target-ppc/monitor.c b/target-ppc/monitor.c
index bc571b8..c2d0806 100644
--- a/target-ppc/monitor.c
+++ b/target-ppc/monitor.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
diff --git a/target-ppc/timebase_helper.c b/target-ppc/timebase_helper.c
index cafa283..3b340d7 100644
--- a/target-ppc/timebase_helper.c
+++ b/target-ppc/timebase_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 4be7eaa..3beeb45 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 4ab2d92..dcd4530 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "exec/gdbstub.h"
#include <sysemu/kvm.h>
@@ -8471,8 +8472,6 @@ static void dump_ppc_sprs (CPUPPCState *env)
#endif
/*****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
/* Opcode types */
enum {
@@ -9303,7 +9302,6 @@ static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
return -1;
}
-#include <ctype.h>
static ObjectClass *ppc_cpu_class_by_name(const char *name);
diff --git a/target-ppc/user_only_helper.c b/target-ppc/user_only_helper.c
index 829f66f..6aff347 100644
--- a/target-ppc/user_only_helper.c
+++ b/target-ppc/user_only_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
int ppc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw,
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 06/37] sparc: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (4 preceding siblings ...)
2016-01-26 18:16 ` [Qemu-devel] [PATCH 05/37] ppc: " Peter Maydell
@ 2016-01-26 18:16 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 07/37] s390: " Peter Maydell
` (31 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:16 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/char/grlib_apbuart.c | 1 +
hw/intc/grlib_irqmp.c | 1 +
hw/sparc/leon3.c | 1 +
hw/sparc/sun4m.c | 1 +
hw/sparc64/sun4u.c | 1 +
hw/timer/grlib_gptimer.c | 1 +
target-sparc/cc_helper.c | 1 +
target-sparc/cpu.c | 1 +
target-sparc/fop_helper.c | 1 +
target-sparc/gdbstub.c | 2 +-
target-sparc/helper.c | 1 +
target-sparc/int32_helper.c | 1 +
target-sparc/int64_helper.c | 1 +
target-sparc/ldst_helper.c | 1 +
target-sparc/machine.c | 1 +
target-sparc/mmu_helper.c | 1 +
target-sparc/monitor.c | 1 +
target-sparc/translate.c | 6 +-----
target-sparc/vis_helper.c | 1 +
target-sparc/win_helper.c | 1 +
20 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 35ef661..871524c 100644
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/char.h"
diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c
index d1813f7..f5ca8f7 100644
--- a/hw/intc/grlib_irqmp.c
+++ b/hw/intc/grlib_irqmp.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "cpu.h"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 22d1e7e..07c5c85 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 230dac9..1fcec44 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 861727f..124c376 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci-host/apb.h"
diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index d655bb2..dd000f5 100644
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
diff --git a/target-sparc/cc_helper.c b/target-sparc/cc_helper.c
index 35dab73..44c4409 100644
--- a/target-sparc/cc_helper.c
+++ b/target-sparc/cc_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c
index c197a0f..ce903f8 100644
--- a/target-sparc/cpu.c
+++ b/target-sparc/cpu.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/error-report.h"
diff --git a/target-sparc/fop_helper.c b/target-sparc/fop_helper.c
index ee4592e..0830643 100644
--- a/target-sparc/fop_helper.c
+++ b/target-sparc/fop_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-sparc/gdbstub.c b/target-sparc/gdbstub.c
index 3de3242..e530dc5 100644
--- a/target-sparc/gdbstub.c
+++ b/target-sparc/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 6600834..8349cbe 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
diff --git a/target-sparc/int32_helper.c b/target-sparc/int32_helper.c
index 7c380ba..d4d6a4b 100644
--- a/target-sparc/int32_helper.c
+++ b/target-sparc/int32_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "trace.h"
#include "sysemu/sysemu.h"
diff --git a/target-sparc/int64_helper.c b/target-sparc/int64_helper.c
index b02d22b..ddef66b 100644
--- a/target-sparc/int64_helper.c
+++ b/target-sparc/int64_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "trace.h"
diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
index c7ad47d..b0600fd 100644
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index aecbe2c..1046016 100644
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "qemu/timer.h"
diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c
index 7495406..aa80c48 100644
--- a/target-sparc/mmu_helper.c
+++ b/target-sparc/mmu_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "trace.h"
#include "exec/address-spaces.h"
diff --git a/target-sparc/monitor.c b/target-sparc/monitor.c
index ca54d72..7cc1b0f 100644
--- a/target-sparc/monitor.c
+++ b/target-sparc/monitor.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index f99ceed..747f94d 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -18,11 +18,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
diff --git a/target-sparc/vis_helper.c b/target-sparc/vis_helper.c
index 45fc7db..8a9b763 100644
--- a/target-sparc/vis_helper.c
+++ b/target-sparc/vis_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-sparc/win_helper.c b/target-sparc/win_helper.c
index 5b6d7b5..a8a6c0c 100644
--- a/target-sparc/win_helper.c
+++ b/target-sparc/win_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "trace.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 07/37] s390: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (5 preceding siblings ...)
2016-01-26 18:16 ` [Qemu-devel] [PATCH 06/37] sparc: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-27 8:41 ` Cornelia Huck
2016-01-26 18:17 ` [Qemu-devel] [PATCH 08/37] unicore: " Peter Maydell
` (30 subsequent siblings)
37 siblings, 1 reply; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/char/sclpconsole-lm.c | 1 +
hw/char/sclpconsole.c | 1 +
hw/s390x/css.c | 1 +
hw/s390x/event-facility.c | 1 +
hw/s390x/ipl.c | 1 +
hw/s390x/s390-pci-bus.c | 1 +
hw/s390x/s390-pci-inst.c | 1 +
hw/s390x/s390-skeys-kvm.c | 1 +
hw/s390x/s390-skeys.c | 1 +
hw/s390x/s390-virtio-ccw.c | 1 +
hw/s390x/s390-virtio-hcall.c | 1 +
hw/s390x/s390-virtio.c | 1 +
hw/s390x/sclp.c | 1 +
hw/s390x/sclpcpu.c | 1 +
hw/s390x/sclpquiesce.c | 1 +
hw/s390x/virtio-ccw.c | 1 +
hw/watchdog/wdt_diag288.c | 1 +
target-s390x/arch_dump.c | 1 +
target-s390x/cc_helper.c | 1 +
target-s390x/cpu.c | 1 +
target-s390x/fpu_helper.c | 1 +
target-s390x/gdbstub.c | 2 +-
target-s390x/helper.c | 1 +
target-s390x/int_helper.c | 1 +
target-s390x/interrupt.c | 1 +
target-s390x/ioinst.c | 2 +-
target-s390x/kvm.c | 2 +-
target-s390x/machine.c | 1 +
target-s390x/mem_helper.c | 1 +
target-s390x/misc_helper.c | 2 +-
target-s390x/mmu_helper.c | 1 +
target-s390x/translate.c | 1 +
32 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c
index 02ac80b..7d4ff81 100644
--- a/hw/char/sclpconsole-lm.c
+++ b/hw/char/sclpconsole-lm.c
@@ -13,6 +13,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/qdev.h"
#include "qemu/thread.h"
#include "qemu/error-report.h"
diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index b014c7f..45997ff 100644
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include <hw/qdev.h>
#include "qemu/thread.h"
#include "qemu/error-report.h"
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 343c352..db96b66 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -9,6 +9,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include <hw/qdev.h>
#include "qemu/bitops.h"
#include "exec/address-spaces.h"
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 907b485..85be24d 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -15,6 +15,7 @@
*
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 9c01be5..6992add 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "elf.h"
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 132588b..5d6cebb 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -11,6 +11,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "s390-pci-bus.h"
#include <hw/pci/pci_bus.h>
#include <hw/pci/msi.h>
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 1a6a3e7..fe73ca8 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -11,6 +11,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "s390-pci-inst.h"
#include "s390-pci-bus.h"
#include <exec/memory-internal.h>
diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c
index eaa37ba..131da56 100644
--- a/hw/s390x/s390-skeys-kvm.c
+++ b/hw/s390x/s390-skeys-kvm.c
@@ -9,6 +9,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "hw/s390x/storage-keys.h"
#include "sysemu/kvm.h"
#include "qemu/error-report.h"
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index f2b732e..18c14ea 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -9,6 +9,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "hw/boards.h"
#include "qmp-commands.h"
#include "migration/qemu-file.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 586ddbb..89f5d0d 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -9,6 +9,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
#include "s390-virtio.h"
diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c
index c7bdc20..23d67d6 100644
--- a/hw/s390x/s390-virtio-hcall.c
+++ b/hw/s390x/s390-virtio-hcall.c
@@ -9,6 +9,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "hw/s390x/s390-virtio.h"
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index 946325f..9efb9c6 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -21,6 +21,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qapi/qmp/qerror.h"
#include "qemu/error-report.h"
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 74f2b40..5de0219 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/kvm.h"
#include "exec/memory.h"
diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c
index 322eb31..b1f3ef8 100644
--- a/hw/s390x/sclpcpu.c
+++ b/hw/s390x/sclpcpu.c
@@ -12,6 +12,7 @@
* option) any later version. See the COPYING file in the top-level directory.
*
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/s390x/sclp.h"
#include "hw/s390x/event-facility.h"
diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index 15b06e1..c0ecab9 100644
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -11,6 +11,7 @@
* option) any later version. See the COPYING file in the top-level directory.
*
*/
+#include "qemu/osdep.h"
#include <hw/qdev.h>
#include "sysemu/sysemu.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 95a6c14..74b9e2e 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -10,6 +10,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c
index 2a885a4..fbb8383 100644
--- a/hw/watchdog/wdt_diag288.c
+++ b/hw/watchdog/wdt_diag288.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "sysemu/watchdog.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
diff --git a/target-s390x/arch_dump.c b/target-s390x/arch_dump.c
index 549a99b..4731869 100644
--- a/target-s390x/arch_dump.c
+++ b/target-s390x/arch_dump.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "elf.h"
#include "exec/cpu-all.h"
diff --git a/target-s390x/cc_helper.c b/target-s390x/cc_helper.c
index c4ee002..0d9411b 100644
--- a/target-s390x/cc_helper.c
+++ b/target-s390x/cc_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index e5a3f65..45ae725 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -23,6 +23,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "qemu/timer.h"
diff --git a/target-s390x/fpu_helper.c b/target-s390x/fpu_helper.c
index 45b7ddf..1c7f673 100644
--- a/target-s390x/fpu_helper.c
+++ b/target-s390x/fpu_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/cpu_ldst.h"
#include "exec/helper-proto.h"
diff --git a/target-s390x/gdbstub.c b/target-s390x/gdbstub.c
index a05d1cd..9fc36cb 100644
--- a/target-s390x/gdbstub.c
+++ b/target-s390x/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
#include "qemu/bitops.h"
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index e541d69..15707ab 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
#include "qemu/timer.h"
diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c
index a46c736..cc1071e 100644
--- a/target-s390x/int_helper.c
+++ b/target-s390x/int_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c
index 1404d0a..07d210a 100644
--- a/target-s390x/interrupt.c
+++ b/target-s390x/interrupt.c
@@ -7,6 +7,7 @@
* option) any later version. See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/kvm.h"
diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c
index 77f2a1f..564dc28 100644
--- a/target-s390x/ioinst.c
+++ b/target-s390x/ioinst.c
@@ -9,7 +9,7 @@
* directory.
*/
-#include <sys/types.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "ioinst.h"
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index b8222cc..9b21b96 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -21,7 +21,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/types.h>
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/target-s390x/machine.c b/target-s390x/machine.c
index b76fb08..c46bf3a 100644
--- a/target-s390x/machine.c
+++ b/target-s390x/machine.c
@@ -14,6 +14,7 @@
* or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "cpu.h"
#include "sysemu/kvm.h"
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index 90399f1..7078622 100644
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index dab02d3..71cbe34 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -18,11 +18,11 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/memory.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
-#include <string.h>
#include "sysemu/kvm.h"
#include "qemu/timer.h"
#include "exec/address-spaces.h"
diff --git a/target-s390x/mmu_helper.c b/target-s390x/mmu_helper.c
index f4e1872..5323c53 100644
--- a/target-s390x/mmu_helper.c
+++ b/target-s390x/mmu_helper.c
@@ -15,6 +15,7 @@
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "exec/address-spaces.h"
#include "cpu.h"
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index c79a2cb..811928b 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -28,6 +28,7 @@
# define LOG_DISAS(...) do { } while (0)
#endif
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 08/37] unicore: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (6 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 07/37] s390: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 09/37] linux-user: " Peter Maydell
` (29 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/dma/puv3_dma.c | 1 +
hw/gpio/puv3_gpio.c | 1 +
hw/intc/puv3_intc.c | 1 +
hw/misc/puv3_pm.c | 1 +
hw/timer/puv3_ost.c | 1 +
hw/unicore32/puv3.c | 1 +
target-unicore32/cpu.c | 1 +
target-unicore32/helper.c | 1 +
target-unicore32/op_helper.c | 1 +
target-unicore32/softmmu.c | 1 +
target-unicore32/translate.c | 6 +-----
target-unicore32/ucf64_helper.c | 1 +
12 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c
index 101bd7f..b97a6c1 100644
--- a/hw/dma/puv3_dma.c
+++ b/hw/dma/puv3_dma.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 39840aa..445afcc 100644
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c
index c2803d0..ef8488a 100644
--- a/hw/intc/puv3_intc.c
+++ b/hw/intc/puv3_intc.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#undef DEBUG_PUV3
diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c
index 37f2369..577ceba 100644
--- a/hw/misc/puv3_pm.c
+++ b/hw/misc/puv3_pm.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index fa9eefd..93650b7 100644
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/ptimer.h"
#include "qemu/main-loop.h"
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 1968202..4522fa2 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -9,6 +9,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "ui/console.h"
#include "elf.h"
diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
index e5252eb..c92ccc4 100644
--- a/target-unicore32/cpu.c
+++ b/target-unicore32/cpu.c
@@ -12,6 +12,7 @@
* or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "migration/vmstate.h"
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index ae63277..21f5f35 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -9,6 +9,7 @@
* or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
#include "exec/helper-proto.h"
diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
index 0266dbd..f584730 100644
--- a/target-unicore32/op_helper.c
+++ b/target-unicore32/op_helper.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation, or (at your option) any
* later version. See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c
index 9a3786d..d267fed 100644
--- a/target-unicore32/softmmu.c
+++ b/target-unicore32/softmmu.c
@@ -12,6 +12,7 @@
#error This file only exist under softmmu circumstance
#endif
+#include "qemu/osdep.h"
#include <cpu.h>
#undef DEBUG_UC32
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index d2f92f0..5db8f94 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -8,11 +8,7 @@
* published by the Free Software Foundation, or (at your option) any
* later version. See the COPYING file in the top-level directory.
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
diff --git a/target-unicore32/ucf64_helper.c b/target-unicore32/ucf64_helper.c
index 5af008f..6c91901 100644
--- a/target-unicore32/ucf64_helper.c
+++ b/target-unicore32/ucf64_helper.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 09/37] linux-user: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (7 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 08/37] unicore: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 10/37] x86: " Peter Maydell
` (28 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-user/arm/nwfpe/double_cpdo.c | 1 +
linux-user/arm/nwfpe/extended_cpdo.c | 1 +
linux-user/arm/nwfpe/fpa11.c | 2 +-
linux-user/arm/nwfpe/fpa11_cpdo.c | 1 +
linux-user/arm/nwfpe/fpa11_cpdt.c | 1 +
linux-user/arm/nwfpe/fpa11_cprt.c | 1 +
linux-user/arm/nwfpe/fpopcode.c | 1 +
linux-user/arm/nwfpe/single_cpdo.c | 1 +
linux-user/elfload.c | 10 +---------
linux-user/flatload.c | 5 +----
linux-user/linuxload.c | 8 +-------
linux-user/m68k-sim.c | 9 +--------
linux-user/main.c | 7 +------
linux-user/mmap.c | 9 +--------
linux-user/signal.c | 7 +------
linux-user/strace.c | 4 +---
linux-user/syscall.c | 14 +-------------
linux-user/uaccess.c | 3 +--
linux-user/uname.c | 2 +-
linux-user/vm86.c | 7 +------
20 files changed, 20 insertions(+), 74 deletions(-)
diff --git a/linux-user/arm/nwfpe/double_cpdo.c b/linux-user/arm/nwfpe/double_cpdo.c
index 41c28f3..1cef380 100644
--- a/linux-user/arm/nwfpe/double_cpdo.c
+++ b/linux-user/arm/nwfpe/double_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/extended_cpdo.c b/linux-user/arm/nwfpe/extended_cpdo.c
index 48eca3b..1c8a412 100644
--- a/linux-user/arm/nwfpe/extended_cpdo.c
+++ b/linux-user/arm/nwfpe/extended_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpa11.c b/linux-user/arm/nwfpe/fpa11.c
index eebd93f..441e3b1 100644
--- a/linux-user/arm/nwfpe/fpa11.c
+++ b/linux-user/arm/nwfpe/fpa11.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpopcode.h"
@@ -27,7 +28,6 @@
//#include <asm/system.h>
-#include <stdio.h>
FPA11* qemufpa = NULL;
CPUARMState* user_registers;
diff --git a/linux-user/arm/nwfpe/fpa11_cpdo.c b/linux-user/arm/nwfpe/fpa11_cpdo.c
index 5f4a6a4..94ac98a 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdo.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c b/linux-user/arm/nwfpe/fpa11_cpdt.c
index 007a3d6..c32b0c2 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdt.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdt.c
@@ -19,6 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpa11_cprt.c b/linux-user/arm/nwfpe/fpa11_cprt.c
index 7be93fa..04dc2eb 100644
--- a/linux-user/arm/nwfpe/fpa11_cprt.c
+++ b/linux-user/arm/nwfpe/fpa11_cprt.c
@@ -19,6 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpopcode.c b/linux-user/arm/nwfpe/fpopcode.c
index 0ada30c..6784256 100644
--- a/linux-user/arm/nwfpe/fpopcode.c
+++ b/linux-user/arm/nwfpe/fpopcode.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/single_cpdo.c b/linux-user/arm/nwfpe/single_cpdo.c
index 2bfb359..21e177b 100644
--- a/linux-user/arm/nwfpe/single_cpdo.c
+++ b/linux-user/arm/nwfpe/single_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index b90be12..19dc7f5 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1,17 +1,9 @@
/* This is the Linux kernel elf-loading code, ported into user space */
-#include <sys/time.h>
+#include "qemu/osdep.h"
#include <sys/param.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
#include <sys/mman.h>
#include <sys/resource.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
#include "qemu.h"
#include "disas/disas.h"
diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index ceacb98..a25c797 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -33,11 +33,8 @@
/****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
-#include <unistd.h>
#include "qemu.h"
#include "flat.h"
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index dbaf0ec..6f0d605 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -1,12 +1,6 @@
/* Code for loading Linux executables. Mostly linux kernel code. */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "qemu/osdep.h"
#include "qemu.h"
diff --git a/linux-user/m68k-sim.c b/linux-user/m68k-sim.c
index 1994e40..34d332d 100644
--- a/linux-user/m68k-sim.c
+++ b/linux-user/m68k-sim.c
@@ -17,14 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
+#include "qemu/osdep.h"
#include "qemu.h"
diff --git a/linux-user/main.c b/linux-user/main.c
index ee12035..f8d4577 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -16,12 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/resource.h>
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 445e8c6..3519147 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -16,14 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
#include <linux/mman.h>
#include <linux/unistd.h>
diff --git a/linux-user/signal.c b/linux-user/signal.c
index d4d83f2..327c032 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -16,12 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <errno.h>
+#include "qemu/osdep.h"
#include <sys/ucontext.h>
#include <sys/resource.h>
diff --git a/linux-user/strace.c b/linux-user/strace.c
index ea6c1d2..0810c85 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1,13 +1,11 @@
-#include <stdio.h>
+#include "qemu/osdep.h"
#include <sys/ipc.h>
#include <sys/msg.h>
#include <sys/sem.h>
#include <sys/shm.h>
#include <sys/select.h>
-#include <sys/types.h>
#include <sys/mount.h>
#include <sys/mman.h>
-#include <unistd.h>
#include <sched.h>
#include "qemu.h"
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0cbace4..54ce14a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -17,24 +17,13 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _ATFILE_SOURCE
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include <elf.h>
#include <endian.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <limits.h>
#include <grp.h>
-#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/msg.h>
#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/file.h>
#include <sys/fsuid.h>
@@ -44,7 +33,6 @@
#include <sys/mman.h>
#include <sys/swap.h>
#include <linux/capability.h>
-#include <signal.h>
#include <sched.h>
#ifdef __ia64__
int __clone2(int (*fn)(void *), void *child_stack_base,
diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c
index a4d108c..75d890d 100644
--- a/linux-user/uaccess.c
+++ b/linux-user/uaccess.c
@@ -1,6 +1,5 @@
/* User memory access */
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include "qemu.h"
diff --git a/linux-user/uname.c b/linux-user/uname.c
index 1e6560d..313b79d 100644
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -17,7 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "qemu.h"
//#include "qemu-common.h"
diff --git a/linux-user/vm86.c b/linux-user/vm86.c
index 22a4eb9..3829b9a 100644
--- a/linux-user/vm86.c
+++ b/linux-user/vm86.c
@@ -16,12 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
#include "qemu.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 10/37] x86: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (8 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 09/37] linux-user: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 11/37] alpha: " Peter Maydell
` (27 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/acpi/acpi_interface.c | 1 +
hw/acpi/aml-build.c | 6 +-----
hw/acpi/bios-linker-loader.c | 1 +
hw/acpi/core.c | 1 +
hw/acpi/cpu_hotplug.c | 1 +
hw/acpi/cpu_hotplug_acpi_table.c | 1 +
hw/acpi/ich9.c | 1 +
hw/acpi/memory_hotplug.c | 1 +
hw/acpi/memory_hotplug_acpi_table.c | 2 +-
hw/acpi/nvdimm.c | 1 +
hw/acpi/pcihp.c | 1 +
hw/acpi/piix4.c | 1 +
hw/acpi/tco.c | 1 +
hw/char/debugcon.c | 1 +
hw/char/parallel.c | 1 +
hw/char/serial-isa.c | 1 +
hw/char/serial-pci.c | 1 +
hw/char/serial.c | 1 +
hw/dma/i8257.c | 1 +
hw/i2c/pm_smbus.c | 1 +
hw/i2c/smbus_ich9.c | 1 +
hw/i386/acpi-build.c | 3 +--
hw/i386/intel_iommu.c | 1 +
hw/i386/kvm/apic.c | 1 +
hw/i386/kvm/clock.c | 1 +
hw/i386/kvm/i8254.c | 1 +
hw/i386/kvm/i8259.c | 1 +
hw/i386/kvm/ioapic.c | 1 +
hw/i386/kvm/pci-assign.c | 5 +----
hw/i386/kvmvapic.c | 1 +
hw/i386/multiboot.c | 1 +
hw/i386/pc.c | 1 +
hw/i386/pc_piix.c | 1 +
hw/i386/pc_q35.c | 1 +
hw/i386/pc_sysfw.c | 1 +
hw/i386/pci-assign-load-rom.c | 5 +----
hw/i386/xen/xen_apic.c | 1 +
hw/i386/xen/xen_platform.c | 1 +
hw/i386/xen/xen_pvdevice.c | 1 +
hw/intc/apic.c | 1 +
hw/intc/apic_common.c | 1 +
hw/intc/ioapic.c | 1 +
hw/intc/ioapic_common.c | 1 +
hw/isa/lpc_ich9.c | 1 +
hw/isa/piix4.c | 1 +
hw/misc/debugexit.c | 1 +
hw/misc/pc-testdev.c | 2 +-
hw/misc/sga.c | 1 +
hw/pci-host/pam.c | 1 +
hw/pci-host/piix.c | 1 +
hw/pci-host/q35.c | 1 +
hw/timer/hpet.c | 1 +
hw/timer/i8254.c | 1 +
hw/timer/i8254_common.c | 1 +
hw/timer/mc146818rtc.c | 1 +
target-i386/arch_dump.c | 1 +
target-i386/arch_memory_mapping.c | 1 +
target-i386/bpt_helper.c | 1 +
target-i386/cc_helper.c | 1 +
target-i386/excp_helper.c | 1 +
target-i386/fpu_helper.c | 1 +
target-i386/gdbstub.c | 2 +-
target-i386/helper.c | 1 +
target-i386/hyperv.c | 1 +
target-i386/int_helper.c | 1 +
target-i386/kvm-stub.c | 1 +
target-i386/kvm.c | 2 +-
target-i386/machine.c | 1 +
target-i386/mem_helper.c | 1 +
target-i386/misc_helper.c | 1 +
target-i386/monitor.c | 1 +
target-i386/seg_helper.c | 1 +
target-i386/smm_helper.c | 1 +
target-i386/svm_helper.c | 1 +
target-i386/translate.c | 6 +-----
75 files changed, 75 insertions(+), 24 deletions(-)
diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c
index c181bb2..d821313 100644
--- a/hw/acpi/acpi_interface.c
+++ b/hw/acpi/acpi_interface.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "qemu/module.h"
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 78e1290..21d2ea0 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -19,12 +19,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include <glib/gprintf.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <stdbool.h>
-#include <string.h>
#include "hw/acpi/aml-build.h"
#include "qemu/bswap.h"
#include "qemu/bitops.h"
diff --git a/hw/acpi/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c
index d9382f8..e04d60a 100644
--- a/hw/acpi/bios-linker-loader.c
+++ b/hw/acpi/bios-linker-loader.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/acpi/bios-linker-loader.h"
#include "hw/nvram/fw_cfg.h"
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 21e113d..397e6da 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -18,6 +18,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index f5b9972..2f99ec5 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/acpi/cpu_hotplug.h"
diff --git a/hw/acpi/cpu_hotplug_acpi_table.c b/hw/acpi/cpu_hotplug_acpi_table.c
index 13b210e..97bb109 100644
--- a/hw/acpi/cpu_hotplug_acpi_table.c
+++ b/hw/acpi/cpu_hotplug_acpi_table.c
@@ -13,6 +13,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/acpi/cpu_hotplug.h"
void build_cpu_hotplug_aml(Aml *ctx)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 1c7fcfa..746d890 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -23,6 +23,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qapi/visitor.h"
#include "hw/i386/pc.h"
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 65cbc80..f65a3a2 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/pc-hotplug.h"
#include "hw/mem/pc-dimm.h"
diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c
index 080d9ad..c756602 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#include <stdbool.h>
+#include "qemu/osdep.h"
#include "hw/acpi/memory_hotplug.h"
#include "include/hw/acpi/pc-hotplug.h"
#include "hw/boards.h"
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index df1b176..7ee7e16 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -26,6 +26,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/aml-build.h"
#include "hw/mem/nvdimm.h"
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index fbbc4dd..3e338b5 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -24,6 +24,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/acpi/pcihp.h"
#include "hw/hw.h"
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 2cd2fee..9694e52 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -18,6 +18,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/apm.h"
diff --git a/hw/acpi/tco.c b/hw/acpi/tco.c
index 7a026c2..8ce7daf 100644
--- a/hw/acpi/tco.c
+++ b/hw/acpi/tco.c
@@ -6,6 +6,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "sysemu/watchdog.h"
#include "hw/i386/ich9.h"
diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 36f1c4a..148632e 100644
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/char.h"
#include "hw/isa/isa.h"
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index c2b553f..f6ba76f 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/char.h"
#include "hw/isa/isa.h"
diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c
index f3db024..b9b5bc6 100644
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/char/serial.h"
#include "hw/isa/isa.h"
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 1c8b9be..8f1b6f3 100644
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -25,6 +25,7 @@
/* see docs/specs/pci-serial.txt */
+#include "qemu/osdep.h"
#include "hw/char/serial.h"
#include "hw/pci/pci.h"
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 566e9ef..39e07db 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/char/serial.h"
#include "sysemu/char.h"
#include "qemu/timer.h"
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 1398424..1ff6c4d 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "qemu/main-loop.h"
diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index ce1713d..6fc3923 100644
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see
* <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/i2c/pm_smbus.h"
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index 91d4d32..498f03e 100644
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -24,6 +24,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/i2c/pm_smbus.h"
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 78758e2..739cfa3 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -20,12 +20,11 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "acpi-build.h"
-#include <stddef.h>
#include <glib.h>
#include "qemu-common.h"
#include "qemu/bitmap.h"
-#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "hw/pci/pci.h"
#include "qom/cpu.h"
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 3fe27fa..c25b1fd 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "intel_iommu_internal.h"
diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 5b47056..694d398 100644
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL version 2.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/i386/apic_internal.h"
#include "hw/pci/msi.h"
#include "sysemu/kvm.h"
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 0593a3f..a3b300c 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -13,6 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "sysemu/sysemu.h"
diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
index 90eea10..e43b5c4 100644
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "hw/timer/i8254.h"
diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c
index 53e3ca8..2b207de 100644
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL version 2.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/isa/i8259_internal.h"
#include "hw/i386/apic_internal.h"
#include "sysemu/kvm.h"
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index b7390ca..8eb2c7a 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "monitor/monitor.h"
#include "hw/i386/pc.h"
#include "hw/i386/ioapic_internal.h"
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index eec1340..d4089e7 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -20,11 +20,8 @@
* Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com)
* Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)
*/
-#include <stdio.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "qemu/error-report.h"
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index f0922da..c69f374 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -8,6 +8,7 @@
* (at your option) any later version. See the COPYING file in the
* top-level directory.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "sysemu/cpus.h"
#include "sysemu/kvm.h"
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 6774a19..c4d7d83 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/nvram/fw_cfg.h"
#include "multiboot.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 838636c..cab4b39 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/char/serial.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index bc74557..9951d6e 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <glib.h>
#include "hw/hw.h"
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 6128b02..56be9b1 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -27,6 +27,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/loader.h"
#include "sysemu/arch_init.h"
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 579461f..2324e70 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "sysemu/block-backend.h"
#include "qemu/error-report.h"
#include "hw/sysbus.h"
diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index e40b586..bff979a 100644
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@@ -1,10 +1,7 @@
/*
* This is splited from hw/i386/kvm/pci-assign.c
*/
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "qemu/error-report.h"
diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
index f5acd6a..5128146 100644
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL version 2 or
* later. See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/i386/apic_internal.h"
#include "hw/pci/msi.h"
#include "hw/xen/xen.h"
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index de83f4e..a2247b9 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/ide.h"
diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index 9abcf25..1095c65 100644
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -29,6 +29,7 @@
* SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "trace.h"
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 0a840b8..a299462 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "qemu/thread.h"
#include "hw/i386/apic_internal.h"
#include "hw/i386/apic.h"
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index ad959c4..659f377 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "hw/i386/apic.h"
#include "hw/i386/apic_internal.h"
#include "trace.h"
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index e4bfaea..378e663 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -20,6 +20,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "monitor/monitor.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index 65f6877..0a48de2 100644
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -19,6 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "monitor/monitor.h"
#include "hw/i386/ioapic.h"
#include "hw/i386/ioapic_internal.h"
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index ed9907d..d198945 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -27,6 +27,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/hw.h"
#include "qapi/visitor.h"
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 644cfd9..5500fcc 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c
index 69a1b00..84fa1a5 100644
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@@ -7,6 +7,7 @@
* (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/isa/isa.h"
diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 18e94e0..086893d 100644
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -35,7 +35,7 @@
* git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git
*/
-#include "config-host.h"
+#include "qemu/osdep.h"
#if defined(CONFIG_POSIX)
#include <sys/mman.h>
#endif
diff --git a/hw/misc/sga.c b/hw/misc/sga.c
index 83d2fd9..03b006d 100644
--- a/hw/misc/sga.c
+++ b/hw/misc/sga.c
@@ -24,6 +24,7 @@
* sgabios code originally available at code.google.com/p/sgabios
*
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/i386/pc.h"
#include "hw/loader.h"
diff --git a/hw/pci-host/pam.c b/hw/pci-host/pam.c
index 17d826c..e361ecb 100644
--- a/hw/pci-host/pam.c
+++ b/hw/pci-host/pam.c
@@ -27,6 +27,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qom/object.h"
#include "sysemu/sysemu.h"
#include "hw/pci-host/pam.h"
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index b0d7e31..3832ed6 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 1fb4707..42b421e 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -27,6 +27,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci-host/q35.h"
#include "qapi/visitor.h"
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index d9d039b..0ad5420 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -24,6 +24,7 @@
* This driver attempts to emulate an HPET device in software.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "ui/console.h"
diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 9b65a33..b84a33f 100644
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
index 07345f6..ed511b8 100644
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index a9f0efd..eb0100a 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/target-i386/arch_dump.c b/target-i386/arch_dump.c
index eccd803..5a2e4be 100644
--- a/target-i386/arch_dump.c
+++ b/target-i386/arch_dump.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/cpu-all.h"
#include "sysemu/dump.h"
diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index 01563fe..88f341e 100644
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/cpu-all.h"
#include "sysemu/memory_mapping.h"
diff --git a/target-i386/bpt_helper.c b/target-i386/bpt_helper.c
index dac1b1a..f47df19 100644
--- a/target-i386/bpt_helper.c
+++ b/target-i386/bpt_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-i386/cc_helper.c b/target-i386/cc_helper.c
index d5b7c7b..99a3b54 100644
--- a/target-i386/cc_helper.c
+++ b/target-i386/cc_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index 5e347bc..ef37f42 100644
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/log.h"
#include "sysemu/sysemu.h"
diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c
index 31afa44..2d54b47 100644
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include <math.h>
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-i386/gdbstub.c b/target-i386/gdbstub.c
index 6a9bf3c..4b50713 100644
--- a/target-i386/gdbstub.c
+++ b/target-i386/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 24f5811..81568c8 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/kvm.h"
#include "kvm_i386.h"
diff --git a/target-i386/hyperv.c b/target-i386/hyperv.c
index e79b173..6b519c3 100644
--- a/target-i386/hyperv.c
+++ b/target-i386/hyperv.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hyperv.h"
#include "standard-headers/asm-x86/hyperv.h"
diff --git a/target-i386/int_helper.c b/target-i386/int_helper.c
index 3dcd25f..9d0d21e 100644
--- a/target-i386/int_helper.c
+++ b/target-i386/int_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
diff --git a/target-i386/kvm-stub.c b/target-i386/kvm-stub.c
index 6fefd65..8df9c59 100644
--- a/target-i386/kvm-stub.c
+++ b/target-i386/kvm-stub.c
@@ -9,6 +9,7 @@
* See the COPYING file in the top-level directory.
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "kvm_i386.h"
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index d6f5355..94024bc 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -12,7 +12,7 @@
*
*/
-#include <sys/types.h>
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/utsname.h>
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 6be7341..ee5b949 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/i386/pc.h"
diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index 0e20df2..7de7752 100644
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index 13bd4f5..460257f 100644
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-i386/monitor.c b/target-i386/monitor.c
index aac6b1b..fccfe40 100644
--- a/target-i386/monitor.c
+++ b/target-i386/monitor.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index 20ee892..4c7cab7 100644
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/log.h"
#include "exec/helper-proto.h"
diff --git a/target-i386/smm_helper.c b/target-i386/smm_helper.c
index c272a98..b930421 100644
--- a/target-i386/smm_helper.c
+++ b/target-i386/smm_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c
index f1fabf5..ab472f6 100644
--- a/target-i386/svm_helper.c
+++ b/target-i386/svm_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/cpu-all.h"
#include "exec/helper-proto.h"
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 8ce0fcc..957a92d 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -16,11 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "qemu/host-utils.h"
#include "cpu.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 11/37] alpha: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (9 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 10/37] x86: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-02-06 0:48 ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 12/37] arm: " Peter Maydell
` (26 subsequent siblings)
37 siblings, 1 reply; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
disas/alpha.c | 2 +-
hw/alpha/dp264.c | 1 +
hw/alpha/pci.c | 2 +-
hw/alpha/typhoon.c | 1 +
target-alpha/cpu.c | 1 +
target-alpha/fpu_helper.c | 1 +
target-alpha/gdbstub.c | 2 +-
target-alpha/helper.c | 4 +---
target-alpha/int_helper.c | 1 +
target-alpha/machine.c | 1 +
target-alpha/mem_helper.c | 1 +
target-alpha/sys_helper.c | 1 +
target-alpha/translate.c | 1 +
target-alpha/vax_helper.c | 1 +
14 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/disas/alpha.c b/disas/alpha.c
index a950b9c..44d00a3 100644
--- a/disas/alpha.c
+++ b/disas/alpha.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this file; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>. */
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "disas/bfd.h"
/* MAX is redefined below, so remove any previous definition. */
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 38b85ba..992d1b2 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -6,6 +6,7 @@
* that we need to emulate as well.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "elf.h"
#include "hw/loader.h"
diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c
index 5226e43..fb902bb 100644
--- a/hw/alpha/pci.c
+++ b/hw/alpha/pci.c
@@ -6,7 +6,7 @@
* ??? Sparse memory access not implemented.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "alpha_sys.h"
#include "qemu/log.h"
#include "sysemu/sysemu.h"
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 35dc8a5..b86ff5e 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -6,6 +6,7 @@
* This work is licensed under the GNU GPL license version 2 or later.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "hw/hw.h"
#include "hw/devices.h"
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index e5bdfa8..2eab060 100644
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -19,6 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "migration/vmstate.h"
diff --git a/target-alpha/fpu_helper.c b/target-alpha/fpu_helper.c
index 0c65e1f..5ab7d5e 100644
--- a/target-alpha/fpu_helper.c
+++ b/target-alpha/fpu_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "fpu/softfloat.h"
diff --git a/target-alpha/gdbstub.c b/target-alpha/gdbstub.c
index 99a4051..199f028 100644
--- a/target-alpha/gdbstub.c
+++ b/target-alpha/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-alpha/helper.c b/target-alpha/helper.c
index 5a85335..6dec263 100644
--- a/target-alpha/helper.c
+++ b/target-alpha/helper.c
@@ -17,9 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "fpu/softfloat.h"
diff --git a/target-alpha/int_helper.c b/target-alpha/int_helper.c
index d7f4774..777e48d 100644
--- a/target-alpha/int_helper.c
+++ b/target-alpha/int_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
diff --git a/target-alpha/machine.c b/target-alpha/machine.c
index d9bf977..9ab0928 100644
--- a/target-alpha/machine.c
+++ b/target-alpha/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
diff --git a/target-alpha/mem_helper.c b/target-alpha/mem_helper.c
index c9258f5..7fee9a6 100644
--- a/target-alpha/mem_helper.c
+++ b/target-alpha/mem_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c
index 75c96c1..e2dec15 100644
--- a/target-alpha/sys_helper.c
+++ b/target-alpha/sys_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "sysemu/sysemu.h"
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 9909c70..7d419d9 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "qemu/host-utils.h"
diff --git a/target-alpha/vax_helper.c b/target-alpha/vax_helper.c
index 2e2f499..e74ac3e 100644
--- a/target-alpha/vax_helper.c
+++ b/target-alpha/vax_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "fpu/softfloat.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 12/37] arm: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (10 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 11/37] alpha: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 13/37] xen: " Peter Maydell
` (25 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
disas/arm.c | 1 +
hw/char/cadence_uart.c | 1 +
hw/char/digic-uart.c | 1 +
hw/char/exynos4210_uart.c | 1 +
hw/char/imx_serial.c | 1 +
hw/char/pl011.c | 1 +
hw/display/exynos4210_fimd.c | 1 +
hw/display/pl110.c | 1 +
hw/display/pxa2xx_lcd.c | 1 +
hw/dma/pl080.c | 1 +
hw/dma/pl330.c | 1 +
hw/dma/pxa2xx_dma.c | 1 +
hw/gpio/imx_gpio.c | 1 +
hw/gpio/pl061.c | 1 +
hw/i2c/exynos4210_i2c.c | 1 +
hw/i2c/imx_i2c.c | 1 +
hw/i2c/versatile_i2c.c | 1 +
hw/input/pl050.c | 1 +
hw/input/pxa2xx_keypad.c | 1 +
hw/input/stellaris_input.c | 1 +
hw/intc/allwinner-a10-pic.c | 1 +
hw/intc/arm_gic.c | 1 +
hw/intc/arm_gic_common.c | 1 +
hw/intc/arm_gic_kvm.c | 1 +
hw/intc/arm_gicv2m.c | 1 +
hw/intc/arm_gicv3_common.c | 1 +
hw/intc/arm_gicv3_kvm.c | 1 +
hw/intc/armv7m_nvic.c | 1 +
hw/intc/exynos4210_combiner.c | 1 +
hw/intc/exynos4210_gic.c | 1 +
hw/intc/imx_avic.c | 1 +
hw/intc/pl190.c | 1 +
hw/intc/realview_gic.c | 1 +
hw/misc/a9scu.c | 1 +
hw/misc/arm11scu.c | 1 +
hw/misc/exynos4210_pmu.c | 1 +
hw/misc/imx25_ccm.c | 1 +
hw/misc/imx31_ccm.c | 1 +
hw/misc/imx_ccm.c | 1 +
hw/misc/zynq_slcr.c | 1 +
hw/net/allwinner_emac.c | 1 +
hw/net/cadence_gem.c | 1 +
hw/net/imx_fec.c | 1 +
hw/net/stellaris_enet.c | 1 +
hw/net/xgmac.c | 1 +
hw/pci-host/versatile.c | 1 +
hw/pcmcia/pxa2xx.c | 1 +
hw/sd/pl181.c | 1 +
hw/sd/pxa2xx_mmci.c | 1 +
hw/ssi/xilinx_spi.c | 1 +
hw/ssi/xilinx_spips.c | 1 +
hw/timer/a9gtimer.c | 1 +
hw/timer/allwinner-a10-pit.c | 1 +
hw/timer/arm_mptimer.c | 1 +
hw/timer/arm_timer.c | 1 +
hw/timer/cadence_ttc.c | 1 +
hw/timer/digic-timer.c | 1 +
hw/timer/exynos4210_mct.c | 1 +
hw/timer/exynos4210_pwm.c | 1 +
hw/timer/exynos4210_rtc.c | 1 +
hw/timer/imx_epit.c | 1 +
hw/timer/imx_gpt.c | 1 +
hw/timer/pl031.c | 1 +
hw/timer/pxa2xx_timer.c | 1 +
target-arm/arch_dump.c | 1 +
65 files changed, 65 insertions(+)
diff --git a/disas/arm.c b/disas/arm.c
index 7a7354b..70da529 100644
--- a/disas/arm.c
+++ b/disas/arm.c
@@ -22,6 +22,7 @@
/* Start of qemu specific additions. Mostly this is stub definitions
for things we don't care about. */
+#include "qemu/osdep.h"
#include "disas/bfd.h"
#define ATTRIBUTE_UNUSED __attribute__((unused))
#define ISSPACE(x) ((x) == ' ' || (x) == '\t' || (x) == '\n')
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 9d379e5..b590d99 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -16,6 +16,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/char/cadence_uart.h"
#ifdef CADENCE_UART_ERR_DEBUG
diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index 6d44576..d3bc533 100644
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -26,6 +26,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "sysemu/char.h"
diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 2736b37..885ecc0 100644
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -19,6 +19,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index f30f9c2..6df74ac 100644
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -18,6 +18,7 @@
* is a real serial device.
*/
+#include "qemu/osdep.h"
#include "hw/char/imx_serial.h"
#include "sysemu/sysemu.h"
#include "sysemu/char.h"
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index eac6fac..210c87b 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/char.h"
diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 45239e8..728eb21 100644
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -22,6 +22,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/sysbus.h"
#include "ui/console.h"
diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index ef1a7b1..d589959 100644
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -7,6 +7,7 @@
* This code is licensed under the GNU LGPL
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "ui/console.h"
#include "framebuffer.h"
diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c
index 4d36c94..845521c 100644
--- a/hw/display/pxa2xx_lcd.c
+++ b/hw/display/pxa2xx_lcd.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/arm/pxa.h"
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index b89b474..9318108 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 5be3df5..37ea7e4 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -14,6 +14,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "sysemu/dma.h"
diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
index 54cdb25..2306abc 100644
--- a/hw/dma/pxa2xx_dma.c
+++ b/hw/dma/pxa2xx_dma.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/sysbus.h"
diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c
index a6d7cab..ed7e247 100644
--- a/hw/gpio/imx_gpio.c
+++ b/hw/gpio/imx_gpio.c
@@ -17,6 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/gpio/imx_gpio.h"
#ifndef DEBUG_IMX_GPIO
diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c
index 4ba730b..e5a696e 100644
--- a/hw/gpio/pl061.c
+++ b/hw/gpio/pl061.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
//#define DEBUG_PL061 1
diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c
index fb99dfd..8c2a2c1 100644
--- a/hw/i2c/exynos4210_i2c.c
+++ b/hw/i2c/exynos4210_i2c.c
@@ -20,6 +20,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu/timer.h"
#include "hw/sysbus.h"
#include "hw/i2c/i2c.h"
diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c
index cb62c7a..e435448 100644
--- a/hw/i2c/imx_i2c.c
+++ b/hw/i2c/imx_i2c.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/i2c/imx_i2c.h"
#include "hw/i2c/i2c.h"
diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c
index 3c0c2c1..fee3bc7 100644
--- a/hw/i2c/versatile_i2c.c
+++ b/hw/i2c/versatile_i2c.c
@@ -21,6 +21,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "bitbang_i2c.h"
diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index c1b08d5..3092b0f 100644
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/input/ps2.h"
diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
index 8501114..2b70bbb 100644
--- a/hw/input/pxa2xx_keypad.c
+++ b/hw/input/pxa2xx_keypad.c
@@ -11,6 +11,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "ui/console.h"
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index 4d86c04..99168bf 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -6,6 +6,7 @@
*
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/devices.h"
#include "ui/console.h"
diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c
index eed7621..dc971a1 100644
--- a/hw/intc/allwinner-a10-pic.c
+++ b/hw/intc/allwinner-a10-pic.c
@@ -15,6 +15,7 @@
* for more details.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index cd60176..60ab9b8 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -18,6 +18,7 @@
* armv7m_nvic device.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "gic_internal.h"
#include "qom/cpu.h"
diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
index 9c82b97..ac8cf42 100644
--- a/hw/intc/arm_gic_common.c
+++ b/hw/intc/arm_gic_common.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "gic_internal.h"
#include "hw/arm/linux-boot-if.h"
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index 0ceebbf..e61c5d9 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/migration.h"
#include "sysemu/kvm.h"
diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index 43d1976..70c0b97 100644
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -25,6 +25,7 @@
* identification registers and with a single non-secure MSI register frame.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/pci/msi.h"
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index 032ece2..e4f0f5a 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -20,6 +20,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/intc/arm_gicv3_common.h"
static void gicv3_pre_save(void *opaque)
diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index b48f78f..90c7950 100644
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/intc/arm_gicv3_common.h"
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 6fc167e..92f6a44 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -10,6 +10,7 @@
* NVIC. Much of that is also implemented here.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/arm/arm.h"
diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index a6b7028..dc0c903 100644
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -27,6 +27,7 @@
* IRQs are passed to GIC through Combiner.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/arm/exynos4210.h"
diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c
index b2a4950..4f7e89f 100644
--- a/hw/intc/exynos4210_gic.c
+++ b/hw/intc/exynos4210_gic.c
@@ -20,6 +20,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu-common.h"
#include "hw/irq.h"
diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c
index e0535ff..7027655 100644
--- a/hw/intc/imx_avic.c
+++ b/hw/intc/imx_avic.c
@@ -15,6 +15,7 @@
* TODO: implement vectors.
*/
+#include "qemu/osdep.h"
#include "hw/intc/imx_avic.h"
#ifndef DEBUG_IMX_AVIC
diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c
index 2bf359a..5ecbc4a 100644
--- a/hw/intc/pl190.c
+++ b/hw/intc/pl190.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
/* The number of virtual priority levels. 16 user vectors plus the
diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c
index 6c81296..291f196 100644
--- a/hw/intc/realview_gic.c
+++ b/hw/intc/realview_gic.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/intc/realview_gic.h"
static void realview_gic_set_irq(void *opaque, int irq, int level)
diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c
index 4434945..3e8ad8c 100644
--- a/hw/misc/a9scu.c
+++ b/hw/misc/a9scu.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/misc/a9scu.h"
static uint64_t a9_scu_read(void *opaque, hwaddr offset,
diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c
index a791675..5e54b49 100644
--- a/hw/misc/arm11scu.c
+++ b/hw/misc/arm11scu.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/misc/arm11scu.h"
static uint64_t mpcore_scu_read(void *opaque, hwaddr offset,
diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c
index 2b118c7..889abad 100644
--- a/hw/misc/exynos4210_pmu.c
+++ b/hw/misc/exynos4210_pmu.c
@@ -24,6 +24,7 @@
* uses PMU INFORM5 register as a holding pen.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#ifndef DEBUG_PMU
diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c
index 90752fd..498e84c 100644
--- a/hw/misc/imx25_ccm.c
+++ b/hw/misc/imx25_ccm.c
@@ -11,6 +11,7 @@
* the CCM.
*/
+#include "qemu/osdep.h"
#include "hw/misc/imx25_ccm.h"
#ifndef DEBUG_IMX25_CCM
diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c
index c47b96f..17640bf 100644
--- a/hw/misc/imx31_ccm.c
+++ b/hw/misc/imx31_ccm.c
@@ -11,6 +11,7 @@
* the i.MX31 CCM.
*/
+#include "qemu/osdep.h"
#include "hw/misc/imx31_ccm.h"
#define CKIH_FREQ 26000000 /* 26MHz crystal input */
diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c
index 0c9740b..986d890 100644
--- a/hw/misc/imx_ccm.c
+++ b/hw/misc/imx_ccm.c
@@ -11,6 +11,7 @@
* retrieve the CCM frequencies from the various i.MX SOC.
*/
+#include "qemu/osdep.h"
#include "hw/misc/imx_ccm.h"
#ifndef DEBUG_IMX_CCM
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index 3d78708..b1b7591 100644
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -14,6 +14,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/sysbus.h"
diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index 0407dee..16d4b63 100644
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -16,6 +16,7 @@
* GNU General Public License for more details.
*
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "qemu/fifo8.h"
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index 3639fc1..f9e4091 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <zlib.h> /* For crc32 */
#include "hw/net/cadence_gem.h"
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index c50bf7f..3bd5517 100644
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -21,6 +21,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/net/imx_fec.h"
#include "sysemu/dma.h"
diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index 21a4773..84cf60b 100644
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -6,6 +6,7 @@
*
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include <zlib.h>
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 15fb681..0c5f793 100644
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/char.h"
#include "qemu/log.h"
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 7172b90..339ec2c 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -7,6 +7,7 @@
* This code is licensed under the LGPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c
index 812716e..20c9c75 100644
--- a/hw/pcmcia/pxa2xx.c
+++ b/hw/pcmcia/pxa2xx.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/pcmcia.h"
diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 326c53a..e87abb2 100644
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index b217080..81da7b7 100644
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/sd/sd.h"
diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 94bb2a7..33482f0 100644
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "qemu/log.h"
diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index c2a8dda..e2b77dc 100644
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index dd4aae8..c11a7bc 100644
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -20,6 +20,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/timer/a9gtimer.h"
#include "qemu/timer.h"
#include "qemu/bitops.h"
diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
index 34124fe..51cdc98 100644
--- a/hw/timer/allwinner-a10-pit.c
+++ b/hw/timer/allwinner-a10-pit.c
@@ -15,6 +15,7 @@
* for more details.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "hw/timer/allwinner-a10-pit.h"
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 5dfab66..2bdaf42 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/timer/arm_mptimer.h"
#include "qemu/timer.h"
#include "qom/cpu.h"
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index d53f39a..ba390ad 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "qemu-common.h"
diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
index 35bc880..03f5b9c 100644
--- a/hw/timer/cadence_ttc.c
+++ b/hw/timer/cadence_ttc.c
@@ -16,6 +16,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
index 7e28e7e..5b97e1e 100644
--- a/hw/timer/digic-timer.c
+++ b/hw/timer/digic-timer.c
@@ -26,6 +26,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/ptimer.h"
#include "qemu/main-loop.h"
diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index 015bbaf..73e547c 100644
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -52,6 +52,7 @@
* there is no way to avoid frequently events).
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "qemu/main-loop.h"
diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index 1c1a2b8..38f941f 100644
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -20,6 +20,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "qemu-common.h"
diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index bf2ee9f..3341303 100644
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -25,6 +25,7 @@
* CLKOUTEN Bit[9] not used
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "qemu-common.h"
diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
index 50bf83c..38fbf27 100644
--- a/hw/timer/imx_epit.c
+++ b/hw/timer/imx_epit.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/timer/imx_epit.h"
#include "hw/misc/imx_ccm.h"
#include "qemu/main-loop.h"
diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
index b1893b8..5cdc3b3 100644
--- a/hw/timer/imx_gpt.c
+++ b/hw/timer/imx_gpt.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/timer/imx_gpt.h"
#include "hw/misc/imx_ccm.h"
#include "qemu/main-loop.h"
diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c
index 34d9b44..d99d18c 100644
--- a/hw/timer/pl031.c
+++ b/hw/timer/pl031.c
@@ -11,6 +11,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index 130e9dc..0daa69c 100644
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/target-arm/arch_dump.c b/target-arm/arch_dump.c
index f45125f..1a9861f 100644
--- a/target-arm/arch_dump.c
+++ b/target-arm/arch_dump.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "elf.h"
#include "sysemu/dump.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 13/37] xen: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (11 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 12/37] arm: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 14/37] virtio: " Peter Maydell
` (24 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/char/xen_console.c | 7 +------
hw/display/xenfb.c | 10 +---------
hw/net/xen_nic.c | 11 +----------
hw/xen/xen-host-pci-device.c | 1 +
hw/xen/xen_backend.c | 10 +---------
hw/xen/xen_devconfig.c | 1 +
hw/xen/xen_pt.c | 1 +
hw/xen/xen_pt_config_init.c | 1 +
hw/xen/xen_pt_graphics.c | 1 +
hw/xen/xen_pt_msi.c | 1 +
hw/xenpv/xen_domainbuild.c | 2 +-
hw/xenpv/xen_machine_pv.c | 1 +
xen-common-stub.c | 1 +
xen-common.c | 1 +
xen-hvm-stub.c | 1 +
xen-hvm.c | 1 +
xen-mapcache.c | 2 +-
17 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index eb7f450..fbcbd56 100644
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -19,14 +19,9 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include <sys/select.h>
-#include <fcntl.h>
-#include <unistd.h>
#include <termios.h>
-#include <stdarg.h>
#include <sys/mman.h>
#include "hw/hw.h"
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 8eb3046..e74523a 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -24,16 +24,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
#include "hw/hw.h"
#include "ui/console.h"
diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index 0da16b4..dd32d58 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -19,18 +19,9 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <errno.h>
+#include "qemu/osdep.h"
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/mman.h>
#include <sys/wait.h>
diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c
index 3827ca7..9666fff 100644
--- a/hw/xen/xen-host-pci-device.c
+++ b/hw/xen/xen-host-pci-device.c
@@ -6,6 +6,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "xen-host-pci-device.h"
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index 2510e2e..1142165 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -22,15 +22,7 @@
* TODO: add some xenbus / xenstore concepts overview here.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
#include <sys/signal.h>
diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c
index e138dbb..1f30fe4 100644
--- a/hw/xen/xen_devconfig.c
+++ b/hw/xen/xen_devconfig.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/xen/xen_backend.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index d33221b..657bf6c 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -52,6 +52,7 @@
* - Set entry->pirq to '-1'.
*/
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include "hw/pci/pci.h"
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index 81c6721..1b48f19 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -12,6 +12,7 @@
* This file implements direct PCI assignment to a HVM guest
*/
+#include "qemu/osdep.h"
#include "qemu/timer.h"
#include "hw/xen/xen_backend.h"
#include "xen_pt.h"
diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c
index e7a7c7e..71e745f 100644
--- a/hw/xen/xen_pt_graphics.c
+++ b/hw/xen/xen_pt_graphics.c
@@ -1,6 +1,7 @@
/*
* graphics passthrough
*/
+#include "qemu/osdep.h"
#include "xen_pt.h"
#include "xen-host-pci-device.h"
#include "hw/xen/xen_backend.h"
diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c
index 302a310..5624685 100644
--- a/hw/xen/xen_pt_msi.c
+++ b/hw/xen/xen_pt_msi.c
@@ -9,6 +9,7 @@
* This file implements direct PCI assignment to a HVM guest
*/
+#include "qemu/osdep.h"
#include <sys/mman.h>
#include "hw/xen/xen_backend.h"
diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
index ac0e5ac..e33f9b1 100644
--- a/hw/xenpv/xen_domainbuild.c
+++ b/hw/xenpv/xen_domainbuild.c
@@ -1,4 +1,4 @@
-#include <signal.h>
+#include "qemu/osdep.h"
#include "hw/xen/xen_backend.h"
#include "xen_domainbuild.h"
#include "qemu/timer.h"
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 23d6ef0..af1618c 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/xen/xen_backend.h"
diff --git a/xen-common-stub.c b/xen-common-stub.c
index 906f991..699c3f1 100644
--- a/xen-common-stub.c
+++ b/xen-common-stub.c
@@ -5,6 +5,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/xen/xen.h"
diff --git a/xen-common.c b/xen-common.c
index 0dcdbc3..9ece23e 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -8,6 +8,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/xen/xen_backend.h"
#include "qmp-commands.h"
#include "sysemu/char.h"
diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c
index b958367..a6cb5d3 100644
--- a/xen-hvm-stub.c
+++ b/xen-hvm-stub.c
@@ -8,6 +8,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/xen/xen.h"
#include "exec/memory.h"
diff --git a/xen-hvm.c b/xen-hvm.c
index a9085a8..4b54418 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -8,6 +8,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include <sys/mman.h>
#include "hw/pci/pci.h"
diff --git a/xen-mapcache.c b/xen-mapcache.c
index 97fece2..a1bb102 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -8,7 +8,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include <sys/resource.h>
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 14/37] virtio: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (12 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 13/37] xen: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 15/37] tcg: " Peter Maydell
` (23 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/9pfs/virtio-9p-device.c | 1 +
hw/char/virtio-console.c | 1 +
hw/char/virtio-serial-bus.c | 1 +
hw/display/virtio-gpu-3d.c | 1 +
hw/display/virtio-gpu-pci.c | 1 +
hw/display/virtio-gpu.c | 1 +
hw/display/virtio-vga.c | 1 +
hw/input/virtio-input-hid.c | 1 +
hw/input/virtio-input-host.c | 1 +
hw/input/virtio-input.c | 1 +
hw/net/virtio-net.c | 1 +
hw/scsi/virtio-scsi-dataplane.c | 1 +
hw/scsi/virtio-scsi.c | 1 +
hw/virtio/dataplane/vring.c | 1 +
hw/virtio/vhost-backend.c | 1 +
hw/virtio/vhost-user.c | 3 +--
hw/virtio/vhost.c | 1 +
hw/virtio/virtio-balloon.c | 1 +
hw/virtio/virtio-bus.c | 1 +
hw/virtio/virtio-mmio.c | 1 +
hw/virtio/virtio-pci.c | 2 +-
hw/virtio/virtio-rng.c | 1 +
hw/virtio/virtio.c | 2 +-
23 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 5643fd5..c5f7b92 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/virtio/virtio.h"
#include "hw/i386/pc.h"
#include "qemu/sockets.h"
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 2a867cb..2e36481 100644
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -10,6 +10,7 @@
* the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "sysemu/char.h"
#include "qemu/error-report.h"
#include "trace.h"
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 2d2a659..8d5c740 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -18,6 +18,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "monitor/monitor.h"
#include "qemu/error-report.h"
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
index 28dccfd..59581a4 100644
--- a/hw/display/virtio-gpu-3d.c
+++ b/hw/display/virtio-gpu-3d.c
@@ -11,6 +11,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/iov.h"
#include "trace.h"
diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index eef137f..a71b230 100644
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-bus.h"
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 7e79a9c..3c96f8e 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -11,6 +11,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/iov.h"
#include "ui/console.h"
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index f7e539f..249dbc0 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "ui/console.h"
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index a78d11c..c4af0be 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -4,6 +4,7 @@
* top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "hw/qdev.h"
diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index 8978f16..ddee54c 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -4,6 +4,7 @@
* top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/sockets.h"
diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 1f5a40d..f12ed8a 100644
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -4,6 +4,7 @@
* top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "hw/qdev.h"
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index a877614..fde8dd3 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "hw/virtio/virtio.h"
#include "net/net.h"
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index 0d8d71e..c77b3a1 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/virtio/virtio-scsi.h"
#include "qemu/error-report.h"
#include "sysemu/block-backend.h"
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 607593c..5f23ab2 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -13,6 +13,7 @@
*
*/
+#include "qemu/osdep.h"
#include "standard-headers/linux/virtio_ids.h"
#include "hw/virtio/virtio-scsi.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index 23f667e..1a78df1 100644
--- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -14,6 +14,7 @@
* This work is licensed under the terms of the GNU GPL, version 2.
*/
+#include "qemu/osdep.h"
#include "trace.h"
#include "hw/hw.h"
#include "exec/memory.h"
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
index b734a60..b358902 100644
--- a/hw/virtio/vhost-backend.c
+++ b/hw/virtio/vhost-backend.c
@@ -8,6 +8,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/vhost-backend.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 1b6c5ac..7fde137 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -8,6 +8,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/vhost-backend.h"
#include "hw/virtio/virtio-net.h"
@@ -18,8 +19,6 @@
#include "exec/ram_addr.h"
#include "migration/migration.h"
-#include <fcntl.h>
-#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index de29968..7dff755 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -13,6 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/virtio/vhost.h"
#include "hw/hw.h"
#include "qemu/atomic.h"
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 9671635..f5f25a9 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -13,6 +13,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "qemu/timer.h"
#include "qemu-common.h"
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 81c7cdd..574f0e2 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -22,6 +22,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
#include "hw/qdev.h"
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 18660b0..d4cd91f 100644
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/virtio/virtio.h"
#include "qemu/host-utils.h"
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 94667e6..5494ff4 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -15,7 +15,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "standard-headers/linux/virtio_pci.h"
#include "hw/virtio/virtio.h"
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 97d1541..a80fb89 100644
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -9,6 +9,7 @@
* top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "hw/qdev.h"
#include "hw/virtio/virtio.h"
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index bd6b4df..63a7b6d 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -11,7 +11,7 @@
*
*/
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "trace.h"
#include "exec/address-spaces.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (13 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 14/37] virtio: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-02-06 0:51 ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 16/37] ide: " Peter Maydell
` (22 subsequent siblings)
37 siblings, 1 reply; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
tcg/aarch64/tcg-target.c | 1 +
tcg/arm/tcg-target.c | 1 +
tcg/i386/tcg-target.c | 1 +
tcg/mips/tcg-target.c | 2 +-
tcg/optimize.c | 4 +---
tcg/ppc/tcg-target.c | 8 +-------
tcg/s390/tcg-target.c | 1 +
tcg/sparc/tcg-target.c | 1 +
tcg/tcg-common.c | 1 +
tcg/tcg-op.c | 1 +
tcg/tcg.c | 2 +-
tcg/tci/tcg-target.c | 1 +
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
index 0ed10a9..8467d5d 100644
--- a/tcg/aarch64/tcg-target.c
+++ b/tcg/aarch64/tcg-target.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory for details.
*/
+#include "qemu/osdep.h"
#include "tcg-be-ldst.h"
#include "qemu/bitops.h"
diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
index 3edf6a6..146ac00 100644
--- a/tcg/arm/tcg-target.c
+++ b/tcg/arm/tcg-target.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "elf.h"
#include "tcg-be-ldst.h"
diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
index 9187d34..d90636c 100644
--- a/tcg/i386/tcg-target.c
+++ b/tcg/i386/tcg-target.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg-be-ldst.h"
#ifndef NDEBUG
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
index 79e052f..2dc4998 100644
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg-be-ldst.h"
#ifdef HOST_WORDS_BIGENDIAN
@@ -1735,7 +1736,6 @@ static int tcg_target_callee_save_regs[] = {
/* The Linux kernel doesn't provide any information about the available
instruction set. Probe it using a signal handler. */
-#include <signal.h>
#ifndef use_movnz_instructions
bool use_movnz_instructions = false;
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 10795ec..6d68f57 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -23,10 +23,8 @@
* THE SOFTWARE.
*/
-#include "config.h"
+#include "qemu/osdep.h"
-#include <stdlib.h>
-#include <stdio.h>
#include "qemu-common.h"
#include "tcg-op.h"
diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
index 2c72565..c593344 100644
--- a/tcg/ppc/tcg-target.c
+++ b/tcg/ppc/tcg-target.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg-be-ldst.h"
#if defined _CALL_DARWIN || defined __APPLE__
@@ -2725,8 +2726,6 @@ static void __attribute__((constructor)) tcg_cache_init(void)
}
#elif defined __APPLE__
-#include <stdio.h>
-#include <sys/types.h>
#include <sys/sysctl.h>
static void __attribute__((constructor)) tcg_cache_init(void)
@@ -2745,11 +2744,6 @@ static void __attribute__((constructor)) tcg_cache_init(void)
}
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
#include <sys/sysctl.h>
static void __attribute__((constructor)) tcg_cache_init(void)
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
index fbf97bb..58520fa 100644
--- a/tcg/s390/tcg-target.c
+++ b/tcg/s390/tcg-target.c
@@ -24,6 +24,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg-be-ldst.h"
/* We only support generating code for 64-bit mode. */
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
index 54df1bc..d3100ab 100644
--- a/tcg/sparc/tcg-target.c
+++ b/tcg/sparc/tcg-target.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg-be-null.h"
#ifndef NDEBUG
diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
index 8fa4e13..97305a3 100644
--- a/tcg/tcg-common.c
+++ b/tcg/tcg-common.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg/tcg.h"
#if defined(CONFIG_TCG_INTERPRETER)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 0b9dd8f..f554b86 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg.h"
#include "tcg-op.h"
diff --git a/tcg/tcg.c b/tcg/tcg.c
index a163541..3ce02dc 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -26,7 +26,7 @@
#define USE_LIVENESS_ANALYSIS
#define USE_TCG_OPTIMIZATIONS
-#include "config.h"
+#include "qemu/osdep.h"
/* Define to jump the ELF file used to communicate with GDB. */
#undef DEBUG_JIT
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c
index 4afe4d7..16ce048 100644
--- a/tcg/tci/tcg-target.c
+++ b/tcg/tci/tcg-target.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "tcg-be-null.h"
/* TODO list:
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 16/37] ide: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (14 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 15/37] tcg: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 17/37] 9pfs: " Peter Maydell
` (21 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/ide/ahci.c | 1 +
hw/ide/atapi.c | 1 +
hw/ide/cmd646.c | 1 +
hw/ide/core.c | 1 +
hw/ide/ich.c | 1 +
hw/ide/isa.c | 1 +
hw/ide/macio.c | 1 +
hw/ide/microdrive.c | 1 +
hw/ide/mmio.c | 1 +
hw/ide/pci.c | 1 +
hw/ide/piix.c | 1 +
hw/ide/qdev.c | 1 +
hw/ide/via.c | 1 +
tests/ahci-test.c | 4 +---
tests/ide-test.c | 4 +---
tests/libqos/ahci.c | 1 +
16 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 17f1cbd..7e87b18 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -21,6 +21,7 @@
*
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/pci/msi.h>
#include <hw/i386/pc.h>
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 272ab90..1fe58ab 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/ide/internal.h"
#include "hw/scsi/scsi.h"
#include "sysemu/block-backend.h"
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 27f3da2..49294a5 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/i386/pc.h>
#include <hw/pci/pci.h>
diff --git a/hw/ide/core.c b/hw/ide/core.c
index da3baab..4c46453 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/i386/pc.h>
#include <hw/pci/pci.h>
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 16925fa..0a13334 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -60,6 +60,7 @@
*
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/pci/msi.h>
#include <hw/i386/pc.h>
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 9f80503..eba567c 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/i386/pc.h>
#include <hw/isa/isa.h>
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index d4031b6..336784b 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/ppc/mac_dbdma.h"
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 6639dd4..5c9db80 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/i386/pc.h>
#include <hw/pcmcia.h>
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index b6ce62a..493f65a 100644
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "sysemu/block-backend.h"
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 37dbc29..fa5b63b 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/i386/pc.h>
#include <hw/pci/pci.h>
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 5a26c86..df46147 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/i386/pc.h>
#include <hw/pci/pci.h>
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 1f83109..f9d8912 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include "sysemu/dma.h"
#include "qemu/error-report.h"
diff --git a/hw/ide/via.c b/hw/ide/via.c
index e2da9ef..d3f7226 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -23,6 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <hw/hw.h>
#include <hw/i386/pc.h>
#include <hw/pci/pci.h>
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 31fb1f9..6869f7f 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -22,9 +22,7 @@
* THE SOFTWARE.
*/
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
#include <getopt.h>
#include <glib.h>
diff --git a/tests/ide-test.c b/tests/ide-test.c
index b864701..0d9ab4d 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -22,9 +22,7 @@
* THE SOFTWARE.
*/
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
#include <glib.h>
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 6b8c556..ac6c155 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <glib.h>
#include "libqtest.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 17/37] 9pfs: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (15 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 16/37] ide: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 18/37] hw/net: " Peter Maydell
` (20 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
fsdev/9p-iov-marshal.c | 7 +------
fsdev/9p-marshal.c | 7 +------
fsdev/qemu-fsdev-dummy.c | 3 +--
fsdev/qemu-fsdev-opts.c | 1 +
fsdev/qemu-fsdev.c | 4 +---
fsdev/virtfs-proxy-helper.c | 1 +
hw/9pfs/9p-handle.c | 2 +-
hw/9pfs/9p-local.c | 1 +
hw/9pfs/9p-posix-acl.c | 2 +-
hw/9pfs/9p-proxy.c | 1 +
hw/9pfs/9p-synth.c | 2 +-
hw/9pfs/9p-xattr-user.c | 2 +-
hw/9pfs/9p-xattr.c | 1 +
hw/9pfs/9p.c | 1 +
hw/9pfs/codir.c | 1 +
hw/9pfs/cofile.c | 1 +
hw/9pfs/cofs.c | 1 +
hw/9pfs/coth.c | 1 +
hw/9pfs/coxattr.c | 1 +
tests/virtio-9p-test.c | 4 +---
20 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c
index 08d783c..fb40bdf 100644
--- a/fsdev/9p-iov-marshal.c
+++ b/fsdev/9p-iov-marshal.c
@@ -11,17 +11,12 @@
*
*/
+#include "qemu/osdep.h"
#include <glib.h>
#include <glib/gprintf.h>
-#include <sys/types.h>
-#include <sys/time.h>
#include <utime.h>
#include <sys/uio.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#include "qemu/compiler.h"
#include "9p-iov-marshal.h"
#include "qemu/bswap.h"
diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c
index 991e35d..183d366 100644
--- a/fsdev/9p-marshal.c
+++ b/fsdev/9p-marshal.c
@@ -11,18 +11,13 @@
*
*/
+#include "qemu/osdep.h"
#include <glib.h>
#include <glib/gprintf.h>
-#include <sys/types.h>
#include <dirent.h>
-#include <sys/time.h>
#include <utime.h>
#include <sys/uio.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#include "qemu/compiler.h"
#include "9p-marshal.h"
void v9fs_string_free(V9fsString *str)
diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c
index 7dc2630..7622e86 100644
--- a/fsdev/qemu-fsdev-dummy.c
+++ b/fsdev/qemu-fsdev-dummy.c
@@ -10,8 +10,7 @@
* the COPYING file in the top-level directory.
*
*/
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include "qemu-fsdev.h"
#include "qemu/config-file.h"
#include "qemu/module.h"
diff --git a/fsdev/qemu-fsdev-opts.c b/fsdev/qemu-fsdev-opts.c
index 6311c7a..0b4619f 100644
--- a/fsdev/qemu-fsdev-opts.c
+++ b/fsdev/qemu-fsdev-opts.c
@@ -5,6 +5,7 @@
* later. See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
#include "qemu/module.h"
diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c
index 55e2f7a..bf7f0b0 100644
--- a/fsdev/qemu-fsdev.c
+++ b/fsdev/qemu-fsdev.c
@@ -10,11 +10,9 @@
* the COPYING file in the top-level directory.
*
*/
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include "qemu-fsdev.h"
#include "qemu/queue.h"
-#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 44c7d88..54f7ad1 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -9,6 +9,7 @@
* the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include <sys/resource.h>
#include <getopt.h>
#include <syslog.h>
diff --git a/hw/9pfs/9p-handle.c b/hw/9pfs/9p-handle.c
index 120486b..5088ef5 100644
--- a/hw/9pfs/9p-handle.c
+++ b/hw/9pfs/9p-handle.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "9p.h"
#include "9p-xattr.h"
#include <arpa/inet.h>
@@ -20,7 +21,6 @@
#include <sys/un.h>
#include "qemu/xattr.h"
#include "qemu/error-report.h"
-#include <unistd.h>
#include <linux/fs.h>
#ifdef CONFIG_LINUX_MAGIC_H
#include <linux/magic.h>
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index bb66626..ca995a7 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "9p.h"
#include "9p-xattr.h"
#include "fsdev/qemu-fsdev.h" /* local_ops */
diff --git a/hw/9pfs/9p-posix-acl.c b/hw/9pfs/9p-posix-acl.c
index 8df8228..ec00318 100644
--- a/hw/9pfs/9p-posix-acl.c
+++ b/hw/9pfs/9p-posix-acl.c
@@ -11,7 +11,7 @@
*
*/
-#include <sys/types.h>
+#include "qemu/osdep.h"
#include "qemu/xattr.h"
#include "9p.h"
#include "fsdev/file-op-9p.h"
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index 91aab43..0805c9c 100644
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include <sys/socket.h>
#include <sys/un.h>
#include "9p.h"
diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c
index 090ae0c..365623e 100644
--- a/hw/9pfs/9p-synth.c
+++ b/hw/9pfs/9p-synth.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/virtio/virtio.h"
#include "9p.h"
#include "9p-xattr.h"
@@ -19,7 +20,6 @@
#include "9p-synth.h"
#include "qemu/rcu.h"
#include "qemu/rcu_queue.h"
-#include <sys/stat.h>
/* Root node for synth file system */
static V9fsSynthNode v9fs_synth_root = {
diff --git a/hw/9pfs/9p-xattr-user.c b/hw/9pfs/9p-xattr-user.c
index c490ec3..f87530c 100644
--- a/hw/9pfs/9p-xattr-user.c
+++ b/hw/9pfs/9p-xattr-user.c
@@ -11,7 +11,7 @@
*
*/
-#include <sys/types.h>
+#include "qemu/osdep.h"
#include "9p.h"
#include "fsdev/file-op-9p.h"
#include "9p-xattr.h"
diff --git a/hw/9pfs/9p-xattr.c b/hw/9pfs/9p-xattr.c
index 741dd03..5d8595e 100644
--- a/hw/9pfs/9p-xattr.c
+++ b/hw/9pfs/9p-xattr.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "9p.h"
#include "fsdev/file-op-9p.h"
#include "9p-xattr.h"
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 1f3bd12..15fb0ab 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/virtio/virtio.h"
#include "hw/i386/pc.h"
#include "qemu/error-report.h"
diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c
index 5a4f74d..91df7f7 100644
--- a/hw/9pfs/codir.c
+++ b/hw/9pfs/codir.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c
index 893df2c..293483e 100644
--- a/hw/9pfs/cofile.c
+++ b/hw/9pfs/cofile.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c
index 7b4202b..18c81cb 100644
--- a/hw/9pfs/cofs.c
+++ b/hw/9pfs/cofs.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
diff --git a/hw/9pfs/coth.c b/hw/9pfs/coth.c
index 56772d6..464293e 100644
--- a/hw/9pfs/coth.c
+++ b/hw/9pfs/coth.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "block/thread-pool.h"
#include "qemu/coroutine.h"
diff --git a/hw/9pfs/coxattr.c b/hw/9pfs/coxattr.c
index 0590cbf..6ad96ea 100644
--- a/hw/9pfs/coxattr.c
+++ b/hw/9pfs/coxattr.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c
index 1fae477..59d0f1f 100644
--- a/tests/virtio-9p-test.c
+++ b/tests/virtio-9p-test.c
@@ -7,12 +7,10 @@
* See the COPYING file in the top-level directory.
*/
-#include <stdlib.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include <glib.h>
#include "libqtest.h"
#include "qemu-common.h"
-#include "qemu/osdep.h"
/* Tests only initialization so far. TODO: Replace with functional tests */
static void pci_nop(void)
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 18/37] hw/net: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (16 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 17/37] 9pfs: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 19/37] usb: " Peter Maydell
` (19 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/net/dp8393x.c | 1 +
hw/net/e1000.c | 1 +
hw/net/eepro100.c | 2 +-
hw/net/etraxfs_eth.c | 2 +-
hw/net/fsl_etsec/etsec.c | 1 +
hw/net/fsl_etsec/miim.c | 1 +
hw/net/fsl_etsec/registers.c | 1 +
hw/net/fsl_etsec/rings.c | 1 +
hw/net/lan9118.c | 1 +
hw/net/lance.c | 1 +
hw/net/mcf_fec.c | 1 +
hw/net/mipsnet.c | 1 +
hw/net/ne2000-isa.c | 1 +
hw/net/ne2000.c | 1 +
hw/net/opencores_eth.c | 1 +
hw/net/pcnet-pci.c | 1 +
hw/net/pcnet.c | 1 +
hw/net/rocker/qmp-norocker.c | 1 +
hw/net/rocker/rocker.c | 1 +
hw/net/rocker/rocker_desc.c | 1 +
hw/net/rocker/rocker_fp.c | 1 +
hw/net/rocker/rocker_of_dpa.c | 1 +
hw/net/rocker/rocker_world.c | 1 +
hw/net/rtl8139.c | 1 +
hw/net/smc91c111.c | 1 +
hw/net/vhost_net.c | 4 +---
hw/net/vmxnet3.c | 1 +
hw/net/vmxnet_rx_pkt.c | 1 +
hw/net/vmxnet_tx_pkt.c | 1 +
hw/net/xilinx_axienet.c | 1 +
hw/net/xilinx_ethlite.c | 1 +
31 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index ab607e4..e847b77 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -17,6 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/devices.h"
#include "net/net.h"
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index bec06e9..4eda7a3 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -25,6 +25,7 @@
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "net/net.h"
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 685a478..9b4b9b5 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -40,7 +40,7 @@
* * Wake-on-LAN is not implemented.
*/
-#include <stddef.h> /* offsetof */
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "net/net.h"
diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c
index b562ac9..05495ec 100644
--- a/hw/net/etraxfs_eth.c
+++ b/hw/net/etraxfs_eth.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/cris/etraxfs.h"
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 04bb41d..1e35f7f 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -26,6 +26,7 @@
* This implementation doesn't include ring priority, TCP/IP Off-Load, QoS.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/net/fsl_etsec/miim.c b/hw/net/fsl_etsec/miim.c
index 1931b74..6bba01c 100644
--- a/hw/net/fsl_etsec/miim.c
+++ b/hw/net/fsl_etsec/miim.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "etsec.h"
#include "registers.h"
diff --git a/hw/net/fsl_etsec/registers.c b/hw/net/fsl_etsec/registers.c
index a7bbfa1..46ce7a8 100644
--- a/hw/net/fsl_etsec/registers.c
+++ b/hw/net/fsl_etsec/registers.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "registers.h"
const eTSEC_Register_Definition eTSEC_registers_def[] = {
diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
index 0a5c6cf..ed1de7d 100644
--- a/hw/net/fsl_etsec/rings.c
+++ b/hw/net/fsl_etsec/rings.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "net/checksum.h"
#include "etsec.h"
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 1734b52..08dc474 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/devices.h"
diff --git a/hw/net/lance.c b/hw/net/lance.c
index 780b39d..6253d21 100644
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -35,6 +35,7 @@
* http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "qemu/timer.h"
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 21928f9..7c0398e 100644
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -5,6 +5,7 @@
*
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "net/net.h"
#include "hw/m68k/mcf.h"
diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index f261011..740cd98 100644
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "net/net.h"
#include "trace.h"
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 18b0644..ac7277b 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index a3dffff..e408083 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "net/net.h"
diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 3642046..09e239a 100644
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -31,6 +31,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "net/net.h"
diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index b4d60b8..595439a 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -27,6 +27,7 @@
* AMD Publication# 19436 Rev:E Amendment/0 Issue Date: June 2000
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "hw/loader.h"
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 1f4a3db..198a01f 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -35,6 +35,7 @@
* http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
*/
+#include "qemu/osdep.h"
#include "hw/qdev.h"
#include "net/net.h"
#include "qemu/timer.h"
diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c
index 49b498b..6acbcdb 100644
--- a/hw/net/rocker/qmp-norocker.c
+++ b/hw/net/rocker/qmp-norocker.c
@@ -15,6 +15,7 @@
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qmp-commands.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 2e77e50..f3e994d 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -15,6 +15,7 @@
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/msix.h"
diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index 5e697b1..ac02797 100644
--- a/hw/net/rocker/rocker_desc.c
+++ b/hw/net/rocker/rocker_desc.c
@@ -14,6 +14,7 @@
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "net/net.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c
index 5906396..af37fef 100644
--- a/hw/net/rocker/rocker_fp.c
+++ b/hw/net/rocker/rocker_fp.c
@@ -14,6 +14,7 @@
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "net/clients.h"
#include "rocker.h"
diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c
index 3cf1d61..da3fc54 100644
--- a/hw/net/rocker/rocker_of_dpa.c
+++ b/hw/net/rocker/rocker_of_dpa.c
@@ -14,6 +14,7 @@
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "net/eth.h"
#include "qemu/iov.h"
#include "qemu/timer.h"
diff --git a/hw/net/rocker/rocker_world.c b/hw/net/rocker/rocker_world.c
index a6b18f1..1ed0fcd 100644
--- a/hw/net/rocker/rocker_world.c
+++ b/hw/net/rocker/rocker_world.c
@@ -14,6 +14,7 @@
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "rocker.h"
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index d192d57..fee97bf 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -49,6 +49,7 @@
*/
/* For crc32 */
+#include "qemu/osdep.h"
#include <zlib.h>
#include "hw/hw.h"
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index c19cdd1..21c1b8f 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/devices.h"
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 318c3e6..0bd5131 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -13,6 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "net/net.h"
#include "net/tap.h"
#include "net/vhost-user.h"
@@ -21,19 +22,16 @@
#include "net/vhost_net.h"
#include "qemu/error-report.h"
-#include "config.h"
#ifdef CONFIG_VHOST_NET
#include <linux/vhost.h>
#include <sys/socket.h>
#include <linux/kvm.h>
-#include <fcntl.h>
#include <netpacket/packet.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <netinet/in.h>
-#include <stdio.h>
#include "standard-headers/linux/virtio_ring.h"
#include "hw/virtio/vhost.h"
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 5147f05..093a71e 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -15,6 +15,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "net/net.h"
diff --git a/hw/net/vmxnet_rx_pkt.c b/hw/net/vmxnet_rx_pkt.c
index aa54629..21bb46e 100644
--- a/hw/net/vmxnet_rx_pkt.c
+++ b/hw/net/vmxnet_rx_pkt.c
@@ -15,6 +15,7 @@
*
*/
+#include "qemu/osdep.h"
#include "vmxnet_rx_pkt.h"
#include "net/eth.h"
#include "qemu-common.h"
diff --git a/hw/net/vmxnet_tx_pkt.c b/hw/net/vmxnet_tx_pkt.c
index eb88ddf..91e1e08 100644
--- a/hw/net/vmxnet_tx_pkt.c
+++ b/hw/net/vmxnet_tx_pkt.c
@@ -15,6 +15,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "vmxnet_tx_pkt.h"
#include "net/eth.h"
diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index d63c423..2deb8ce 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/log.h"
#include "net/net.h"
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index ad6b553..71a3224 100644
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "net/net.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 19/37] usb: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (17 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 18/37] hw/net: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 20/37] hw/display: " Peter Maydell
` (18 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/usb/bus.c | 1 +
hw/usb/ccid-card-emulated.c | 1 +
hw/usb/ccid-card-passthru.c | 1 +
hw/usb/combined-packet.c | 1 +
hw/usb/core.c | 1 +
hw/usb/desc-msos.c | 1 +
hw/usb/desc.c | 2 +-
hw/usb/dev-audio.c | 1 +
hw/usb/dev-bluetooth.c | 1 +
hw/usb/dev-hid.c | 1 +
hw/usb/dev-hub.c | 1 +
hw/usb/dev-mtp.c | 3 +--
hw/usb/dev-network.c | 1 +
hw/usb/dev-serial.c | 1 +
hw/usb/dev-smartcard-reader.c | 1 +
hw/usb/dev-storage.c | 1 +
hw/usb/dev-uas.c | 1 +
hw/usb/dev-wacom.c | 1 +
hw/usb/hcd-ehci-pci.c | 1 +
hw/usb/hcd-ehci-sysbus.c | 1 +
hw/usb/hcd-ehci.c | 1 +
hw/usb/hcd-musb.c | 1 +
hw/usb/hcd-ohci.c | 1 +
hw/usb/hcd-uhci.c | 1 +
hw/usb/hcd-xhci.c | 1 +
hw/usb/host-legacy.c | 1 +
hw/usb/host-libusb.c | 1 +
hw/usb/host-stub.c | 1 +
hw/usb/libhw.c | 1 +
hw/usb/quirks.c | 1 +
hw/usb/redirect.c | 1 +
tests/usb-hcd-ehci-test.c | 4 +---
tests/usb-hcd-ohci-test.c | 3 +--
tests/usb-hcd-uhci-test.c | 3 +--
tests/usb-hcd-xhci-test.c | 3 +--
35 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 1bbe930..4452bdb 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/usb.h"
#include "hw/qdev.h"
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 869a63c..6893028 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -26,6 +26,7 @@
* the db parameter.
*/
+#include "qemu/osdep.h"
#include <eventt.h>
#include <vevent.h>
#include <vreader.h>
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 9f49c05..2e4d95f 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -8,6 +8,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "sysemu/char.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c
index ad77705..48cac87 100644
--- a/hw/usb/combined-packet.c
+++ b/hw/usb/combined-packet.c
@@ -19,6 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/usb.h"
#include "qemu/iov.h"
diff --git a/hw/usb/core.c b/hw/usb/core.c
index d0025db..bea5e1e 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -23,6 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/usb.h"
#include "qemu/iov.h"
diff --git a/hw/usb/desc-msos.c b/hw/usb/desc-msos.c
index 32c3600..3652919 100644
--- a/hw/usb/desc-msos.c
+++ b/hw/usb/desc-msos.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
diff --git a/hw/usb/desc.c b/hw/usb/desc.c
index b82c397..adb026e 100644
--- a/hw/usb/desc.c
+++ b/hw/usb/desc.c
@@ -1,4 +1,4 @@
-#include <ctype.h>
+#include "qemu/osdep.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 02fb110..87cab0a 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -29,6 +29,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index b19ec76..91a4a0b 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/usb.h"
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 2e7dcd9..40f38ad 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/usb.h"
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index c8c6855..64acdb0 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "trace.h"
#include "hw/usb.h"
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 4177a87..7391783 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -9,11 +9,10 @@
* This code is licensed under the GPL v2 or later.
*/
+#include "qemu/osdep.h"
#include <wchar.h>
#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
#include <sys/statvfs.h>
#ifdef __linux__
#include <sys/inotify.h>
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 7800cee..985a629 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index a6a6600..afad1db 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -8,6 +8,7 @@
* This code is licensed under the LGPL.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/usb.h"
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 8952eff..96a1a13 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -34,6 +34,7 @@
* Not sure which messages trigger this.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/usb.h"
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 597d8fd..f7ab741 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -7,6 +7,7 @@
* This code is licensed under the LGPL.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index 38b26c5..0678b1b 100644
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -9,6 +9,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index c2450e7..c4702db 100644
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -25,6 +25,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/usb.h"
diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index 16fb845..5657705 100644
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -15,6 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/usb/hcd-ehci.h"
#include "qemu/range.h"
diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
index cd1cc14..6c20604 100644
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -15,6 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/usb/hcd-ehci.h"
static const VMStateDescription vmstate_ehci_sysbus = {
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index d07f228..ab00268 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -27,6 +27,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/usb/ehci-regs.h"
#include "hw/usb/hcd-ehci.h"
#include "trace.h"
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
index 61cc878..cd23197 100644
--- a/hw/usb/hcd-musb.c
+++ b/hw/usb/hcd-musb.c
@@ -20,6 +20,7 @@
*
* Only host-mode and non-DMA accesses are currently supported.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/usb.h"
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index efeaf73..bed55dd 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -25,6 +25,7 @@
* o BIOS work to boot from USB storage
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/usb.h"
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 3f0ed62..5ccfb83 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -25,6 +25,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/usb.h"
#include "hw/usb/uhci-regs.h"
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 268ab36..44b6f8c 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -18,6 +18,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/usb.h"
diff --git a/hw/usb/host-legacy.c b/hw/usb/host-legacy.c
index 422ed9a..3b57e21 100644
--- a/hw/usb/host-legacy.c
+++ b/hw/usb/host-legacy.c
@@ -30,6 +30,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/usb.h"
#include "hw/usb/host.h"
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 3f8e540..5e7ec45 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -33,6 +33,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <poll.h>
#include <libusb.h>
diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c
index 2eaaa83..6ba65a1 100644
--- a/hw/usb/host-stub.c
+++ b/hw/usb/host-stub.c
@@ -30,6 +30,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "ui/console.h"
#include "hw/usb.h"
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 8df11c4..73cdf0c 100644
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -19,6 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/hw.h"
#include "hw/usb.h"
diff --git a/hw/usb/quirks.c b/hw/usb/quirks.c
index a761a96..38a9c56 100644
--- a/hw/usb/quirks.c
+++ b/hw/usb/quirks.c
@@ -12,6 +12,7 @@
* (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "quirks.h"
#include "hw/usb.h"
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 30ff742..d0f7cb8 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -25,6 +25,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c
index 75073bf..a0f13ef 100644
--- a/tests/usb-hcd-ehci-test.c
+++ b/tests/usb-hcd-ehci-test.c
@@ -7,12 +7,10 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include <glib.h>
-#include <string.h>
-#include <stdio.h>
#include "libqtest.h"
#include "libqos/pci-pc.h"
-#include "qemu/osdep.h"
#include "hw/usb/uhci-regs.h"
#include "hw/usb/ehci-regs.h"
#include "libqos/usb.h"
diff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c
index fa592d4..efd6669 100644
--- a/tests/usb-hcd-ohci-test.c
+++ b/tests/usb-hcd-ohci-test.c
@@ -7,10 +7,9 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include <glib.h>
-#include <string.h>
#include "libqtest.h"
-#include "qemu/osdep.h"
#include "libqos/usb.h"
diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c
index a96b716..71ff2ea 100644
--- a/tests/usb-hcd-uhci-test.c
+++ b/tests/usb-hcd-uhci-test.c
@@ -7,10 +7,9 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include <glib.h>
-#include <string.h>
#include "libqtest.h"
-#include "qemu/osdep.h"
#include "libqos/usb.h"
#include "hw/usb/uhci-regs.h"
diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c
index 56ab367..7e2e212 100644
--- a/tests/usb-hcd-xhci-test.c
+++ b/tests/usb-hcd-xhci-test.c
@@ -7,10 +7,9 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include <glib.h>
-#include <string.h>
#include "libqtest.h"
-#include "qemu/osdep.h"
#include "libqos/usb.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 20/37] hw/display: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (18 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 19/37] usb: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 21/37] hw/vfio: " Peter Maydell
` (17 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/display/ads7846.c | 1 +
hw/display/blizzard.c | 1 +
hw/display/cg3.c | 1 +
hw/display/cirrus_vga.c | 1 +
hw/display/framebuffer.c | 1 +
hw/display/g364fb.c | 1 +
hw/display/jazz_led.c | 1 +
hw/display/omap_dss.c | 1 +
hw/display/omap_lcdc.c | 1 +
hw/display/qxl-logger.c | 1 +
hw/display/qxl-render.c | 1 +
hw/display/qxl.c | 2 +-
hw/display/sm501.c | 2 +-
hw/display/ssd0303.c | 1 +
hw/display/ssd0323.c | 1 +
hw/display/tc6393xb.c | 1 +
hw/display/tcx.c | 1 +
hw/display/vga-isa-mm.c | 1 +
hw/display/vga-isa.c | 1 +
hw/display/vga-pci.c | 1 +
hw/display/vga.c | 1 +
hw/display/vmware_vga.c | 1 +
22 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c
index cb82317..05aa2d1 100644
--- a/hw/display/ads7846.c
+++ b/hw/display/ads7846.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/ssi/ssi.h"
#include "ui/console.h"
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 5019bbb..c231960 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "ui/console.h"
#include "hw/devices.h"
diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index e309fbe..321a251 100644
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "ui/console.h"
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 5198037..b6ce1c8 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -26,6 +26,7 @@
* Reference: Finn Thogersons' VGADOC4b
* available at http://home.worldonline.dk/~finth/
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "ui/console.h"
diff --git a/hw/display/framebuffer.c b/hw/display/framebuffer.c
index 7f075ce..df51358 100644
--- a/hw/display/framebuffer.c
+++ b/hw/display/framebuffer.c
@@ -17,6 +17,7 @@
- Remove all DisplayState knowledge from devices.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "framebuffer.h"
diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 7f83a00..70ef2c7 100644
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -17,6 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
#include "ui/console.h"
diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index 1ea49b7..09dcdb4 100644
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c
index b1c7af5..783e9e1 100644
--- a/hw/display/omap_dss.c
+++ b/hw/display/omap_dss.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/arm/omap.h"
diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c
index 678f9a1..ce1058b 100644
--- a/hw/display/omap_lcdc.c
+++ b/hw/display/omap_lcdc.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/arm/omap.h"
diff --git a/hw/display/qxl-logger.c b/hw/display/qxl-logger.c
index d944d3f..2ec6d8f 100644
--- a/hw/display/qxl-logger.c
+++ b/hw/display/qxl-logger.c
@@ -19,6 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu/timer.h"
#include "qxl.h"
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index 7e4ef1e..9ad9d9e 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -19,6 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qxl.h"
#include "trace.h"
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 8a3040c..a423dee 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -18,8 +18,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include <zlib.h>
-#include <stdint.h>
#include "qemu-common.h"
#include "qemu/timer.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 3c3f978..2957243 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c
index f6804fb..d301756 100644
--- a/hw/display/ssd0303.c
+++ b/hw/display/ssd0303.c
@@ -10,6 +10,7 @@
/* The controller can support a variety of different displays, but we only
implement one. Most of the commends relating to brightness and geometry
setup are ignored. */
+#include "qemu/osdep.h"
#include "hw/i2c/i2c.h"
#include "ui/console.h"
diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c
index 7545da8..14c1bf3 100644
--- a/hw/display/ssd0323.c
+++ b/hw/display/ssd0323.c
@@ -10,6 +10,7 @@
/* The controller can support a variety of different displays, but we only
implement one. Most of the commends relating to brightness and geometry
setup are ignored. */
+#include "qemu/osdep.h"
#include "hw/ssi/ssi.h"
#include "ui/console.h"
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 516af1a..31043b1 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -10,6 +10,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/devices.h"
#include "hw/block/flash.h"
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index d720ea6..8afc2f3 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 4efc222..51ccbcc 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/i386/pc.h"
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 7f3c989..f5aff1c 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -23,6 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/i386/pc.h"
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 1dfa331..ac9a764 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -23,6 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/pci/pci.h"
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 84ce0af..555cac6 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "vga.h"
#include "ui/console.h"
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 9354037..17bba63 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/loader.h"
#include "trace.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 21/37] hw/vfio: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (19 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 20/37] hw/display: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 22/37] pci: " Peter Maydell
` (16 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/vfio/calxeda-xgmac.c | 1 +
hw/vfio/common.c | 1 +
hw/vfio/pci-quirks.c | 1 +
hw/vfio/pci.c | 5 +----
hw/vfio/platform.c | 1 +
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c
index eb914f0..bb15d58 100644
--- a/hw/vfio/calxeda-xgmac.c
+++ b/hw/vfio/calxeda-xgmac.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/vfio/vfio-calxeda-xgmac.h"
static void calxeda_xgmac_realize(DeviceState *dev, Error **errp)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 6797208..607ec70 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -18,6 +18,7 @@
* Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)
*/
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <linux/vfio.h>
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index e117c41..4815527 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -10,6 +10,7 @@
* the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "pci.h"
#include "trace.h"
#include "qemu/range.h"
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index e66c47f..49f3d2d 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -18,14 +18,11 @@
* Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)
*/
+#include "qemu/osdep.h"
#include <linux/vfio.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include "config.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci_bridge.h"
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 289b498..ebc9dcb 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -14,6 +14,7 @@
* Copyright Red Hat, Inc. 2012
*/
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include <linux/vfio.h>
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 22/37] pci: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (20 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 21/37] hw/vfio: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 23/37] hw/scsi: " Peter Maydell
` (15 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/misc/pci-testdev.c | 2 +-
hw/pci-bridge/i82801b11.c | 1 +
hw/pci-bridge/ioh3420.c | 1 +
hw/pci-bridge/pci_bridge_dev.c | 1 +
hw/pci-bridge/pci_expander_bridge.c | 1 +
hw/pci-bridge/xio3130_downstream.c | 1 +
hw/pci-bridge/xio3130_upstream.c | 1 +
hw/pci-host/apb.c | 1 +
hw/pci-host/bonito.c | 2 +-
hw/pci-host/gpex.c | 1 +
hw/pci-host/ppce500.c | 1 +
hw/pci/msi.c | 1 +
hw/pci/msix.c | 1 +
hw/pci/pci-stub.c | 1 +
hw/pci/pci.c | 1 +
hw/pci/pci_bridge.c | 1 +
hw/pci/pci_host.c | 1 +
hw/pci/pcie.c | 1 +
hw/pci/pcie_aer.c | 1 +
hw/pci/pcie_host.c | 1 +
hw/pci/pcie_port.c | 1 +
hw/pci/shpc.c | 2 +-
hw/pci/slotid_cap.c | 1 +
23 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index 26b9b86..5df9089 100644
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "qemu/event_notifier.h"
-#include "qemu/osdep.h"
typedef struct PCITestDevHdr {
uint8_t test;
diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c
index 7e79bc0..b143f8c 100644
--- a/hw/pci-bridge/i82801b11.c
+++ b/hw/pci-bridge/i82801b11.c
@@ -41,6 +41,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/i386/ich9.h"
diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index cce2fdd..8ac4240 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -20,6 +20,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 26aded9..c9a7e2b 100644
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index bb98fb2..62fd29d 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
index b3a6479..9eb3d88 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c
index eada582..7d255a6 100644
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index 599768e..75dee50 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -27,6 +27,7 @@
Ultrasparc PCI host is called the PCI Bus Module (PBM). The APB is
the secondary PCI bridge. */
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index b477679..1999ece 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -37,7 +37,7 @@
* north bridge address to pci address.
*/
-#include <assert.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 9d8fb5a..66055ee 100644
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -28,6 +28,7 @@
* http://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt
* http://www.firmware.org/1275/practice/imap/imap0_9d.pdf
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci-host/gpex.h"
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 50add34..e502bc0 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -14,6 +14,7 @@
* (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/e500-ccsr.h"
#include "hw/pci/pci.h"
diff --git a/hw/pci/msi.c b/hw/pci/msi.c
index c1dd531..8efa23d 100644
--- a/hw/pci/msi.c
+++ b/hw/pci/msi.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/msi.h"
#include "qemu/range.h"
diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index 64c93d8..4fea7ed 100644
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -14,6 +14,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index 063a7c2..36d2c43 100644
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 168b9cc..d940f79 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 40c97b1..7eab9d5 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -29,6 +29,7 @@
* VA Linux Systems Japan K.K.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
#include "qemu/range.h"
diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index 49f59a5..5eaa935 100644
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 0eab29d..435a6cf 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h"
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 98d2c18..a9d9d06 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "qapi/qmp/types.h"
#include "monitor/monitor.h"
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index d8afba8..dcebf57 100644
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index 40ca8d5..6432b9a 100644
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pcie_port.h"
#include "hw/hotplug.h"
diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index d34fdf3..aef8384 100644
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -1,5 +1,5 @@
+#include "qemu/osdep.h"
#include "qemu-common.h"
-#include <stdint.h>
#include "qemu/range.h"
#include "qemu/error-report.h"
#include "hw/pci/shpc.h"
diff --git a/hw/pci/slotid_cap.c b/hw/pci/slotid_cap.c
index 1c01d34..aec1e91 100644
--- a/hw/pci/slotid_cap.c
+++ b/hw/pci/slotid_cap.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/pci/slotid_cap.h"
#include "hw/pci/pci.h"
#include "qemu/error-report.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 23/37] hw/scsi: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (21 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 22/37] pci: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 24/37] hw/misc: " Peter Maydell
` (14 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/scsi/esp-pci.c | 1 +
hw/scsi/esp.c | 1 +
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/megasas.c | 1 +
hw/scsi/scsi-bus.c | 1 +
hw/scsi/scsi-disk.c | 1 +
hw/scsi/scsi-generic.c | 5 +----
hw/scsi/vhost-scsi.c | 2 +-
hw/scsi/vmw_pvscsi.c | 1 +
9 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c
index 8d2242d..1de7706 100644
--- a/hw/scsi/esp-pci.c
+++ b/hw/scsi/esp-pci.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/nvram/eeprom93xx.h"
#include "hw/scsi/esp.h"
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 272d13d..e55c32c 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/scsi/esp.h"
#include "trace.h"
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index c5b0cc5..df205cd 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -13,7 +13,7 @@
* as well-behaved operating systems will not try to use them.
*/
-#include <assert.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 60c0e6c..a63a581 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 164af87..6dcdbc0 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
#include "hw/scsi/scsi.h"
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 4797d83..dc79dc0 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -28,6 +28,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
#define DPRINTF(fmt, ...) do {} while(0)
#endif
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/scsi/scsi.h"
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index a4626f7..75a4127 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/scsi/scsi.h"
@@ -31,10 +32,6 @@ do { printf("scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
#define BADF(fmt, ...) \
do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
#include <scsi/sg.h>
#include "block/scsi.h"
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 7bc8288..c86622c 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -14,8 +14,8 @@
*
*/
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
-#include "config.h"
#include "qemu/error-report.h"
#include "qemu/queue.h"
#include "monitor/monitor.h"
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index 6b4b989..9abc086 100644
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -25,6 +25,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/scsi/scsi.h"
#include <block/scsi.h>
#include "hw/pci/msi.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 24/37] hw/misc: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (22 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 23/37] hw/scsi: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 25/37] hw/timer: " Peter Maydell
` (13 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/misc/applesmc.c | 1 +
hw/misc/arm_integrator_debug.c | 1 +
hw/misc/arm_l2x0.c | 1 +
hw/misc/arm_sysctl.c | 1 +
hw/misc/cbus.c | 1 +
hw/misc/eccmemctl.c | 1 +
hw/misc/edu.c | 1 +
hw/misc/hyperv_testdev.c | 1 +
hw/misc/ivshmem.c | 3 +--
hw/misc/max111x.c | 1 +
hw/misc/mst_fpga.c | 1 +
hw/misc/omap_clk.c | 1 +
hw/misc/omap_gpmc.c | 1 +
hw/misc/omap_l4.c | 1 +
hw/misc/omap_sdrc.c | 1 +
hw/misc/omap_tap.c | 1 +
hw/misc/pvpanic.c | 1 +
hw/misc/slavio_misc.c | 1 +
hw/misc/stm32f2xx_syscfg.c | 1 +
hw/misc/tmp105.c | 1 +
hw/misc/vmport.c | 1 +
hw/misc/zynq-xadc.c | 1 +
22 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 6bd61e7..77fab5b 100644
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -30,6 +30,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "ui/console.h"
diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
index 6d9dd74..902605f 100644
--- a/hw/misc/arm_integrator_debug.c
+++ b/hw/misc/arm_integrator_debug.c
@@ -14,6 +14,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c
index 9e220c9..7e179f1 100644
--- a/hw/misc/arm_l2x0.c
+++ b/hw/misc/arm_l2x0.c
@@ -18,6 +18,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
/* L2C-310 r3p2 */
diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 3fad6f8..339205b 100644
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "qemu/bitops.h"
diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 495d507..fafe070 100644
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -20,6 +20,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/devices.h"
diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c
index 8bad6f6..a0071f3 100644
--- a/hw/misc/eccmemctl.c
+++ b/hw/misc/eccmemctl.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index 43d5b18..2639c64 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "qemu/timer.h"
#include "qemu/main-loop.h" /* iothread mutex */
diff --git a/hw/misc/hyperv_testdev.c b/hw/misc/hyperv_testdev.c
index d88844a..1883fd7 100644
--- a/hw/misc/hyperv_testdev.c
+++ b/hw/misc/hyperv_testdev.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/qdev.h"
#include "hw/isa/isa.h"
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index df585de..d5c89ae 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -16,6 +16,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
@@ -34,8 +35,6 @@
#include "hw/misc/ivshmem.h"
#include <sys/mman.h>
-#include <sys/types.h>
-#include <limits.h>
#define PCI_VENDOR_ID_IVSHMEM PCI_VENDOR_ID_REDHAT_QUMRANET
#define PCI_DEVICE_ID_IVSHMEM 0x1110
diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c
index d619d61..9014f0f 100644
--- a/hw/misc/max111x.c
+++ b/hw/misc/max111x.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/ssi/ssi.h"
typedef struct {
diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index d509079..48d7dfb 100644
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -10,6 +10,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index 73d4f8b..19151d0 100644
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -18,6 +18,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 8960f1b..67d8e2f 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -18,6 +18,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "hw/arm/omap.h"
diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
index 245ceac..88c533a 100644
--- a/hw/misc/omap_l4.c
+++ b/hw/misc/omap_l4.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index bca2530..dff37ec 100644
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
diff --git a/hw/misc/omap_tap.c b/hw/misc/omap_tap.c
index 6f02bb9..e6ea8ee 100644
--- a/hw/misc/omap_tap.c
+++ b/hw/misc/omap_tap.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 3709488..0ac1e6a 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -12,6 +12,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qjson.h"
#include "sysemu/sysemu.h"
diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index ec50f10..edd5de0 100644
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/misc/stm32f2xx_syscfg.c b/hw/misc/stm32f2xx_syscfg.c
index 4ae4042..d0d7076 100644
--- a/hw/misc/stm32f2xx_syscfg.c
+++ b/hw/misc/stm32f2xx_syscfg.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/misc/stm32f2xx_syscfg.h"
#ifndef STM_SYSCFG_ERR_DEBUG
diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index f3fe8b8..e102b40 100644
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "tmp105.h"
diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c
index cd5716a..6896789 100644
--- a/hw/misc/vmport.c
+++ b/hw/misc/vmport.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/i386/pc.h"
diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
index d160ff2..71fbccd 100644
--- a/hw/misc/zynq-xadc.c
+++ b/hw/misc/zynq-xadc.c
@@ -13,6 +13,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/misc/zynq-xadc.h"
#include "qemu/timer.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 25/37] hw/timer: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (23 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 24/37] hw/misc: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 26/37] hw/intc: " Peter Maydell
` (12 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/timer/ds1338.c | 1 +
hw/timer/etraxfs_timer.c | 1 +
hw/timer/m48t59.c | 1 +
hw/timer/omap_gptimer.c | 1 +
hw/timer/omap_synctimer.c | 1 +
hw/timer/sh_timer.c | 1 +
hw/timer/slavio_timer.c | 1 +
hw/timer/stm32f2xx_timer.c | 1 +
hw/timer/tusb6010.c | 1 +
hw/timer/twl92230.c | 1 +
hw/timer/xilinx_timer.c | 1 +
11 files changed, 11 insertions(+)
diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c
index ec6dbee..ff31561 100644
--- a/hw/timer/ds1338.c
+++ b/hw/timer/ds1338.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/i2c/i2c.h"
/* Size of NVRAM including both the user-accessible area and the
diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
index aee4990..36d8f46 100644
--- a/hw/timer/etraxfs_timer.c
+++ b/hw/timer/etraxfs_timer.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index b3df8f9..bbcfeb2 100644
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/timer/m48t59.h"
#include "qemu/timer.h"
diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
index dcf706c..b303421 100644
--- a/hw/timer/omap_gptimer.c
+++ b/hw/timer/omap_gptimer.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/arm/omap.h"
diff --git a/hw/timer/omap_synctimer.c b/hw/timer/omap_synctimer.c
index 8e50488..edd8d98 100644
--- a/hw/timer/omap_synctimer.c
+++ b/hw/timer/omap_synctimer.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/arm/omap.h"
diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index 07f0670..255b2fc 100644
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "qemu/timer.h"
diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index 45d97e6..fb3e08b 100644
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sparc/sun4m.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c
index ecadf9d..55dacbb 100644
--- a/hw/timer/stm32f2xx_timer.c
+++ b/hw/timer/stm32f2xx_timer.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/timer/stm32f2xx_timer.h"
#ifndef STM_TIMER_ERR_DEBUG
diff --git a/hw/timer/tusb6010.c b/hw/timer/tusb6010.c
index 459c748..9f6af90 100644
--- a/hw/timer/tusb6010.c
+++ b/hw/timer/tusb6010.c
@@ -18,6 +18,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/usb.h"
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index 7ded4ba..1c92438 100644
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index cdb3355..2ea970d 100644
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/ptimer.h"
#include "qemu/log.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 26/37] hw/intc: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (24 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 25/37] hw/timer: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 27/37] sh4: " Peter Maydell
` (11 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/intc/etraxfs_pic.c | 1 +
hw/intc/heathrow_pic.c | 1 +
hw/intc/i8259.c | 1 +
hw/intc/i8259_common.c | 1 +
hw/intc/omap_intc.c | 1 +
hw/intc/openpic.c | 1 +
hw/intc/openpic_kvm.c | 1 +
hw/intc/s390_flic.c | 1 +
hw/intc/s390_flic_kvm.c | 1 +
hw/intc/sh_intc.c | 1 +
hw/intc/slavio_intctl.c | 1 +
hw/intc/xilinx_intc.c | 1 +
12 files changed, 12 insertions(+)
diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c
index bd58868..48f9477 100644
--- a/hw/intc/etraxfs_pic.c
+++ b/hw/intc/etraxfs_pic.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
//#include "pc.h"
diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
index 9ff3119..171f5ed 100644
--- a/hw/intc/heathrow_pic.c
+++ b/hw/intc/heathrow_pic.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index 0f5c025..6f3a863 100644
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c
index fbf26e5..3a850b0 100644
--- a/hw/intc/i8259_common.c
+++ b/hw/intc/i8259_common.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/i386/pc.h"
#include "hw/isa/i8259_internal.h"
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index 07b6272..3368825 100644
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/sysbus.h"
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index bfcf155..903888c 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -33,6 +33,7 @@
* Serial interrupts, as implemented in Raven chipset are not supported yet.
*
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 649f476..4dcdb61 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include "exec/address-spaces.h"
#include "hw/hw.h"
diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 02e10b7..bc75fa7 100644
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -10,6 +10,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "hw/sysbus.h"
#include "migration/qemu-file.h"
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index 48714f9..02449b3 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -10,6 +10,7 @@
* directory.
*/
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include "qemu/error-report.h"
#include "hw/sysbus.h"
diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c
index 55c76e4..f3cdfaf 100644
--- a/hw/intc/sh_intc.c
+++ b/hw/intc/sh_intc.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sh4/sh_intc.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c
index f22aba0..c9486ed 100644
--- a/hw/intc/slavio_intctl.c
+++ b/hw/intc/slavio_intctl.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sparc/sun4m.h"
#include "monitor/monitor.h"
#include "hw/sysbus.h"
diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c
index 12804ab..9d8139b 100644
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 27/37] sh4: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (25 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 26/37] hw/intc: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 28/37] xtensa: " Peter Maydell
` (10 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
disas/sh4.c | 2 +-
hw/sh4/r2d.c | 1 +
hw/sh4/sh7750.c | 2 +-
hw/sh4/sh7750_regnames.c | 1 +
hw/sh4/sh_pci.c | 1 +
hw/sh4/shix.c | 1 +
target-sh4/cpu.c | 1 +
target-sh4/gdbstub.c | 2 +-
target-sh4/helper.c | 6 +-----
target-sh4/monitor.c | 1 +
target-sh4/op_helper.c | 2 +-
target-sh4/translate.c | 1 +
12 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/disas/sh4.c b/disas/sh4.c
index 020f5eb..8b0415d 100644
--- a/disas/sh4.c
+++ b/disas/sh4.c
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "disas/bfd.h"
#define DEFINE_TABLE
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index c1ff9a0..7d9a1cd 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 5dda5de..a1ea760 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -22,7 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/sysemu.h"
diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c
index 52ac1cc..34b4f99 100644
--- a/hw/sh4/sh7750_regnames.c
+++ b/hw/sh4/sh7750_regnames.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sh7750_regs.h"
diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
index 4509053..e820a32 100644
--- a/hw/sh4/sh_pci.c
+++ b/hw/sh4/sh_pci.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/sh4/sh.h"
#include "hw/pci/pci.h"
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index d508be9..386a485 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -27,6 +27,7 @@
More information in target-sh4/README.sh4
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/sysemu.h"
diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
index d7e2fbd..8621d70 100644
--- a/target-sh4/cpu.c
+++ b/target-sh4/cpu.c
@@ -19,6 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "migration/vmstate.h"
diff --git a/target-sh4/gdbstub.c b/target-sh4/gdbstub.c
index a365a27..1b59ea8 100644
--- a/target-sh4/gdbstub.c
+++ b/target-sh4/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index eaececd..9d8b61c 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -16,11 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "cpu.h"
diff --git a/target-sh4/monitor.c b/target-sh4/monitor.c
index a06f0d4..426e5d4 100644
--- a/target-sh4/monitor.c
+++ b/target-sh4/monitor.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index a312118..368e687 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 7bc6216..9de5659 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -19,6 +19,7 @@
#define DEBUG_DISAS
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 28/37] xtensa: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (26 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 27/37] sh4: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 29/37] openrisc: " Peter Maydell
` (9 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/xtensa/pic_cpu.c | 1 +
hw/xtensa/sim.c | 1 +
hw/xtensa/xtfpga.c | 1 +
target-xtensa/core-dc232b.c | 1 +
target-xtensa/core-dc233c.c | 1 +
target-xtensa/core-fsf.c | 1 +
target-xtensa/cpu.c | 1 +
target-xtensa/gdbstub.c | 2 +-
target-xtensa/helper.c | 1 +
target-xtensa/monitor.c | 1 +
target-xtensa/op_helper.c | 1 +
target-xtensa/translate.c | 2 +-
target-xtensa/xtensa-semi.c | 5 +----
13 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c
index 18825d1..c835bd0 100644
--- a/hw/xtensa/pic_cpu.c
+++ b/hw/xtensa/pic_cpu.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/log.h"
#include "qemu/timer.h"
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 6266b8d..3a5060b 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index c1bc5ae..fe7684d 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/target-xtensa/core-dc232b.c b/target-xtensa/core-dc232b.c
index 06826c0..bb8ed41 100644
--- a/target-xtensa/core-dc232b.c
+++ b/target-xtensa/core-dc232b.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
diff --git a/target-xtensa/core-dc233c.c b/target-xtensa/core-dc233c.c
index 8daf7d9..40475e5 100644
--- a/target-xtensa/core-dc233c.c
+++ b/target-xtensa/core-dc233c.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
diff --git a/target-xtensa/core-fsf.c b/target-xtensa/core-fsf.c
index f6ea6b9..15ef470 100644
--- a/target-xtensa/core-fsf.c
+++ b/target-xtensa/core-fsf.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c
index 4e49bee..d572d56 100644
--- a/target-xtensa/cpu.c
+++ b/target-xtensa/cpu.c
@@ -28,6 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "migration/vmstate.h"
diff --git a/target-xtensa/gdbstub.c b/target-xtensa/gdbstub.c
index dcf05ad..51d4db0 100644
--- a/target-xtensa/gdbstub.c
+++ b/target-xtensa/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index cf25bf8..839f4a7 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
diff --git a/target-xtensa/monitor.c b/target-xtensa/monitor.c
index 554b212..f3fa4cd 100644
--- a/target-xtensa/monitor.c
+++ b/target-xtensa/monitor.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index 02100af..62fa33d 100644
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index fbcec94..a8c1113 100644
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -28,7 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
diff --git a/target-xtensa/xtensa-semi.c b/target-xtensa/xtensa-semi.c
index 384d9c2..370e365 100644
--- a/target-xtensa/xtensa-semi.c
+++ b/target-xtensa/xtensa-semi.c
@@ -25,10 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stddef.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/log.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 29/37] openrisc: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (27 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 28/37] xtensa: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 30/37] m68k: " Peter Maydell
` (8 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/openrisc/cputimer.c | 1 +
hw/openrisc/openrisc_sim.c | 1 +
hw/openrisc/pic_cpu.c | 1 +
target-openrisc/cpu.c | 1 +
target-openrisc/exception.c | 1 +
target-openrisc/exception_helper.c | 1 +
target-openrisc/fpu_helper.c | 1 +
target-openrisc/gdbstub.c | 2 +-
target-openrisc/int_helper.c | 1 +
target-openrisc/interrupt.c | 1 +
target-openrisc/interrupt_helper.c | 1 +
target-openrisc/machine.c | 1 +
target-openrisc/mmu.c | 1 +
target-openrisc/mmu_helper.c | 1 +
target-openrisc/sys_helper.c | 1 +
target-openrisc/translate.c | 2 +-
16 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c
index 560cb91..a98c799 100644
--- a/hw/openrisc/cputimer.c
+++ b/hw/openrisc/cputimer.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "hw/hw.h"
#include "qemu/timer.h"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index be6c9b5..25c637a 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "elf.h"
diff --git a/hw/openrisc/pic_cpu.c b/hw/openrisc/pic_cpu.c
index 2af1d60..569b443 100644
--- a/hw/openrisc/pic_cpu.c
+++ b/hw/openrisc/pic_cpu.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "cpu.h"
diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
index cc5e2d1..cafc07f 100644
--- a/target-openrisc/cpu.c
+++ b/target-openrisc/cpu.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
diff --git a/target-openrisc/exception.c b/target-openrisc/exception.c
index 74652a58..ace3184 100644
--- a/target-openrisc/exception.c
+++ b/target-openrisc/exception.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exception.h"
diff --git a/target-openrisc/exception_helper.c b/target-openrisc/exception_helper.c
index 6093953..329a9e4 100644
--- a/target-openrisc/exception_helper.c
+++ b/target-openrisc/exception_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exception.h"
diff --git a/target-openrisc/fpu_helper.c b/target-openrisc/fpu_helper.c
index c94ed35..c54404b 100644
--- a/target-openrisc/fpu_helper.c
+++ b/target-openrisc/fpu_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exception.h"
diff --git a/target-openrisc/gdbstub.c b/target-openrisc/gdbstub.c
index 18bcc46..edc301a 100644
--- a/target-openrisc/gdbstub.c
+++ b/target-openrisc/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-openrisc/int_helper.c b/target-openrisc/int_helper.c
index 6e27aeb..4d1f958 100644
--- a/target-openrisc/int_helper.c
+++ b/target-openrisc/int_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exception.h"
diff --git a/target-openrisc/interrupt.c b/target-openrisc/interrupt.c
index e480cfd..963eb14 100644
--- a/target-openrisc/interrupt.c
+++ b/target-openrisc/interrupt.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-openrisc/interrupt_helper.c b/target-openrisc/interrupt_helper.c
index 55a780c..11b4b20 100644
--- a/target-openrisc/interrupt_helper.c
+++ b/target-openrisc/interrupt_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-openrisc/machine.c b/target-openrisc/machine.c
index 9f66a9c..b4dc08d 100644
--- a/target-openrisc/machine.c
+++ b/target-openrisc/machine.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
diff --git a/target-openrisc/mmu.c b/target-openrisc/mmu.c
index 750a936..4ab414a 100644
--- a/target-openrisc/mmu.c
+++ b/target-openrisc/mmu.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-openrisc/mmu_helper.c b/target-openrisc/mmu_helper.c
index ee1c6f6..d7952d4 100644
--- a/target-openrisc/mmu_helper.c
+++ b/target-openrisc/mmu_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/cpu_ldst.h"
diff --git a/target-openrisc/sys_helper.c b/target-openrisc/sys_helper.c
index 53ca6bc..f917be6 100644
--- a/target-openrisc/sys_helper.c
+++ b/target-openrisc/sys_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index 606490a..62890c2 100644
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -18,13 +18,13 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
#include "qemu/log.h"
-#include "config.h"
#include "qemu/bitops.h"
#include "exec/cpu_ldst.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 30/37] m68k: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (28 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 29/37] openrisc: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 31/37] cris: " Peter Maydell
` (7 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/m68k/an5206.c | 1 +
hw/m68k/dummy_m68k.c | 1 +
hw/m68k/mcf5206.c | 1 +
hw/m68k/mcf5208.c | 1 +
hw/m68k/mcf_intc.c | 1 +
target-m68k/cpu.c | 1 +
target-m68k/gdbstub.c | 2 +-
target-m68k/helper.c | 1 +
target-m68k/m68k-semi.c | 10 +---------
target-m68k/op_helper.c | 1 +
target-m68k/translate.c | 1 +
11 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 8d9ccaa..d87b945 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -6,6 +6,7 @@
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "hw/boards.h"
diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c
index 8b3b775..a213bcf 100644
--- a/hw/m68k/dummy_m68k.c
+++ b/hw/m68k/dummy_m68k.c
@@ -6,6 +6,7 @@
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index 1727a46..7fd3275 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -5,6 +5,7 @@
*
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "qemu/timer.h"
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index ddeccc5..9597e86 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -5,6 +5,7 @@
*
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "qemu/timer.h"
diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index f13c7f3..ff95513 100644
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -5,6 +5,7 @@
*
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "exec/address-spaces.h"
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index e8a4eed..6de74bf 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -18,6 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "migration/vmstate.h"
diff --git a/target-m68k/gdbstub.c b/target-m68k/gdbstub.c
index ae8179c..f02bb5c 100644
--- a/target-m68k/gdbstub.c
+++ b/target-m68k/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 77225a2..a8f6d9d 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index 9dffe8d..f360ef3 100644
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -17,15 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <time.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#if defined(CONFIG_USER_ONLY)
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index 1af0ca6..17d0a11 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 41ae2c6..342c040 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 31/37] cris: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (29 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 30/37] m68k: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 32/37] moxie: " Peter Maydell
` (6 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
disas/cris.c | 1 +
hw/cris/axis_dev88.c | 1 +
hw/cris/boot.c | 1 +
target-cris/cpu.c | 1 +
target-cris/gdbstub.c | 2 +-
target-cris/helper.c | 1 +
target-cris/machine.c | 1 +
target-cris/op_helper.c | 1 +
target-cris/translate.c | 1 +
target-cris/translate_v10.c | 1 +
10 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/disas/cris.c b/disas/cris.c
index 4482a41..7f35bc0 100644
--- a/disas/cris.c
+++ b/disas/cris.c
@@ -18,6 +18,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
//#include "sysdep.h"
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index de880d1..f2ba1d0 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/block/flash.h"
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index 1cfa339..6608160 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index 8eaf5a5..b2c8624 100644
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -21,6 +21,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "mmu.h"
diff --git a/target-cris/gdbstub.c b/target-cris/gdbstub.c
index 5db3683..1bbf17b 100644
--- a/target-cris/gdbstub.c
+++ b/target-cris/gdbstub.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target-cris/helper.c b/target-cris/helper.c
index df6c9fd..1eb9fd9 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "mmu.h"
#include "qemu/host-utils.h"
diff --git a/target-cris/machine.c b/target-cris/machine.c
index 983b67c..9cc2820 100644
--- a/target-cris/machine.c
+++ b/target-cris/machine.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
static const VMStateDescription vmstate_tlbset = {
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 2296677..320f2b8 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "mmu.h"
#include "exec/helper-proto.h"
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 2429931..295005f 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -23,6 +23,7 @@
* The condition code translation is in need of attention.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c
index df20bdc..1335517 100644
--- a/target-cris/translate_v10.c
+++ b/target-cris/translate_v10.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "crisv10-decode.h"
static const char *regnames_v10[] =
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 32/37] moxie: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (30 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 31/37] cris: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 33/37] tricore: " Peter Maydell
` (5 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
disas/moxie.c | 2 +-
hw/moxie/moxiesim.c | 1 +
target-moxie/cpu.c | 1 +
target-moxie/helper.c | 4 +---
target-moxie/machine.c | 1 +
target-moxie/mmu.c | 5 +----
target-moxie/translate.c | 6 +-----
7 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/disas/moxie.c b/disas/moxie.c
index 4c5f180..70b49ed 100644
--- a/disas/moxie.c
+++ b/disas/moxie.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
-#include <stdio.h>
+#include "qemu/osdep.h"
#define STATIC_TABLE
#define DEFINE_TABLE
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index ada3d58..9191ae9 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -24,6 +24,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
index 0c60c65..b33c2b3 100644
--- a/target-moxie/cpu.c
+++ b/target-moxie/cpu.c
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "migration/vmstate.h"
diff --git a/target-moxie/helper.c b/target-moxie/helper.c
index f91ac28..d51e9b9 100644
--- a/target-moxie/helper.c
+++ b/target-moxie/helper.c
@@ -17,10 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
-#include "config.h"
#include "cpu.h"
#include "mmu.h"
#include "exec/exec-all.h"
diff --git a/target-moxie/machine.c b/target-moxie/machine.c
index b9316f0..912b791 100644
--- a/target-moxie/machine.c
+++ b/target-moxie/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "machine.h"
diff --git a/target-moxie/mmu.c b/target-moxie/mmu.c
index 5217eed..9203330 100644
--- a/target-moxie/mmu.c
+++ b/target-moxie/mmu.c
@@ -17,11 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include "qemu/osdep.h"
-#include "config.h"
#include "cpu.h"
#include "mmu.h"
#include "exec/exec-all.h"
diff --git a/target-moxie/translate.c b/target-moxie/translate.c
index 6dedcb7..229ce3b 100644
--- a/target-moxie/translate.c
+++ b/target-moxie/translate.c
@@ -21,11 +21,7 @@
* http://moxielogic.org/wiki
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 33/37] tricore: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (31 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 32/37] moxie: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 34/37] tilegx: " Peter Maydell
` (4 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/tricore/tricore_testboard.c | 1 +
target-tricore/cpu.c | 1 +
target-tricore/helper.c | 6 +-----
target-tricore/op_helper.c | 2 +-
target-tricore/translate.c | 1 +
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 4ff5e7b..9392571 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -18,6 +18,7 @@
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/devices.h"
#include "net/net.h"
diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c
index ed8b030..f8b8518 100644
--- a/target-tricore/cpu.c
+++ b/target-tricore/cpu.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
diff --git a/target-tricore/helper.c b/target-tricore/helper.c
index 1b70429..a8fd418 100644
--- a/target-tricore/helper.c
+++ b/target-tricore/helper.c
@@ -15,11 +15,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "cpu.h"
diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index 53edbda..3aa6326 100644
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
diff --git a/target-tricore/translate.c b/target-tricore/translate.c
index 135c583..2b07b86 100644
--- a/target-tricore/translate.c
+++ b/target-tricore/translate.c
@@ -18,6 +18,7 @@
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 34/37] tilegx: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (32 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 33/37] tricore: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 35/37] arm devices: " Peter Maydell
` (3 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target-tilegx/cpu.c | 1 +
target-tilegx/helper.c | 1 +
target-tilegx/simd_helper.c | 1 +
target-tilegx/translate.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/target-tilegx/cpu.c b/target-tilegx/cpu.c
index c249704..eceeb2c 100644
--- a/target-tilegx/cpu.c
+++ b/target-tilegx/cpu.c
@@ -18,6 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "hw/qdev-properties.h"
diff --git a/target-tilegx/helper.c b/target-tilegx/helper.c
index dda821f..616c5c7 100644
--- a/target-tilegx/helper.c
+++ b/target-tilegx/helper.c
@@ -18,6 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "exec/helper-proto.h"
diff --git a/target-tilegx/simd_helper.c b/target-tilegx/simd_helper.c
index 6d7bb5c..2d40ddb 100644
--- a/target-tilegx/simd_helper.c
+++ b/target-tilegx/simd_helper.c
@@ -18,6 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu-common.h"
#include "exec/helper-proto.h"
diff --git a/target-tilegx/translate.c b/target-tilegx/translate.c
index 354f25a..2088f87 100644
--- a/target-tilegx/translate.c
+++ b/target-tilegx/translate.c
@@ -18,6 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/log.h"
#include "disas/disas.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 35/37] arm devices: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (33 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 34/37] tilegx: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 36/37] hw/core: " Peter Maydell
` (2 subsequent siblings)
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/char/omap_uart.c | 1 +
hw/char/stm32f2xx_usart.c | 1 +
hw/char/xilinx_uartlite.c | 1 +
hw/cpu/a9mpcore.c | 1 +
hw/cpu/arm11mpcore.c | 1 +
hw/cpu/realview_mpcore.c | 1 +
hw/dma/omap_dma.c | 1 +
hw/dma/xilinx_axidma.c | 1 +
hw/gpio/omap_gpio.c | 1 +
hw/gpio/zaurus.c | 1 +
hw/i2c/omap_i2c.c | 1 +
hw/input/tsc2005.c | 1 +
hw/input/tsc210x.c | 1 +
hw/sd/omap_mmc.c | 1 +
hw/ssi/omap_spi.c | 1 +
hw/ssi/pl022.c | 1 +
16 files changed, 16 insertions(+)
diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 278ce36..415bec5 100644
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "sysemu/char.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c
index c9d3a1b..a94d61c 100644
--- a/hw/char/stm32f2xx_usart.c
+++ b/hw/char/stm32f2xx_usart.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/char/stm32f2xx_usart.h"
#ifndef STM_USART_ERR_DEBUG
diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index ef883a8..911af4a 100644
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/char.h"
diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 869818c..23c882f 100644
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/cpu/a9mpcore.h"
static void a9mp_priv_set_irq(void *opaque, int irq, int level)
diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c
index 717d3e4..5f4ca31 100644
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/cpu/arm11mpcore.h"
#include "hw/intc/realview_gic.h"
diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c
index c39a2da..c5c4dfc 100644
--- a/hw/cpu/realview_mpcore.c
+++ b/hw/cpu/realview_mpcore.c
@@ -8,6 +8,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/cpu/arm11mpcore.h"
#include "hw/intc/realview_gic.h"
diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
index db68730..700cd6b 100644
--- a/hw/dma/omap_dma.c
+++ b/hw/dma/omap_dma.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/arm/omap.h"
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index f5ebc1f..ce5c1e6 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 63d8b42..9b1b004 100644
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/sysbus.h"
diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index aa8ee5f..555da28 100644
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -15,6 +15,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/sharpsl.h"
#include "hw/sysbus.h"
diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 8b0b146..67fbbff 100644
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/arm/omap.h"
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index 21d4f4d..8da4887 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "ui/console.h"
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index 1073bbf..d11ef04 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -19,6 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "audio/audio.h"
#include "qemu/timer.h"
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 5bc4719..e934cd3 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/sd/sd.h"
diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c
index 2726329..2203465 100644
--- a/hw/ssi/omap_spi.c
+++ b/hw/ssi/omap_spi.c
@@ -19,6 +19,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
index 0bbf633..564a0d3 100644
--- a/hw/ssi/pl022.c
+++ b/hw/ssi/pl022.c
@@ -7,6 +7,7 @@
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/ssi/ssi.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 36/37] hw/core: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (34 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 35/37] arm devices: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 37/37] hw: " Peter Maydell
2016-01-27 8:03 ` [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Paolo Bonzini
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/core/empty_slot.c | 1 +
hw/core/fw-path-provider.c | 1 +
hw/core/hotplug.c | 1 +
hw/core/irq.c | 1 +
hw/core/loader.c | 1 +
hw/core/machine.c | 1 +
hw/core/nmi.c | 1 +
hw/core/null-machine.c | 1 +
hw/core/platform-bus.c | 1 +
hw/core/ptimer.c | 1 +
hw/core/qdev-properties-system.c | 1 +
hw/core/qdev-properties.c | 1 +
hw/core/qdev.c | 2 +-
hw/core/stream.c | 1 +
hw/core/sysbus.c | 1 +
15 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c
index 612b109..c1b9c2b 100644
--- a/hw/core/empty_slot.c
+++ b/hw/core/empty_slot.c
@@ -9,6 +9,7 @@
* version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/empty_slot.h"
diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index 7442d32..33b9983 100644
--- a/hw/core/fw-path-provider.c
+++ b/hw/core/fw-path-provider.c
@@ -15,6 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/fw-path-provider.h"
char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus,
diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c
index 4e01074..645cfca 100644
--- a/hw/core/hotplug.c
+++ b/hw/core/hotplug.c
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/hotplug.h"
#include "qemu/module.h"
diff --git a/hw/core/irq.c b/hw/core/irq.c
index 8a62a36..49ff2e6 100644
--- a/hw/core/irq.c
+++ b/hw/core/irq.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/irq.h"
#include "qom/object.h"
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 6b69852..3a57415 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -42,6 +42,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "disas/disas.h"
#include "monitor/monitor.h"
diff --git a/hw/core/machine.c b/hw/core/machine.c
index c46ddc7..1261368 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "hw/boards.h"
#include "qapi-visit.h"
#include "qapi/visitor.h"
diff --git a/hw/core/nmi.c b/hw/core/nmi.c
index 4057cdd..6ca569b 100644
--- a/hw/core/nmi.c
+++ b/hw/core/nmi.c
@@ -19,6 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/nmi.h"
#include "qapi/qmp/qerror.h"
#include "monitor/monitor.h"
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index f36fbf2..0351ba7 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/hw.h"
#include "hw/boards.h"
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index aa55d01..36f84ab 100644
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -19,6 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/platform-bus.h"
#include "exec/address-spaces.h"
#include "qemu/error-report.h"
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index edf077c..153c835 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -5,6 +5,7 @@
*
* This code is licensed under the GNU LGPL.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 1589aba..ff00f5c 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "net/net.h"
#include "hw/qdev.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 3572810..c1d1e80 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "net/net.h"
#include "hw/qdev.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 655f5d5..779de2b 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -25,10 +25,10 @@
inherit from a particular bus (e.g. PCI or I2C) rather than
this API directly. */
+#include "qemu/osdep.h"
#include "hw/qdev.h"
#include "hw/fw-path-provider.h"
#include "sysemu/sysemu.h"
-#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
#include "qapi/visitor.h"
#include "qapi/qmp/qjson.h"
diff --git a/hw/core/stream.c b/hw/core/stream.c
index e6a05a5..4439ecd 100644
--- a/hw/core/stream.c
+++ b/hw/core/stream.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/stream.h"
size_t
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index 3c58629..a7dbe2b 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "monitor/monitor.h"
#include "exec/address-spaces.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [Qemu-devel] [PATCH 37/37] hw: Clean up includes
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (35 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 36/37] hw/core: " Peter Maydell
@ 2016-01-26 18:17 ` Peter Maydell
2016-01-27 8:03 ` [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Paolo Bonzini
37 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-26 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/bt/core.c | 1 +
hw/bt/hci-csr.c | 1 +
hw/bt/hci.c | 1 +
hw/bt/hid.c | 1 +
hw/bt/l2cap.c | 1 +
hw/bt/sdp.c | 1 +
hw/char/escc.c | 1 +
hw/char/etraxfs_ser.c | 1 +
hw/char/ipoctal232.c | 1 +
hw/char/mcf_uart.c | 1 +
hw/char/sh_serial.c | 1 +
hw/cpu/a15mpcore.c | 1 +
hw/dma/etraxfs_dma.c | 3 +--
hw/dma/i82374.c | 1 +
hw/dma/rc4030.c | 1 +
hw/dma/soc_dma.c | 1 +
hw/dma/sparc32_dma.c | 1 +
hw/dma/sun4m_iommu.c | 1 +
hw/gpio/max7310.c | 1 +
hw/gpio/mpc8xxx.c | 1 +
hw/i2c/bitbang_i2c.c | 1 +
hw/i2c/core.c | 1 +
hw/i2c/smbus.c | 1 +
hw/i2c/smbus_eeprom.c | 1 +
hw/input/adb.c | 1 +
hw/input/hid.c | 1 +
hw/input/lm832x.c | 1 +
hw/input/pckbd.c | 1 +
hw/input/ps2.c | 1 +
hw/input/vmmouse.c | 1 +
hw/ipack/ipack.c | 1 +
hw/ipack/tpci200.c | 2 +-
hw/ipmi/ipmi.c | 1 +
hw/ipmi/ipmi_bmc_extern.c | 2 +-
hw/ipmi/ipmi_bmc_sim.c | 4 +---
hw/ipmi/isa_ipmi_bt.c | 1 +
hw/ipmi/isa_ipmi_kcs.c | 1 +
hw/isa/apm.c | 1 +
hw/isa/i82378.c | 1 +
hw/isa/isa-bus.c | 1 +
hw/isa/vt82c686.c | 1 +
hw/mem/nvdimm.c | 1 +
hw/mem/pc-dimm.c | 1 +
hw/nvram/ds1225y.c | 1 +
hw/nvram/eeprom93xx.c | 1 +
hw/nvram/fw_cfg.c | 1 +
hw/nvram/mac_nvram.c | 1 +
hw/pcmcia/pcmcia.c | 1 +
hw/sd/sd.c | 1 +
hw/sd/sdhci.c | 2 +-
hw/sd/ssi-sd.c | 1 +
hw/smbios/smbios.c | 1 +
hw/ssi/ssi.c | 1 +
hw/tpm/tpm_passthrough.c | 2 +-
hw/tpm/tpm_tis.c | 1 +
hw/tpm/tpm_util.c | 1 +
hw/watchdog/watchdog.c | 1 +
hw/watchdog/wdt_i6300esb.c | 2 +-
hw/watchdog/wdt_ib700.c | 1 +
59 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/hw/bt/core.c b/hw/bt/core.c
index 0ffc948..615f0af 100644
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -17,6 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "sysemu/bt.h"
#include "hw/bt.h"
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index 7b9b916..0189b0a 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "sysemu/char.h"
#include "qemu/timer.h"
diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index 2151d01..8bc33b5 100644
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -18,6 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/usb.h"
diff --git a/hw/bt/hid.c b/hw/bt/hid.c
index af494e1..f6affbb 100644
--- a/hw/bt/hid.c
+++ b/hw/bt/hid.c
@@ -18,6 +18,7 @@
* with this program; if not, if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "ui/console.h"
diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c
index 591e047..8065251 100644
--- a/hw/bt/l2cap.c
+++ b/hw/bt/l2cap.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/bt.h"
diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c
index 04eaeca..be26009 100644
--- a/hw/bt/sdp.c
+++ b/hw/bt/sdp.c
@@ -17,6 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/bt.h"
diff --git a/hw/char/escc.c b/hw/char/escc.c
index b351214..98a1c21 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/char/escc.h"
diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index d4d875e..146b387 100644
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "sysemu/char.h"
#include "qemu/log.h"
diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index c8d5cdb..bc0ae49 100644
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -8,6 +8,7 @@
* later version.
*/
+#include "qemu/osdep.h"
#include "hw/ipack/ipack.h"
#include "qemu/bitops.h"
#include "sysemu/char.h"
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index cda22ee..3c0438f 100644
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -5,6 +5,7 @@
*
* This code is licensed under the GPL
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "sysemu/char.h"
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 9328dd1..4c55dcb 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -24,6 +24,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/char.h"
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index 94e8cc1..e9063ad 100644
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/cpu/a15mpcore.h"
#include "sysemu/kvm.h"
#include "kvm_arm.h"
diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c
index 3599513..9cbb165 100644
--- a/hw/dma/etraxfs_dma.c
+++ b/hw/dma/etraxfs_dma.c
@@ -21,8 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include <stdio.h>
-#include <sys/time.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "exec/address-spaces.h"
#include "qemu-common.h"
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index f630971..869721d 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/isa/isa.h"
//#define DEBUG_I82374
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index 3efa6de..1c4f8df 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/mips/mips.h"
#include "hw/sysbus.h"
diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c
index 94be376..9bb499b 100644
--- a/hw/dma/soc_dma.c
+++ b/hw/dma/soc_dma.c
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/arm/soc_dma.h"
diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index e6a453c..9d545e4 100644
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -25,6 +25,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sparc/sparc32_dma.h"
#include "hw/sparc/sun4m.h"
diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c
index 9a488bc..b3cbc54 100644
--- a/hw/dma/sun4m_iommu.c
+++ b/hw/dma/sun4m_iommu.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sparc/sun4m.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index 2f59b13..1bd5eaf 100644
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -7,6 +7,7 @@
* This file is licensed under GNU GPL.
*/
+#include "qemu/osdep.h"
#include "hw/i2c/i2c.h"
#define TYPE_MAX7310 "max7310"
diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c
index 1aeaaaa..d149719 100644
--- a/hw/gpio/mpc8xxx.c
+++ b/hw/gpio/mpc8xxx.c
@@ -19,6 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#define TYPE_MPC8XXX_GPIO "mpc8xxx_gpio"
diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index 6d1bb03..6ed2060 100644
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -9,6 +9,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "bitbang_i2c.h"
#include "hw/sysbus.h"
diff --git a/hw/i2c/core.c b/hw/i2c/core.c
index 5a64026..ba22104 100644
--- a/hw/i2c/core.c
+++ b/hw/i2c/core.c
@@ -7,6 +7,7 @@
* This code is licensed under the LGPL.
*/
+#include "qemu/osdep.h"
#include "hw/i2c/i2c.h"
struct I2CBus
diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c
index 6e27ae8..3979b3d 100644
--- a/hw/i2c/smbus.c
+++ b/hw/i2c/smbus.c
@@ -9,6 +9,7 @@
/* TODO: Implement PEC. */
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/i2c/smbus.h"
diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index 72c09cb..5b7bd89 100644
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/i2c/smbus.h"
diff --git a/hw/input/adb.c b/hw/input/adb.c
index 09eead9..c384856 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/input/adb.h"
#include "ui/console.h"
diff --git a/hw/input/hid.c b/hw/input/hid.c
index 3221d29..a11e2bc 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "qemu/timer.h"
diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index 530a6e0..539682c 100644
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "qemu/timer.h"
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index ddac69d..1d932ec 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/i386/pc.h"
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 79754cd..b6f0e8d 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/input/ps2.h"
#include "ui/console.h"
diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c
index d7b1c76..6d15a88 100644
--- a/hw/input/vmmouse.c
+++ b/hw/input/vmmouse.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/input/ps2.h"
diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c
index 59bfe28..7c5c30d 100644
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -8,6 +8,7 @@
* later version.
*/
+#include "qemu/osdep.h"
#include "hw/ipack/ipack.h"
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c
index 1df02ee8..fdda6f4 100644
--- a/hw/ipack/tpci200.c
+++ b/hw/ipack/tpci200.c
@@ -8,10 +8,10 @@
* later version.
*/
+#include "qemu/osdep.h"
#include "hw/ipack/ipack.h"
#include "hw/pci/pci.h"
#include "qemu/bitops.h"
-#include <stdio.h>
/* #define DEBUG_TPCI */
diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index 52aba1e..dfab272 100644
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ipmi/ipmi.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index 56073b3..c31a3a0 100644
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -27,7 +27,7 @@
* using the "VM" connection type. See that for details.
*/
-#include <stdint.h>
+#include "qemu/osdep.h"
#include "qemu/timer.h"
#include "sysemu/char.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 0a59e53..dcdab03 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -22,9 +22,7 @@
* THE SOFTWARE.
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
+#include "qemu/osdep.h"
#include "qemu/timer.h"
#include "hw/ipmi/ipmi.h"
#include "qemu/error-report.h"
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index ce1b78a..ace2dc0 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ipmi/ipmi.h"
#include "hw/isa/isa.h"
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index daa70c3..9841b7f 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ipmi/ipmi.h"
#include "hw/isa/isa.h"
diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index 26ab170..e232b0d 100644
--- a/hw/isa/apm.c
+++ b/hw/isa/apm.c
@@ -20,6 +20,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/isa/apm.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index 3793c6f..4d29a99 100644
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/i386/pc.h"
#include "hw/timer/i8254.h"
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 630054c..b487cb1 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "monitor/monitor.h"
#include "hw/sysbus.h"
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 6c2190b..41d5254 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/vt82c686.h"
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index 4fd397f..0a602f2 100644
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -22,6 +22,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "hw/mem/nvdimm.h"
static void nvdimm_class_init(ObjectClass *oc, void *data)
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index d5cdab2..32d00dd 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "hw/mem/pc-dimm.h"
#include "qemu/config-file.h"
#include "qapi/visitor.h"
diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index 332598b..57d5ab2 100644
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index 0af4d67..2c16fc2 100644
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -35,6 +35,7 @@
* - No emulation of EEPROM timings.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/nvram/eeprom93xx.h"
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index a1d650d..79c5742 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index 9f16566..564ef93 100644
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/nvram/openbios_firmware_abi.h"
#include "sysemu/sysemu.h"
diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c
index 78efe5a..1956721 100644
--- a/hw/pcmcia/pcmcia.c
+++ b/hw/pcmcia/pcmcia.c
@@ -4,6 +4,7 @@
* Copyright 2013 SUSE LINUX Products GmbH
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/hw.h"
#include "hw/pcmcia.h"
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 1a9935c..7580449 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -29,6 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/block-backend.h"
#include "hw/sd/sd.h"
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 7acb4d7..30e3bf4 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -22,7 +22,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index eeb96b9..075e4ed 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -10,6 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
#include "hw/ssi/ssi.h"
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index a3e575a..3b5f9bd 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -15,6 +15,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index a0f57c0..9791c0d 100644
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -12,6 +12,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
+#include "qemu/osdep.h"
#include "hw/ssi/ssi.h"
struct SSIBus {
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index ab526db..e98efb7 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -22,8 +22,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
#include "sysemu/tpm_backend.h"
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 95fc66e..c1c3d4d 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -22,6 +22,7 @@
* TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
*/
+#include "qemu/osdep.h"
#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "sysemu/block-backend.h"
diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
index 4ace585..7b35429 100644
--- a/hw/tpm/tpm_util.c
+++ b/hw/tpm/tpm_util.c
@@ -19,6 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
+#include "qemu/osdep.h"
#include "tpm_util.h"
#include "tpm_int.h"
diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 8d4b0ee..f4b9ed6 100644
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -19,6 +19,7 @@
* By Richard W.M. Jones (rjones@redhat.com).
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index a91c8fd..a83d951 100644
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -19,7 +19,7 @@
* By Richard W.M. Jones (rjones@redhat.com).
*/
-#include <inttypes.h>
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index 0917a71..532530b 100644
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -19,6 +19,7 @@
* By Richard W.M. Jones (rjones@redhat.com).
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "sysemu/watchdog.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
` (36 preceding siblings ...)
2016-01-26 18:17 ` [Qemu-devel] [PATCH 37/37] hw: " Peter Maydell
@ 2016-01-27 8:03 ` Paolo Bonzini
2016-01-29 16:12 ` Peter Maydell
37 siblings, 1 reply; 49+ messages in thread
From: Paolo Bonzini @ 2016-01-27 8:03 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: patches
On 26/01/2016 19:16, Peter Maydell wrote:
> This is a big fat patchset that touches nearly 800 files,
> but it's all automated use of scripts/clean-includes.
> This doesn't cover the whole tree, but it does get all
> of target-* and hw/ and some other bits.
> I split the patches up mostly roughly by entries in
> MAINTAINERS, and also with some more ad-hoc splitting
> at the end of the series. The final larger patch is
> the "everything else in hw" bit -- I stopped when I
> got down to a diffstat that wasn't too stupidly huge and
> there weren't any more obvious neat carve-outs.
>
> I propose to apply this directly to master in the not too
> distant future, since the consensus appears to be that that's
> overall less painful than trying to split it all between
> maintainer trees for a purely mechanical change.
>
> There will then be another similar series which picks up
> the remaining stuff.
Agreed, thanks for doing this!
Paolo
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 07/37] s390: Clean up includes
2016-01-26 18:17 ` [Qemu-devel] [PATCH 07/37] s390: " Peter Maydell
@ 2016-01-27 8:41 ` Cornelia Huck
0 siblings, 0 replies; 49+ messages in thread
From: Cornelia Huck @ 2016-01-27 8:41 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, patches
On Tue, 26 Jan 2016 18:17:00 +0000
Peter Maydell <peter.maydell@linaro.org> wrote:
> Clean up includes so that osdep.h is included first and headers
> which it implies are not included manually.
>
> This commit was created with scripts/clean-includes.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
BTW: Does/should checkpatch look for osdep.h for new files?
> ---
> hw/char/sclpconsole-lm.c | 1 +
> hw/char/sclpconsole.c | 1 +
> hw/s390x/css.c | 1 +
> hw/s390x/event-facility.c | 1 +
> hw/s390x/ipl.c | 1 +
> hw/s390x/s390-pci-bus.c | 1 +
> hw/s390x/s390-pci-inst.c | 1 +
> hw/s390x/s390-skeys-kvm.c | 1 +
> hw/s390x/s390-skeys.c | 1 +
> hw/s390x/s390-virtio-ccw.c | 1 +
> hw/s390x/s390-virtio-hcall.c | 1 +
> hw/s390x/s390-virtio.c | 1 +
> hw/s390x/sclp.c | 1 +
> hw/s390x/sclpcpu.c | 1 +
> hw/s390x/sclpquiesce.c | 1 +
> hw/s390x/virtio-ccw.c | 1 +
> hw/watchdog/wdt_diag288.c | 1 +
> target-s390x/arch_dump.c | 1 +
> target-s390x/cc_helper.c | 1 +
> target-s390x/cpu.c | 1 +
> target-s390x/fpu_helper.c | 1 +
> target-s390x/gdbstub.c | 2 +-
> target-s390x/helper.c | 1 +
> target-s390x/int_helper.c | 1 +
> target-s390x/interrupt.c | 1 +
> target-s390x/ioinst.c | 2 +-
> target-s390x/kvm.c | 2 +-
> target-s390x/machine.c | 1 +
> target-s390x/mem_helper.c | 1 +
> target-s390x/misc_helper.c | 2 +-
> target-s390x/mmu_helper.c | 1 +
> target-s390x/translate.c | 1 +
> 32 files changed, 32 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h
2016-01-27 8:03 ` [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Paolo Bonzini
@ 2016-01-29 16:12 ` Peter Maydell
0 siblings, 0 replies; 49+ messages in thread
From: Peter Maydell @ 2016-01-29 16:12 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers, Patch Tracking
On 27 January 2016 at 08:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
> On 26/01/2016 19:16, Peter Maydell wrote:
>> I propose to apply this directly to master in the not too
>> distant future, since the consensus appears to be that that's
>> overall less painful than trying to split it all between
>> maintainer trees for a purely mechanical change.
>>
>> There will then be another similar series which picks up
>> the remaining stuff.
>
> Agreed, thanks for doing this!
This series now pushed to master.
thanks
-- PMM
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 11/37] alpha: Clean up includes
2016-01-26 18:17 ` [Qemu-devel] [PATCH 11/37] alpha: " Peter Maydell
@ 2016-02-06 0:48 ` Richard Henderson
0 siblings, 0 replies; 49+ messages in thread
From: Richard Henderson @ 2016-02-06 0:48 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: patches
On 01/27/2016 05:17 AM, Peter Maydell wrote:
> Clean up includes so that osdep.h is included first and headers
> which it implies are not included manually.
>
> This commit was created with scripts/clean-includes.
>
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
> ---
> disas/alpha.c | 2 +-
> hw/alpha/dp264.c | 1 +
> hw/alpha/pci.c | 2 +-
> hw/alpha/typhoon.c | 1 +
> target-alpha/cpu.c | 1 +
> target-alpha/fpu_helper.c | 1 +
> target-alpha/gdbstub.c | 2 +-
> target-alpha/helper.c | 4 +---
> target-alpha/int_helper.c | 1 +
> target-alpha/machine.c | 1 +
> target-alpha/mem_helper.c | 1 +
> target-alpha/sys_helper.c | 1 +
> target-alpha/translate.c | 1 +
> target-alpha/vax_helper.c | 1 +
> 14 files changed, 14 insertions(+), 6 deletions(-)
Acked-by: Richard Henderson <rth@twiddle.net>
r~
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-01-26 18:17 ` [Qemu-devel] [PATCH 15/37] tcg: " Peter Maydell
@ 2016-02-06 0:51 ` Richard Henderson
2016-02-06 13:43 ` Peter Maydell
0 siblings, 1 reply; 49+ messages in thread
From: Richard Henderson @ 2016-02-06 0:51 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: patches
On 01/27/2016 05:17 AM, Peter Maydell wrote:
> diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
> index 0ed10a9..8467d5d 100644
> --- a/tcg/aarch64/tcg-target.c
> +++ b/tcg/aarch64/tcg-target.c
> @@ -10,6 +10,7 @@
> * See the COPYING file in the top-level directory for details.
> */
>
> +#include "qemu/osdep.h"
> #include "tcg-be-ldst.h"
> #include "qemu/bitops.h"
>
> diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
> index 3edf6a6..146ac00 100644
> --- a/tcg/arm/tcg-target.c
> +++ b/tcg/arm/tcg-target.c
> @@ -22,6 +22,7 @@
> * THE SOFTWARE.
> */
>
> +#include "qemu/osdep.h"
> #include "elf.h"
> #include "tcg-be-ldst.h"
>
> diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
> index 9187d34..d90636c 100644
> --- a/tcg/i386/tcg-target.c
> +++ b/tcg/i386/tcg-target.c
> @@ -22,6 +22,7 @@
> * THE SOFTWARE.
> */
>
> +#include "qemu/osdep.h"
> #include "tcg-be-ldst.h"
>
> #ifndef NDEBUG
Nack to these, and the others like them.
These files are not standalone, they are
included into tcg.c, so we ought not be
re-including qemu/osdep.h here.
> diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
> index 79e052f..2dc4998 100644
> --- a/tcg/mips/tcg-target.c
> +++ b/tcg/mips/tcg-target.c
> @@ -1735,7 +1736,6 @@ static int tcg_target_callee_save_regs[] = {
> /* The Linux kernel doesn't provide any information about the available
> instruction set. Probe it using a signal handler. */
>
> -#include <signal.h>
>
> #ifndef use_movnz_instructions
> bool use_movnz_instructions = false;
But this is good.
> diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
> index 2c72565..c593344 100644
> --- a/tcg/ppc/tcg-target.c
> +++ b/tcg/ppc/tcg-target.c
> @@ -2725,8 +2726,6 @@ static void __attribute__((constructor)) tcg_cache_init(void)
> }
>
> #elif defined __APPLE__
> -#include <stdio.h>
> -#include <sys/types.h>
> #include <sys/sysctl.h>
>
> static void __attribute__((constructor)) tcg_cache_init(void)
> @@ -2745,11 +2744,6 @@ static void __attribute__((constructor)) tcg_cache_init(void)
> }
>
> #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> -#include <errno.h>
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <string.h>
> -#include <sys/types.h>
> #include <sys/sysctl.h>
>
> static void __attribute__((constructor)) tcg_cache_init(void)
And this.
r~
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-02-06 0:51 ` Richard Henderson
@ 2016-02-06 13:43 ` Peter Maydell
2016-02-06 23:49 ` Richard Henderson
2016-02-19 18:24 ` Peter Maydell
0 siblings, 2 replies; 49+ messages in thread
From: Peter Maydell @ 2016-02-06 13:43 UTC (permalink / raw)
To: Richard Henderson; +Cc: QEMU Developers, Patch Tracking
On 6 February 2016 at 00:51, Richard Henderson <rth@twiddle.net> wrote:
> On 01/27/2016 05:17 AM, Peter Maydell wrote:
>> diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
>> index 9187d34..d90636c 100644
>> --- a/tcg/i386/tcg-target.c
>> +++ b/tcg/i386/tcg-target.c
>> @@ -22,6 +22,7 @@
>> * THE SOFTWARE.
>> */
>>
>> +#include "qemu/osdep.h"
>> #include "tcg-be-ldst.h"
>>
>> #ifndef NDEBUG
>
>
> Nack to these, and the others like them.
> These files are not standalone, they are
> included into tcg.c, so we ought not be
> re-including qemu/osdep.h here.
Mmm, but I preferred to retain the invariant that "all .c
files include osdep.h first" rather than special casing
these; the re-include is harmless.
Alternatively we could rename these tcg-target.c
files to some other extension that makes it clearer that
they're not standalone source files.
(This is commit 757e725b58c57 in master now, so I'll
write a patch that fixes things up.)
thanks
-- PMM
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-02-06 13:43 ` Peter Maydell
@ 2016-02-06 23:49 ` Richard Henderson
2016-02-19 18:24 ` Peter Maydell
1 sibling, 0 replies; 49+ messages in thread
From: Richard Henderson @ 2016-02-06 23:49 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Patch Tracking
On Feb 7, 2016 00:43, Peter Maydell <peter.maydell@linaro.org> wrote:
> Alternatively we could rename these tcg-target.c
> files to some other extension that makes it clearer that
> they're not standalone source files.
Maybe for next cycle I can get around my goal of changing this around to be more md-file-like. Which would allow more compile-time validation, instead of the collection of start-time asserts (which don't even run without --enable-debug-tcg).
r~
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-02-06 13:43 ` Peter Maydell
2016-02-06 23:49 ` Richard Henderson
@ 2016-02-19 18:24 ` Peter Maydell
2016-02-22 19:11 ` Richard Henderson
1 sibling, 1 reply; 49+ messages in thread
From: Peter Maydell @ 2016-02-19 18:24 UTC (permalink / raw)
To: Richard Henderson; +Cc: QEMU Developers, Patch Tracking
On 6 February 2016 at 13:43, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 6 February 2016 at 00:51, Richard Henderson <rth@twiddle.net> wrote:
>> On 01/27/2016 05:17 AM, Peter Maydell wrote:
>>> diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
>>> index 9187d34..d90636c 100644
>>> --- a/tcg/i386/tcg-target.c
>>> +++ b/tcg/i386/tcg-target.c
>>> @@ -22,6 +22,7 @@
>>> * THE SOFTWARE.
>>> */
>>>
>>> +#include "qemu/osdep.h"
>>> #include "tcg-be-ldst.h"
>>>
>>> #ifndef NDEBUG
>>
>>
>> Nack to these, and the others like them.
>> These files are not standalone, they are
>> included into tcg.c, so we ought not be
>> re-including qemu/osdep.h here.
>
> Mmm, but I preferred to retain the invariant that "all .c
> files include osdep.h first" rather than special casing
> these; the re-include is harmless.
>
> Alternatively we could rename these tcg-target.c
> files to some other extension that makes it clearer that
> they're not standalone source files.
How do you feel about renaming the tcg-target.c files to
tcg-target.inc.c ? Then I can make clean-includes know that
*.inc.c are not to have the cleaning rules applied to them.
thanks
-- PMM
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-02-19 18:24 ` Peter Maydell
@ 2016-02-22 19:11 ` Richard Henderson
2016-02-22 19:24 ` Peter Maydell
0 siblings, 1 reply; 49+ messages in thread
From: Richard Henderson @ 2016-02-22 19:11 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers, Patch Tracking
On 02/19/2016 10:24 AM, Peter Maydell wrote:
> On 6 February 2016 at 13:43, Peter Maydell <peter.maydell@linaro.org> wrote:
>> On 6 February 2016 at 00:51, Richard Henderson <rth@twiddle.net> wrote:
>>> On 01/27/2016 05:17 AM, Peter Maydell wrote:
>>>> diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
>>>> index 9187d34..d90636c 100644
>>>> --- a/tcg/i386/tcg-target.c
>>>> +++ b/tcg/i386/tcg-target.c
>>>> @@ -22,6 +22,7 @@
>>>> * THE SOFTWARE.
>>>> */
>>>>
>>>> +#include "qemu/osdep.h"
>>>> #include "tcg-be-ldst.h"
>>>>
>>>> #ifndef NDEBUG
>>>
>>>
>>> Nack to these, and the others like them.
>>> These files are not standalone, they are
>>> included into tcg.c, so we ought not be
>>> re-including qemu/osdep.h here.
>>
>> Mmm, but I preferred to retain the invariant that "all .c
>> files include osdep.h first" rather than special casing
>> these; the re-include is harmless.
>>
>> Alternatively we could rename these tcg-target.c
>> files to some other extension that makes it clearer that
>> they're not standalone source files.
>
> How do you feel about renaming the tcg-target.c files to
> tcg-target.inc.c ? Then I can make clean-includes know that
> *.inc.c are not to have the cleaning rules applied to them.
I suppose. Though is the pattern "*.inc.c" really any better than "tcg-target.c"?
r~
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-02-22 19:11 ` Richard Henderson
@ 2016-02-22 19:24 ` Peter Maydell
2016-02-22 20:07 ` Richard Henderson
0 siblings, 1 reply; 49+ messages in thread
From: Peter Maydell @ 2016-02-22 19:24 UTC (permalink / raw)
To: Richard Henderson; +Cc: QEMU Developers, Patch Tracking
On 22 February 2016 at 19:11, Richard Henderson <rth@twiddle.net> wrote:
> On 02/19/2016 10:24 AM, Peter Maydell wrote:
>> How do you feel about renaming the tcg-target.c files to
>> tcg-target.inc.c ? Then I can make clean-includes know that
>> *.inc.c are not to have the cleaning rules applied to them.
>
> I suppose. Though is the pattern "*.inc.c" really any better
> than "tcg-target.c"?
I think it's kind of confusing that tcg-target.c isn't a
standalone C file, so giving it a clearer name is nicer
for humans too.
-- PMM
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes
2016-02-22 19:24 ` Peter Maydell
@ 2016-02-22 20:07 ` Richard Henderson
0 siblings, 0 replies; 49+ messages in thread
From: Richard Henderson @ 2016-02-22 20:07 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers, Patch Tracking
On 02/22/2016 11:24 AM, Peter Maydell wrote:
> On 22 February 2016 at 19:11, Richard Henderson <rth@twiddle.net> wrote:
>> On 02/19/2016 10:24 AM, Peter Maydell wrote:
>>> How do you feel about renaming the tcg-target.c files to
>>> tcg-target.inc.c ? Then I can make clean-includes know that
>>> *.inc.c are not to have the cleaning rules applied to them.
>>
>> I suppose. Though is the pattern "*.inc.c" really any better
>> than "tcg-target.c"?
>
> I think it's kind of confusing that tcg-target.c isn't a
> standalone C file, so giving it a clearer name is nicer
> for humans too.
No objection then.
r~
^ permalink raw reply [flat|nested] 49+ messages in thread
end of thread, other threads:[~2016-02-22 20:07 UTC | newest]
Thread overview: 49+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 01/37] migration: Clean up includes Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 02/37] crypto: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 03/37] exec: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 04/37] lm32: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 05/37] ppc: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 06/37] sparc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 07/37] s390: " Peter Maydell
2016-01-27 8:41 ` Cornelia Huck
2016-01-26 18:17 ` [Qemu-devel] [PATCH 08/37] unicore: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 09/37] linux-user: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 10/37] x86: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 11/37] alpha: " Peter Maydell
2016-02-06 0:48 ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 12/37] arm: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 13/37] xen: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 14/37] virtio: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 15/37] tcg: " Peter Maydell
2016-02-06 0:51 ` Richard Henderson
2016-02-06 13:43 ` Peter Maydell
2016-02-06 23:49 ` Richard Henderson
2016-02-19 18:24 ` Peter Maydell
2016-02-22 19:11 ` Richard Henderson
2016-02-22 19:24 ` Peter Maydell
2016-02-22 20:07 ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 16/37] ide: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 17/37] 9pfs: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 18/37] hw/net: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 19/37] usb: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 20/37] hw/display: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 21/37] hw/vfio: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 22/37] pci: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 23/37] hw/scsi: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 24/37] hw/misc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 25/37] hw/timer: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 26/37] hw/intc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 27/37] sh4: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 28/37] xtensa: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 29/37] openrisc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 30/37] m68k: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 31/37] cris: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 32/37] moxie: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 33/37] tricore: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 34/37] tilegx: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 35/37] arm devices: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 36/37] hw/core: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 37/37] hw: " Peter Maydell
2016-01-27 8:03 ` [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Paolo Bonzini
2016-01-29 16:12 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.