Skip to content

Commit

Permalink
remove some double-includes
Browse files Browse the repository at this point in the history
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 <mjt@tls.msk.ru>
  • Loading branch information
Michael Tokarev committed May 18, 2013
1 parent 7bc9315 commit 997aba8
Show file tree
Hide file tree
Showing 16 changed files with 0 additions and 19 deletions.
1 change: 0 additions & 1 deletion audio/audio_win_int.c
@@ -1,7 +1,6 @@
/* public domain */

#include "qemu-common.h"
#include "audio.h"

#define AUDIO_CAP "win-int"
#include <windows.h>
Expand Down
1 change: 0 additions & 1 deletion hw/arm/highbank.c
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion hw/audio/marvell_88w8618.c
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion hw/mips/mips_malta.c
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/misc/lm32_sys.c
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions hw/ppc/spapr.c
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion 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"
Expand Down
1 change: 0 additions & 1 deletion hw/timer/exynos4210_rtc.c
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion include/hw/i386/pc.h
Expand Up @@ -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). */
Expand Down
1 change: 0 additions & 1 deletion include/qapi/qmp/qlist.h
Expand Up @@ -15,7 +15,6 @@

#include "qapi/qmp/qobject.h"
#include "qemu/queue.h"
#include "qemu/queue.h"

typedef struct QListEntry {
QObject *value;
Expand Down
1 change: 0 additions & 1 deletion include/qemu/config-file.h
Expand Up @@ -4,7 +4,6 @@
#include <stdio.h>
#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);
Expand Down
1 change: 0 additions & 1 deletion monitor.c
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion page_cache.c
Expand Up @@ -21,7 +21,6 @@
#include <sys/types.h>
#include <stdbool.h>
#include <glib.h>
#include <strings.h>

#include "qemu-common.h"
#include "migration/page_cache.h"
Expand Down
2 changes: 0 additions & 2 deletions slirp/misc.c
Expand Up @@ -242,8 +242,6 @@ strdup(str)
}
#endif

#include "monitor/monitor.h"

void lprint(const char *format, ...)
{
va_list args;
Expand Down
2 changes: 0 additions & 2 deletions target-ppc/kvm.c
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/tcg/linux-test.c
Expand Up @@ -39,7 +39,6 @@
#include <dirent.h>
#include <setjmp.h>
#include <sys/shm.h>
#include <sched.h>

#define TESTPATH "/tmp/linux-test.tmp"
#define TESTPORT 7654
Expand Down

0 comments on commit 997aba8

Please sign in to comment.