[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 50/50] hw: clean up hw/hw.h includes
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 50/50] hw: clean up hw/hw.h includes |
Date: |
Fri, 8 Apr 2016 22:29:10 +0200 |
Include qom/object.h and exec/memory.h instead of exec/ioport.h;
exec/ioport.h was almost everywhere required only for those two
includes, not for the content of the header itself.
Remove block/aio.h, everybody is already including it through
another path.
With this change, include/hw/hw.h is freed from qemu-common.h.
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 1 +
hw/gpio/gpio_key.c | 1 +
include/exec/ioport.h | 4 ----
include/hw/hw.h | 4 ++--
include/hw/isa/isa.h | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/exec.c b/exec.c
index 29877b0..64956a4 100644
--- a/exec.c
+++ b/exec.c
@@ -41,6 +41,7 @@
#else /* !CONFIG_USER_ONLY */
#include "hw/hw.h"
#include "exec/memory.h"
+#include "exec/ioport.h"
#include "sysemu/dma.h"
#include "exec/address-spaces.h"
#include "sysemu/xen-mapcache.h"
diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c
index ef28772..b34aa49 100644
--- a/hw/gpio/gpio_key.c
+++ b/hw/gpio/gpio_key.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
+#include "qemu/timer.h"
#define TYPE_GPIOKEY "gpio-key"
#define GPIOKEY(obj) OBJECT_CHECK(GPIOKEYState, (obj), TYPE_GPIOKEY)
diff --git a/include/exec/ioport.h b/include/exec/ioport.h
index 6a9639c..a298b89 100644
--- a/include/exec/ioport.h
+++ b/include/exec/ioport.h
@@ -24,10 +24,6 @@
#ifndef IOPORT_H
#define IOPORT_H
-#include "qemu-common.h"
-#include "qom/object.h"
-#include "exec/memory.h"
-
#define MAX_IOPORTS (64 * 1024)
#define IOPORTS_MASK (MAX_IOPORTS - 1)
diff --git a/include/hw/hw.h b/include/hw/hw.h
index 029b1e8..3669ebd 100644
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -7,9 +7,9 @@
#endif
#include "exec/cpu-common.h"
-#include "exec/ioport.h"
+#include "qom/object.h"
+#include "exec/memory.h"
#include "hw/irq.h"
-#include "block/aio.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index ffb2ea7..c87fbad 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -3,8 +3,8 @@
/* ISA bus */
-#include "exec/ioport.h"
#include "exec/memory.h"
+#include "exec/ioport.h"
#include "hw/qdev.h"
#define ISA_NUM_IRQS 16
--
1.8.3.1
- Re: [Qemu-devel] [PATCH 39/50] gdbstub: remove includes from gdbstub-xml.c, (continued)
- [Qemu-devel] [PATCH 43/50] qemu-common: push cpu.h inclusion out of qemu-common.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 40/50] dma: do not depend on kvm_enabled(), Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 44/50] arm: move arm_log_exception into .c file, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 45/50] mips: move CP0 functions out of cpu.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 49/50] hw: remove pio_addr_t, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 46/50] hw: explicitly include qemu/log.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 47/50] exec: extract exec/tb-context.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 50/50] hw: clean up hw/hw.h includes,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 48/50] cpu: move exec-all.h inclusion out of cpu.h, Paolo Bonzini, 2016/04/08
- Re: [Qemu-devel] [PATCH for-2.7 00/49] NEED_CPU_H / cpu.h / hw/hw.h cleanups, Markus Armbruster, 2016/04/18
- Re: [Qemu-devel] [PATCH for-2.7 00/49] NEED_CPU_H / cpu.h / hw/hw.h cleanups, Markus Armbruster, 2016/04/18