[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/11] Move qemu_irq typedef out of qemu-common.h
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 02/11] Move qemu_irq typedef out of qemu-common.h |
Date: |
Thu, 15 Nov 2012 04:06:38 +0100 |
From: Igor Mammedov <address@hidden>
It's necessary for making CPU child of DEVICE without
causing circular header deps.
Signed-off-by: Igor Mammedov <address@hidden>
[ehabkost: re-added the typedef to hw/irq.h after rebasing]
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm-misc.h | 1 +
hw/bt.h | 2 ++
hw/devices.h | 2 ++
hw/irq.h | 2 ++
hw/omap.h | 1 +
hw/soc_dma.h | 1 +
hw/xen.h | 1 +
qemu-common.h | 1 -
8 Dateien geändert, 10 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index adb1665..d129678 100644
--- 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 a48b8d4..ebf6a37 100644
--- 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 1a55c1e..c60bcab 100644
--- 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 e640c10..610e6b7 100644
--- 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 8bd7c73..2b383ff 100644
--- 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 9340b8f..5948489 100644
--- 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 d14e92d..e3cca7f 100644
--- 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 093d119..9112e2d 100644
--- 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;
--
1.7.10.4
- [Qemu-devel] [PULL for-1.3] QOM CPUState patch queue 2012-11-15, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 01/11] qemu-common.h: Comment about usage rules, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 03/11] qdev: Split up header so it can be used in cpu.h, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 02/11] Move qemu_irq typedef out of qemu-common.h,
Andreas Färber <=
- [Qemu-devel] [PATCH 05/11] vnc-palette.h: Include <stdbool.h>, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 04/11] qemu-fsdev-dummy.c: Include module.h, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 06/11] qemu-config.h: Include headers it needs, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 07/11] osdep: Move qemu_{open, close}() prototypes, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 08/11] qapi-types.h: Don't include qemu-common.h, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 09/11] target-i386/cpu: Name new CPUID bits, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 11/11] target-i386: Add Haswell CPU model, Andreas Färber, 2012/11/14
- [Qemu-devel] [PATCH 10/11] target-i386/cpu: Add new Opteron CPU model, Andreas Färber, 2012/11/14