Commit 30456d5b authored by Peter Maydell's avatar Peter Maydell

all: Clean up includes

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: 's avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: 's avatarEric Blake <eblake@redhat.com>
parent b1e34d1c
......@@ -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);
......
......@@ -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"
......
......@@ -19,7 +19,6 @@
* purposes.
*/
#include <limits.h>
#include <sys/select.h>
#include "qemu/queue.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"
......
......@@ -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>
......
......@@ -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,
......
#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>
......
......@@ -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;
......
......@@ -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
......
......@@ -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 */
......
#ifndef QEMU_HW_USB_DESC_H
#define QEMU_HW_USB_DESC_H
#include <inttypes.h>
#include <wchar.h>
/* binary representation */
......
......@@ -18,6 +18,7 @@
*
*/
#include "qemu/osdep.h"
#include "io/channel-util.h"
#include "io/channel-file.h"
#include "io/channel-socket.h"
......
......@@ -21,9 +21,6 @@
#ifndef __FPA11_H__
#define __FPA11_H__
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <cpu.h>
......
#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"
......
......@@ -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>
......
......@@ -16,7 +16,6 @@
#ifndef QEMU_TAP_LINUX_H
#define QEMU_TAP_LINUX_H
#include <stdint.h>
#ifdef __linux__
#include <linux/ioctl.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);
......
......@@ -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>
......
......@@ -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);
......
......@@ -14,7 +14,6 @@
#define VSS_WIN32_REQUESTER_H
#include <basetyps.h> /* STDAPI */
#include "qemu/compiler.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -14,7 +14,6 @@
#define VSS_WIN32_H
#define __MIDL_user_allocate_free_DEFINED__
#include "config-host.h"
#include <windows.h>
#include <shlwapi.h>
......
......@@ -12,7 +12,6 @@
*
*/
#include <stdio.h>
enum ReplayEvents {
/* for instruction event */
......
#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. */
......
......@@ -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
......
......@@ -19,7 +19,6 @@
#ifndef CPU_ARM_H
#define CPU_ARM_H
#include "config.h"
#include "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>
......
......@@ -20,7 +20,6 @@
#ifndef CPU_CRIS_H
#define CPU_CRIS_H
#include "config.h"
#include "qemu-common.h"
#define TARGET_LONG_BITS 32
......
......@@ -22,7 +22,6 @@
#include "qom/cpu.h"
#include "cpu.h"
#include "qapi/error.h"
#include "qemu/notify.h"
#ifdef TARGET_X86_64
......
......@@ -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"
......
......@@ -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"
......
......@@ -24,7 +24,6 @@
#define CPUArchState struct CPULM32State
#include "config.h"
#include "qemu-common.h"
#include "exec/cpu-defs.h"
struct CPULM32State;
......
......@@ -24,7 +24,6 @@
#define CPUArchState struct CPUM68KState
#include "config.h"
#include "qemu-common.h"
#include "exec/cpu-defs.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
......
......@@ -7,7 +7,6 @@
#define CPUArchState struct CPUMIPSState
#include "config.h"
#include "qemu-common.h"
#include "mips-defs.h"
#include "exec/cpu-defs.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
......
......@@ -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"
......
......@@ -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
......
......@@ -22,7 +22,6 @@
#ifndef CPU_S390X_H
#define CPU_S390X_H
#include "config.h"
#include "qemu-common.h"
#define TARGET_LONG_BITS 64
......
......@@ -19,7 +19,6 @@
#ifndef _CPU_SH4_H
#define _CPU_SH4_H
#include "config.h"
#include "qemu-common.h"
#define TARGET_LONG_BITS 32
......
#ifndef CPU_SPARC_H
#define CPU_SPARC_H
#include "config.h"
#include "qemu-common.h"
#include "qemu/bswap.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
......
......@@ -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"
......
......@@ -19,7 +19,6 @@
#define CPUArchState struct CPUUniCore32State
#include "config.h"
#include "qemu-common.h"
#include "exec/cpu-defs.h"
#include "fpu/softfloat.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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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;
......
......@@ -9,7 +9,6 @@
#ifndef LIBQOS_I2C_H
#define LIBQOS_I2C_H
#include <stdint.h>
typedef struct I2CAdapter I2CAdapter;
struct I2CAdapter {
......
......@@ -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 {
......
......@@ -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))
......
......@@ -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;
......
......@@ -10,7 +10,6 @@
#ifndef TRACE__CONTROL_INTERNAL_H
#define TRACE__CONTROL_INTERNAL_H
#include <string.h>
extern TraceEvent trace_events[];
......
#ifndef TRACE_FTRACE_H
#define TRACE_FTRACE_H
#include <stdbool.h>
#define MAX_TRACE_STRLEN 512
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment