From 997aba8e257d183e978e9b08a26aceb4e905378d Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 May 2013 14:55:17 +0400 Subject: remove some double-includes Some source files #include the same header more than once for no good reason. Remove second #includes in such cases. Signed-off-by: Michael Tokarev --- audio/audio_win_int.c | 1 - hw/arm/highbank.c | 1 - hw/audio/marvell_88w8618.c | 1 - hw/mips/mips_malta.c | 1 - hw/misc/lm32_sys.c | 1 - hw/ppc/spapr.c | 2 -- hw/ppc/spapr_hcall.c | 1 - hw/timer/exynos4210_rtc.c | 1 - include/hw/i386/pc.h | 1 - include/qapi/qmp/qlist.h | 1 - include/qemu/config-file.h | 1 - monitor.c | 1 - page_cache.c | 1 - slirp/misc.c | 2 -- target-ppc/kvm.c | 2 -- tests/tcg/linux-test.c | 1 - 16 files changed, 19 deletions(-) diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c index 58690524c4..e1324056a4 100644 --- a/audio/audio_win_int.c +++ b/audio/audio_win_int.c @@ -1,7 +1,6 @@ /* public domain */ #include "qemu-common.h" -#include "audio.h" #define AUDIO_CAP "win-int" #include diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 0fd9465cfa..4405dbd3bd 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -24,7 +24,6 @@ #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/sysbus.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index de06dfd7d2..c5d88a7841 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -12,7 +12,6 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" -#include "hw/sysbus.h" #include "audio/audio.h" #define MP_AUDIO_SIZE 0x00001000 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 9d521ccb19..5033d51224 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -37,7 +37,6 @@ #include "sysemu/char.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" -#include "hw/boards.h" #include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h" diff --git a/hw/misc/lm32_sys.c b/hw/misc/lm32_sys.c index 33a3b80ce7..aeaf2b7b7b 100644 --- a/hw/misc/lm32_sys.c +++ b/hw/misc/lm32_sys.c @@ -34,7 +34,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" -#include "qemu/log.h" enum { R_CTRL = 0, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c96ac8131f..218ea23da8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -43,8 +43,6 @@ #include "hw/ppc/xics.h" #include "hw/pci/msi.h" -#include "sysemu/kvm.h" -#include "kvm_ppc.h" #include "hw/pci/pci.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index f518aee216..8f0b7e8076 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1,6 +1,5 @@ #include "sysemu/sysemu.h" #include "cpu.h" -#include "sysemu/sysemu.h" #include "helper_regs.h" #include "hw/ppc/spapr.h" #include "mmu-hash64.h" diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index bceee44cb2..3ac77f9262 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -31,7 +31,6 @@ #include "hw/ptimer.h" #include "hw/hw.h" -#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/arm/exynos4210.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 2bd7090248..740cf49763 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -7,7 +7,6 @@ #include "hw/isa/isa.h" #include "hw/block/fdc.h" #include "net/net.h" -#include "exec/memory.h" #include "hw/i386/ioapic.h" /* PC-style peripherals (also used by other machines). */ diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index 382f04c3c4..6cc4831df3 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -15,7 +15,6 @@ #include "qapi/qmp/qobject.h" #include "qemu/queue.h" -#include "qemu/queue.h" typedef struct QListEntry { QObject *value; diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index ccfccae2b4..ad4a9e5c3a 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -4,7 +4,6 @@ #include #include "qemu/option.h" #include "qapi/error.h" -#include "qemu/option.h" QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); diff --git a/monitor.c b/monitor.c index 62aaebe660..6ce2a4e61b 100644 --- a/monitor.c +++ b/monitor.c @@ -63,7 +63,6 @@ #ifdef CONFIG_TRACE_SIMPLE #include "trace/simple.h" #endif -#include "ui/qemu-spice.h" #include "exec/memory.h" #include "qmp-commands.h" #include "hmp.h" diff --git a/page_cache.c b/page_cache.c index 938a79c9ea..a05db643cc 100644 --- a/page_cache.c +++ b/page_cache.c @@ -21,7 +21,6 @@ #include #include #include -#include #include "qemu-common.h" #include "migration/page_cache.h" diff --git a/slirp/misc.c b/slirp/misc.c index 8ecced547f..0bcc481939 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -242,8 +242,6 @@ strdup(str) } #endif -#include "monitor/monitor.h" - void lprint(const char *format, ...) { va_list args; diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 725071e6a7..3ab2946cfb 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -30,8 +30,6 @@ #include "cpu.h" #include "sysemu/cpus.h" #include "sysemu/device_tree.h" -#include "hw/sysbus.h" -#include "hw/ppc/spapr.h" #include "mmu-hash64.h" #include "hw/sysbus.h" diff --git a/tests/tcg/linux-test.c b/tests/tcg/linux-test.c index 83cb32ddb9..1c6c01318e 100644 --- a/tests/tcg/linux-test.c +++ b/tests/tcg/linux-test.c @@ -39,7 +39,6 @@ #include #include #include -#include #define TESTPATH "/tmp/linux-test.tmp" #define TESTPORT 7654 -- cgit v1.2.1