hw: clean up hw/hw.h includes

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 <[email protected]>

diff --git a/exec.c b/exec.c
index e276ec39e12a76ee8200fa3b490f8ee8485bc21c..2e363f06a6bf041b94bee0a392a3f85f39a78d23 100644 (file)
--- 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 ef287727b6c059a7376e46797353ea318aff216b..b34aa49dfb8bbe797a82c46e74a4dd1a1375b537 100644 (file)
--- 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 6a9639cc4d8948779146f044e01bb5f160ce194d..a298b89ce15a3cfd2bd3a36d5caea7c6478337ab 100644 (file)
--- 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 029b1e8065ddc3df510d0181ac9929799881a1ec..3669ebd916b9b5a4770ed1906b0fbae92668e371 100644 (file)
--- 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 ffb2ea7cdf8b5960f33040e66a2bfa66b06d5597..c87fbad47ad0562549235e63133c9c415735322f 100644 (file)
--- 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