Move qemu_irq typedef out of qemu-common.h

It's necessary for making CPU child of DEVICE without
causing circular header deps.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
[ehabkost: re-added the typedef to hw/irq.h after rebasing]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index adb166586bab665ed2e90b2129b9df5a983d9bd5..d129678b26183ada2f68040f80160b24c742ef2a 100644 (file)
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -12,6 +12,7 @@
 #define ARM_MISC_H 1
 
 #include "memory.h"
+#include "hw/irq.h"
 
 /* The CPU is also modeled as an interrupt controller.  */
 #define ARM_PIC_CPU_IRQ 0

diff --git a/hw/bt.h b/hw/bt.h
index a48b8d4b133783cccdac9f5eb85edd11e59413e7..ebf6a370a1eebbc7074b889862ad7e20e4bc965f 100644 (file)
--- a/hw/bt.h
+++ b/hw/bt.h
@@ -23,6 +23,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "hw/irq.h"
+
 /* BD Address */
 typedef struct {
     uint8_t b[6];

diff --git a/hw/devices.h b/hw/devices.h
index 1a55c1e9053208cf6f0d6905aee7e4cb72a7e97c..c60bcabae33bde2915bba6910b43010d5eee1a78 100644 (file)
--- a/hw/devices.h
+++ b/hw/devices.h
@@ -1,6 +1,8 @@
 #ifndef QEMU_DEVICES_H
 #define QEMU_DEVICES_H
 
+#include "hw/irq.h"
+
 /* ??? Not all users of this file can include cpu-common.h.  */
 struct MemoryRegion;
 

diff --git a/hw/irq.h b/hw/irq.h
index e640c105e72eb01f1b0a86c04ef2a0cb8819ffca..610e6b76236e8c2ee9b56f1c32a7617f2f2c7881 100644 (file)
--- a/hw/irq.h
+++ b/hw/irq.h
@@ -3,6 +3,8 @@
 
 /* Generic IRQ/GPIO pin infrastructure.  */
 
+typedef struct IRQState *qemu_irq;
+
 typedef void (*qemu_irq_handler)(void *opaque, int n, int level);
 
 void qemu_set_irq(qemu_irq irq, int level);

diff --git a/hw/omap.h b/hw/omap.h
index 8bd7c73cf69275acaf6dde94687ce2fe4fdb4fa7..2b383ffc44477e8f6bd9530d4eaa5f2d676ef2c0 100644 (file)
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -19,6 +19,7 @@
 #ifndef hw_omap_h
 #include "memory.h"
 # define hw_omap_h             "omap.h"
+#include "hw/irq.h"
 
 # define OMAP_EMIFS_BASE       0x00000000
 # define OMAP2_Q0_BASE         0x00000000

diff --git a/hw/soc_dma.h b/hw/soc_dma.h
index 9340b8f38edd290db68fece8de7876127b672cde..5948489eaeaf7f35f5a9ea3740aeca8966984dc6 100644 (file)
--- a/hw/soc_dma.h
+++ b/hw/soc_dma.h
@@ -19,6 +19,7 @@
  */
 
 #include "memory.h"
+#include "hw/irq.h"
 
 struct soc_dma_s;
 struct soc_dma_ch_s;

diff --git a/hw/xen.h b/hw/xen.h
index d14e92d5aae999b1cf7de21e60abdc90b4284532..e3cca7fb9220e28566aa1e612d2bf9ff575d86d5 100644 (file)
--- a/hw/xen.h
+++ b/hw/xen.h
@@ -8,6 +8,7 @@
  */
 #include <inttypes.h>
 
+#include "hw/irq.h"
 #include "qemu-common.h"
 
 /* xen-machine.c */

diff --git a/qemu-common.h b/qemu-common.h
index 093d1198eccb78bfab3cd2f8a7da9d64203004c8..9112e2de7a28e3df72ada4d3098e114ee744b929 100644 (file)
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -292,7 +292,6 @@ typedef struct PCIEPort PCIEPort;
 typedef struct PCIESlot PCIESlot;
 typedef struct MSIMessage MSIMessage;
 typedef struct SerialState SerialState;
-typedef struct IRQState *qemu_irq;
 typedef struct PCMCIACardState PCMCIACardState;
 typedef struct MouseTransformInfo MouseTransformInfo;
 typedef struct uWireSlave uWireSlave;