Browse Source

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 <mjt@tls.msk.ru>
pull/4/head
Michael Tokarev 13 years ago
parent
commit
997aba8e25
  1. 1
      audio/audio_win_int.c
  2. 1
      hw/arm/highbank.c
  3. 1
      hw/audio/marvell_88w8618.c
  4. 1
      hw/mips/mips_malta.c
  5. 1
      hw/misc/lm32_sys.c
  6. 2
      hw/ppc/spapr.c
  7. 1
      hw/ppc/spapr_hcall.c
  8. 1
      hw/timer/exynos4210_rtc.c
  9. 1
      include/hw/i386/pc.h
  10. 1
      include/qapi/qmp/qlist.h
  11. 1
      include/qemu/config-file.h
  12. 1
      monitor.c
  13. 1
      page_cache.c
  14. 2
      slirp/misc.c
  15. 2
      target-ppc/kvm.c
  16. 1
      tests/tcg/linux-test.c

1
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>

1
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"

1
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

1
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"

1
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,

2
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"

1
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"

1
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"

1
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). */

1
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;

1
include/qemu/config-file.h

@ -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);

1
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"

1
page_cache.c

@ -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"

2
slirp/misc.c

@ -242,8 +242,6 @@ strdup(str)
}
#endif
#include "monitor/monitor.h"
void lprint(const char *format, ...)
{
va_list args;

2
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"

1
tests/tcg/linux-test.c

@ -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

Loading…
Cancel
Save