| Message ID | 1455818725-7647-8-git-send-email-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/18/2016 11:05 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> > --- > 56 files changed, 2 insertions(+), 100 deletions(-) > > +++ b/io/channel-util.c > @@ -18,6 +18,7 @@ > * > */ > > +#include "qemu/osdep.h" > #include "io/channel-util.h" > #include "io/channel-file.h" > #include "io/channel-socket.h" Ah, so the 2 insertions are due to recent file additions, after your last round of cleanups. Any way to automate this into checkpatch.pl for new file creation? Then again, not all developers have Coccinelle installed. But even checking whether the string 'include.*qemu/osdep.h' is present in a new file may help, even if it doesn't detect it being included out-of-order. > +++ b/slirp/slirp.h > @@ -1,11 +1,9 @@ > #ifndef __COMMON_H__ > #define __COMMON_H__ > > -#include "config-host.h" > #include "slirp_config.h" > > #ifdef _WIN32 > -# include <inttypes.h> > > typedef char *caddr_t; > > @@ -23,43 +21,31 @@ typedef char *caddr_t; > # endif > #endif > > -#include <sys/types.h> > #ifdef HAVE_SYS_BITYPES_H > # include <sys/bitypes.h> > #endif > > -#include <sys/time.h> > > #ifdef HAVE_UNISTD_H > -# include <unistd.h> > #endif > > #ifdef HAVE_STDLIB_H > -# include <stdlib.h> > #endif Leftover dead checks of HAVE_UNISTD_H and so forth; this file could use further manual cleanups. For that matter, do we even need HAVE_UNISTD_H in slirp/slirp_config.h any more? There's probably quite a bit of pruning of cruft we could do. But as this patch was completely automated, I'm fine if that cleanup is done as followups. Therefore, Reviewed-by: Eric Blake <eblake@redhat.com>
On 18 February 2016 at 19:16, Eric Blake <eblake@redhat.com> wrote: > On 02/18/2016 11:05 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> >> --- > >> 56 files changed, 2 insertions(+), 100 deletions(-) >> > >> +++ b/io/channel-util.c >> @@ -18,6 +18,7 @@ >> * >> */ >> >> +#include "qemu/osdep.h" >> #include "io/channel-util.h" >> #include "io/channel-file.h" >> #include "io/channel-socket.h" > > Ah, so the 2 insertions are due to recent file additions, after your > last round of cleanups. > > Any way to automate this into checkpatch.pl for new file creation? Then > again, not all developers have Coccinelle installed. But even checking > whether the string 'include.*qemu/osdep.h' is present in a new file may > help, even if it doesn't detect it being included out-of-order. Looking at this is on my todo list, but TBH once this patch is in master I don't expect much backsliding, because forgetting osdep.h will result in your new file not compiling at all. It's only in this transitional stage where qemu-common.h still pulls in osdep.h that it's possible for a new file to slip in without the include. > Leftover dead checks of HAVE_UNISTD_H and so forth; this file could use > further manual cleanups. For that matter, do we even need HAVE_UNISTD_H > in slirp/slirp_config.h any more? There's probably quite a bit of > pruning of cruft we could do. But as this patch was completely > automated, I'm fine if that cleanup is done as followups. OK. Will put it on my list to fix up later. thanks -- PMM
diff --git a/audio/audio.h b/audio/audio.h index e7ea397..b41a970 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -24,7 +24,6 @@ #ifndef QEMU_AUDIO_H #define QEMU_AUDIO_H -#include "config-host.h" #include "qemu/queue.h" typedef void (*audio_callback_fn) (void *opaque, int avail); diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 735cb40..1b5f998 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -17,15 +17,12 @@ #ifndef QEMU_H #define QEMU_H -#include <signal.h> -#include <string.h> #include "cpu.h" #include "exec/cpu_ldst.h" #undef DEBUG_REMAP #ifdef DEBUG_REMAP -#include <stdlib.h> #endif /* DEBUG_REMAP */ #include "exec/user/abitypes.h" diff --git a/contrib/ivshmem-client/ivshmem-client.h b/contrib/ivshmem-client/ivshmem-client.h index 3a4f809..54cde17 100644 --- a/contrib/ivshmem-client/ivshmem-client.h +++ b/contrib/ivshmem-client/ivshmem-client.h @@ -19,7 +19,6 @@ * purposes. */ -#include <limits.h> #include <sys/select.h> #include "qemu/queue.h" diff --git a/contrib/ivshmem-server/ivshmem-server.h b/contrib/ivshmem-server/ivshmem-server.h index c9359a0..e9de8a3 100644 --- a/contrib/ivshmem-server/ivshmem-server.h +++ b/contrib/ivshmem-server/ivshmem-server.h @@ -26,10 +26,7 @@ * associated to the ivshmem shared memory. */ -#include <limits.h> #include <sys/select.h> -#include <stdint.h> -#include <stdbool.h> #include "qemu/event_notifier.h" #include "qemu/queue.h" diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 956fda0..b8c2602 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -12,11 +12,8 @@ */ #ifndef _FILEOP_H #define _FILEOP_H -#include <sys/types.h> #include <dirent.h> -#include <sys/time.h> #include <utime.h> -#include <sys/stat.h> #include <sys/uio.h> #include <sys/vfs.h> diff --git a/hw/9pfs/9p-synth.h b/hw/9pfs/9p-synth.h index eaf5a0c..8296251 100644 --- a/hw/9pfs/9p-synth.h +++ b/hw/9pfs/9p-synth.h @@ -13,9 +13,6 @@ #ifndef HW_9PFS_SYNTH_H #define HW_9PFS_SYNTH_H 1 -#include <unistd.h> -#include <sys/types.h> -#include <limits.h> typedef struct V9fsSynthNode V9fsSynthNode; typedef ssize_t (*v9fs_synth_read)(void *buf, int len, off_t offset, diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index edcd51b..1a19418 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -1,9 +1,7 @@ #ifndef _QEMU_9P_H #define _QEMU_9P_H -#include <sys/types.h> #include <dirent.h> -#include <sys/time.h> #include <utime.h> #include <sys/resource.h> #include <glib.h> diff --git a/hw/audio/gusemu.h b/hw/audio/gusemu.h index 331bb6f..b7f0751 100644 --- a/hw/audio/gusemu.h +++ b/hw/audio/gusemu.h @@ -34,7 +34,6 @@ typedef signed char GUSchar; typedef signed short GUSsample; #else - #include <stdint.h> typedef int8_t GUSchar; typedef uint8_t GUSbyte; typedef uint16_t GUSword; diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 40ba6a4..bdb43a5 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -25,7 +25,6 @@ #define HW_VGA_INT_H 1 #include <hw/hw.h> -#include "qapi/error.h" #include "exec/memory.h" #define ST01_V_RETRACE 0x08 diff --git a/hw/net/fsl_etsec/registers.h b/hw/net/fsl_etsec/registers.h index 7ad7686..6fb9684 100644 --- a/hw/net/fsl_etsec/registers.h +++ b/hw/net/fsl_etsec/registers.h @@ -24,7 +24,6 @@ #ifndef _ETSEC_REGISTERS_H_ #define _ETSEC_REGISTERS_H_ -#include <stdint.h> enum eTSEC_Register_Access_Type { ACC_RW = 1, /* Read/Write */ diff --git a/hw/usb/desc.h b/hw/usb/desc.h index 8e8db03..4d81c68 100644 --- a/hw/usb/desc.h +++ b/hw/usb/desc.h @@ -1,7 +1,6 @@ #ifndef QEMU_HW_USB_DESC_H #define QEMU_HW_USB_DESC_H -#include <inttypes.h> #include <wchar.h> /* binary representation */ diff --git a/io/channel-util.c b/io/channel-util.c index f96907c..0fb4bd0 100644 --- a/io/channel-util.c +++ b/io/channel-util.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "io/channel-util.h" #include "io/channel-file.h" #include "io/channel-socket.h" diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index bb9ac65..7e114ee 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -21,9 +21,6 @@ #ifndef __FPA11_H__ #define __FPA11_H__ -#include <stdlib.h> -#include <stdio.h> -#include <errno.h> #include <cpu.h> diff --git a/linux-user/qemu.h b/linux-user/qemu.h index bd90cc3..ba5b433 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -1,15 +1,12 @@ #ifndef QEMU_H #define QEMU_H -#include <signal.h> -#include <string.h> #include "cpu.h" #include "exec/cpu_ldst.h" #undef DEBUG_REMAP #ifdef DEBUG_REMAP -#include <stdlib.h> #endif /* DEBUG_REMAP */ #include "exec/user/abitypes.h" diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index db6ab65..d09b4ee 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -16,16 +16,12 @@ #include "qemu/coroutine.h" #include "qemu/iov.h" -#include <errno.h> -#include <string.h> #ifndef _WIN32 #include <sys/ioctl.h> #endif #if defined(__sun__) || defined(__HAIKU__) #include <sys/ioccom.h> #endif -#include <ctype.h> -#include <inttypes.h> #ifdef __linux__ #include <linux/fs.h> diff --git a/net/tap-linux.h b/net/tap-linux.h index 01dc6f8..1dc3a9f 100644 --- a/net/tap-linux.h +++ b/net/tap-linux.h @@ -16,7 +16,6 @@ #ifndef QEMU_TAP_LINUX_H #define QEMU_TAP_LINUX_H -#include <stdint.h> #ifdef __linux__ #include <linux/ioctl.h> diff --git a/net/util.h b/net/util.h index 10c7da9..60b73d3 100644 --- a/net/util.h +++ b/net/util.h @@ -25,7 +25,6 @@ #ifndef QEMU_NET_UTIL_H #define QEMU_NET_UTIL_H -#include <stdint.h> int net_parse_macaddr(uint8_t *macaddr, const char *p); diff --git a/qemu-nbd.c b/qemu-nbd.c index 933ca4a..3a280ee 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -31,8 +31,6 @@ #include "io/channel-socket.h" #include <getopt.h> -#include <sys/types.h> -#include <signal.h> #include <libgen.h> #include <pthread.h> diff --git a/qga/vss-win32.h b/qga/vss-win32.h index 298927d..4d1d150 100644 --- a/qga/vss-win32.h +++ b/qga/vss-win32.h @@ -13,7 +13,6 @@ #ifndef VSS_WIN32_H #define VSS_WIN32_H -#include "qapi/error.h" bool vss_init(bool init_requester); void vss_deinit(bool deinit_requester); diff --git a/qga/vss-win32/requester.h b/qga/vss-win32/requester.h index c3093cf..ad2bf3d 100644 --- a/qga/vss-win32/requester.h +++ b/qga/vss-win32/requester.h @@ -14,7 +14,6 @@ #define VSS_WIN32_REQUESTER_H #include <basetyps.h> /* STDAPI */ -#include "qemu/compiler.h" #ifdef __cplusplus extern "C" { diff --git a/qga/vss-win32/vss-common.h b/qga/vss-win32/vss-common.h index ce14e14..91dae0c 100644 --- a/qga/vss-win32/vss-common.h +++ b/qga/vss-win32/vss-common.h @@ -14,7 +14,6 @@ #define VSS_WIN32_H #define __MIDL_user_allocate_free_DEFINED__ -#include "config-host.h" #include <windows.h> #include <shlwapi.h> diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 77e0d29..5438ebd 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -12,7 +12,6 @@ * */ -#include <stdio.h> enum ReplayEvents { /* for instruction event */ diff --git a/slirp/slirp.h b/slirp/slirp.h index 239fe29..07c13b4 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -1,11 +1,9 @@ #ifndef __COMMON_H__ #define __COMMON_H__ -#include "config-host.h" #include "slirp_config.h" #ifdef _WIN32 -# include <inttypes.h> typedef char *caddr_t; @@ -23,43 +21,31 @@ typedef char *caddr_t; # endif #endif -#include <sys/types.h> #ifdef HAVE_SYS_BITYPES_H # include <sys/bitypes.h> #endif -#include <sys/time.h> #ifdef HAVE_UNISTD_H -# include <unistd.h> #endif #ifdef HAVE_STDLIB_H -# include <stdlib.h> #endif -#include <stdio.h> -#include <errno.h> #ifndef HAVE_MEMMOVE #define memmove(x, y, z) bcopy(y, x, z) #endif #if TIME_WITH_SYS_TIME -# include <sys/time.h> -# include <time.h> #else # ifdef HAVE_SYS_TIME_H -# include <sys/time.h> # else -# include <time.h> # endif #endif #ifdef HAVE_STRING_H -# include <string.h> #else -# include <strings.h> #endif #ifndef _WIN32 @@ -82,11 +68,9 @@ void *malloc(size_t arg); void free(void *ptr); #endif -#include <fcntl.h> #ifndef NO_UNIX_SOCKETS #include <sys/un.h> #endif -#include <signal.h> #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif @@ -115,12 +99,10 @@ void free(void *ptr); #endif #ifdef __STDC__ -#include <stdarg.h> #else #include <varargs.h> #endif -#include <sys/stat.h> /* Avoid conflicting with the libc insque() and remque(), which have different prototypes. */ diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index bcd8076..420f2a5 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -20,7 +20,6 @@ #if !defined (__CPU_ALPHA_H__) #define __CPU_ALPHA_H__ -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 64 diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 1623821..3cbda73 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_ARM_H #define CPU_ARM_H -#include "config.h" #include "kvm-consts.h" diff --git a/target-arm/kvm-consts.h b/target-arm/kvm-consts.h index 943bf89..a2c9518 100644 --- a/target-arm/kvm-consts.h +++ b/target-arm/kvm-consts.h @@ -15,7 +15,6 @@ #define ARM_KVM_CONSTS_H #ifdef CONFIG_KVM -#include "qemu/compiler.h" #include <linux/kvm.h> #include <linux/psci.h> diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 3220460..415cf91 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -20,7 +20,6 @@ #ifndef CPU_CRIS_H #define CPU_CRIS_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index 5f9d960..cb75017 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -22,7 +22,6 @@ #include "qom/cpu.h" #include "cpu.h" -#include "qapi/error.h" #include "qemu/notify.h" #ifdef TARGET_X86_64 diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 94cb4db..7febc3f 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_I386_H #define CPU_I386_H -#include "config.h" #include "qemu-common.h" #include "standard-headers/asm-x86/hyperv.h" diff --git a/target-i386/mpx_helper.c b/target-i386/mpx_helper.c index 1bf717a..052a69c 100644 --- a/target-i386/mpx_helper.c +++ b/target-i386/mpx_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-lm32/cpu.h b/target-lm32/cpu.h index 2b7620c..f220fc0 100644 --- a/target-lm32/cpu.h +++ b/target-lm32/cpu.h @@ -24,7 +24,6 @@ #define CPUArchState struct CPULM32State -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" struct CPULM32State; diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 224c169..48b4c87 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -24,7 +24,6 @@ #define CPUArchState struct CPUM68KState -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 6b212ab..2f7335e 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_MICROBLAZE_H #define CPU_MICROBLAZE_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-mips/cpu.h b/target-mips/cpu.h index 17817c3..9ddc43f 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -7,7 +7,6 @@ #define CPUArchState struct CPUMIPSState -#include "config.h" #include "qemu-common.h" #include "mips-defs.h" #include "exec/cpu-defs.h" diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index a612744..4ee2077 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -19,7 +19,6 @@ #ifndef _CPU_MOXIE_H #define _CPU_MOXIE_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h index eb71607..4b63f25 100644 --- a/target-openrisc/cpu.h +++ b/target-openrisc/cpu.h @@ -27,7 +27,6 @@ /* cpu_openrisc_map_address_* in CPUOpenRISCTLBContext need this decl. */ struct OpenRISCCPU; -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 892f4dc..2b10597 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -19,7 +19,6 @@ #if !defined (__CPU_PPC_H__) #define __CPU_PPC_H__ -#include "config.h" #include "qemu-common.h" //#define PPC_EMULATE_32BITS_HYPV diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 06ca60b..6ae5699 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -22,7 +22,6 @@ #ifndef CPU_S390X_H #define CPU_S390X_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 64 diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 5b022c5..3b23e96 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -19,7 +19,6 @@ #ifndef _CPU_SH4_H #define _CPU_SH4_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 58ff474..dc46122 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -1,7 +1,6 @@ #ifndef CPU_SPARC_H #define CPU_SPARC_H -#include "config.h" #include "qemu-common.h" #include "qemu/bswap.h" diff --git a/target-tilegx/cpu.h b/target-tilegx/cpu.h index 03df107..022cad1 100644 --- a/target-tilegx/cpu.h +++ b/target-tilegx/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_TILEGX_H #define CPU_TILEGX_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 64 diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h index 20a12f3..be6f121 100644 --- a/target-tricore/cpu.h +++ b/target-tricore/cpu.h @@ -20,7 +20,6 @@ #define __TRICORE_CPU_H__ #include "tricore-defs.h" -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h index 01c370c..9c1fbf9 100644 --- a/target-unicore32/cpu.h +++ b/target-unicore32/cpu.h @@ -19,7 +19,6 @@ #define CPUArchState struct CPUUniCore32State -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index 15ce010..d0bd9da 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -33,7 +33,6 @@ #define CPUArchState struct CPUXtensaState -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index 77e5952..3942f9c 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -40,7 +40,6 @@ #if !defined(TCG_TARGET_H) #define TCG_TARGET_H -#include "config-host.h" #define TCG_TARGET_INTERPRETER 1 #define TCG_TARGET_INSN_UNIT_SIZE 1 diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index 69dc4d7..71dd7a6 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -25,9 +25,6 @@ * THE SOFTWARE. */ -#include <stdint.h> -#include <stdlib.h> -#include <stdbool.h> #include "libqos/libqos.h" #include "libqos/pci.h" #include "libqos/malloc-pc.h" diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h index 61b1548..e8371b2 100644 --- a/tests/libqos/fw_cfg.h +++ b/tests/libqos/fw_cfg.h @@ -13,8 +13,6 @@ #ifndef LIBQOS_FW_CFG_H #define LIBQOS_FW_CFG_H -#include <stdint.h> -#include <sys/types.h> typedef struct QFWCFG QFWCFG; diff --git a/tests/libqos/i2c.h b/tests/libqos/i2c.h index c21f1dc..6e648f9 100644 --- a/tests/libqos/i2c.h +++ b/tests/libqos/i2c.h @@ -9,7 +9,6 @@ #ifndef LIBQOS_I2C_H #define LIBQOS_I2C_H -#include <stdint.h> typedef struct I2CAdapter I2CAdapter; struct I2CAdapter { diff --git a/tests/libqos/malloc.h b/tests/libqos/malloc.h index 0c6c9b7..ae9dac8 100644 --- a/tests/libqos/malloc.h +++ b/tests/libqos/malloc.h @@ -13,8 +13,6 @@ #ifndef LIBQOS_MALLOC_H #define LIBQOS_MALLOC_H -#include <stdint.h> -#include <sys/types.h> #include "qemu/queue.h" typedef enum { diff --git a/tests/libqos/pci.h b/tests/libqos/pci.h index dfaee9e..c06add8 100644 --- a/tests/libqos/pci.h +++ b/tests/libqos/pci.h @@ -13,7 +13,6 @@ #ifndef LIBQOS_PCI_H #define LIBQOS_PCI_H -#include <stdint.h> #include "libqtest.h" #define QPCI_DEVFN(dev, fn) (((dev) << 3) | (fn)) diff --git a/tests/libqtest.h b/tests/libqtest.h index ebdd5bb..37f37ad 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -17,13 +17,7 @@ #ifndef LIBQTEST_H #define LIBQTEST_H -#include <stddef.h> -#include <stdint.h> -#include <stdbool.h> -#include <stdarg.h> -#include <sys/types.h> #include "qapi/qmp/qdict.h" -#include "glib-compat.h" typedef struct QTestState QTestState; diff --git a/trace/control-internal.h b/trace/control-internal.h index 07cb1c1..dcf67f5 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -10,7 +10,6 @@ #ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include <string.h> extern TraceEvent trace_events[]; diff --git a/trace/ftrace.h b/trace/ftrace.h index 863e052..92372e3 100644 --- a/trace/ftrace.h +++ b/trace/ftrace.h @@ -1,7 +1,6 @@ #ifndef TRACE_FTRACE_H #define TRACE_FTRACE_H -#include <stdbool.h> #define MAX_TRACE_STRLEN 512 diff --git a/trace/simple.h b/trace/simple.h index 8d1a32e..1e7de45 100644 --- a/trace/simple.h +++ b/trace/simple.h @@ -11,9 +11,6 @@ #ifndef TRACE_SIMPLE_H #define TRACE_SIMPLE_H -#include <stdint.h> -#include <stdbool.h> -#include <stdio.h> #include "trace/generated-events.h" diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h index d02f023..1bd4318 100644 --- a/ui/vnc-palette.h +++ b/ui/vnc-palette.h @@ -31,8 +31,6 @@ #include "qapi/qmp/qlist.h" #include "qemu/queue.h" -#include <stdint.h> -#include <stdbool.h> #define VNC_PALETTE_HASH_SIZE 256 #define VNC_PALETTE_MAX_SIZE 256 diff --git a/ui/vnc.h b/ui/vnc.h index a95cc15..81a3261 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -38,7 +38,6 @@ #include "io/channel-socket.h" #include "io/channel-tls.h" #include <zlib.h> -#include <stdbool.h> #include "keymaps.h" #include "vnc-palette.h"
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> --- audio/audio.h | 1 - bsd-user/qemu.h | 3 --- contrib/ivshmem-client/ivshmem-client.h | 1 - contrib/ivshmem-server/ivshmem-server.h | 3 --- fsdev/file-op-9p.h | 3 --- hw/9pfs/9p-synth.h | 3 --- hw/9pfs/9p.h | 2 -- hw/audio/gusemu.h | 1 - hw/display/vga_int.h | 1 - hw/net/fsl_etsec/registers.h | 1 - hw/usb/desc.h | 1 - io/channel-util.c | 1 + linux-user/arm/nwfpe/fpa11.h | 3 --- linux-user/qemu.h | 3 --- nbd/nbd-internal.h | 4 ---- net/tap-linux.h | 1 - net/util.h | 1 - qemu-nbd.c | 2 -- qga/vss-win32.h | 1 - qga/vss-win32/requester.h | 1 - qga/vss-win32/vss-common.h | 1 - replay/replay-internal.h | 1 - slirp/slirp.h | 18 ------------------ target-alpha/cpu.h | 1 - target-arm/cpu.h | 1 - target-arm/kvm-consts.h | 1 - target-cris/cpu.h | 1 - target-i386/cpu-qom.h | 1 - target-i386/cpu.h | 1 - target-i386/mpx_helper.c | 1 + target-lm32/cpu.h | 1 - target-m68k/cpu.h | 1 - target-microblaze/cpu.h | 1 - target-mips/cpu.h | 1 - target-moxie/cpu.h | 1 - target-openrisc/cpu.h | 1 - target-ppc/cpu.h | 1 - target-s390x/cpu.h | 1 - target-sh4/cpu.h | 1 - target-sparc/cpu.h | 1 - target-tilegx/cpu.h | 1 - target-tricore/cpu.h | 1 - target-unicore32/cpu.h | 1 - target-xtensa/cpu.h | 1 - tcg/tci/tcg-target.h | 1 - tests/libqos/ahci.h | 3 --- tests/libqos/fw_cfg.h | 2 -- tests/libqos/i2c.h | 1 - tests/libqos/malloc.h | 2 -- tests/libqos/pci.h | 1 - tests/libqtest.h | 6 ------ trace/control-internal.h | 1 - trace/ftrace.h | 1 - trace/simple.h | 3 --- ui/vnc-palette.h | 2 -- ui/vnc.h | 1 - 56 files changed, 2 insertions(+), 100 deletions(-)