[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/24] move qemu_irq typedef out of cpu-common.h
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 04/24] move qemu_irq typedef out of cpu-common.h |
Date: |
Wed, 24 Oct 2012 01:01:48 -0200 |
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>
---
Changes v1 (from Igor) -> v2 (sent by Eduardo):
- Chunk adding typedef on hw/irq.h was not present, because of patch
rebase against qdev header split patch
Changes v2 -> v3 (from Igor):
- sysemu.h doesn't need irq.h since 013c2f150
Changes v3 -> v4 (from Eduardo):
- re-added the typedef code to hw/irq.h, after rebasing the patch
---
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 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index d02f7f0..4b7f723 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 630bfa0..3deeac7 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -295,7 +295,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.11.7
- [Qemu-devel] [PATCH 03/24] qemu-common.h: comment about usage rules, (continued)
- [Qemu-devel] [PATCH 03/24] qemu-common.h: comment about usage rules, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 09/24] ui/vnc-pallete.c: include headers it needs, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 01/24] user: move *-user/qemu-types.h to main directory, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 15/24] qlist.h: do not include qemu-common.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 16/24] qapi-types.h: don't include qemu-common.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 10/24] qemu-config.h: include headers it needs, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 06/24] move I/O-related definitions from qemu-common.h to a new header (qemu-stdio.h), Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 14/24] sysemu.h: include qemu-types.h instead of qemu-common.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 08/24] vnc-palette.h: include <stdbool.h>, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 11/24] qapi/qmp-registry.c: include headers it needs, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 04/24] move qemu_irq typedef out of cpu-common.h,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 07/24] qemu-fsdev-dummy.c: include module.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 20/24] qdev: add stub vmstate handling to qdev.c, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 24/24] qom: make CPU a child of DeviceState, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 23/24] include qdev code into *-user, too, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 21/24] qdev: add sysbus_get_default() GCC_WEAK stub, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 13/24] create qemu-types.h for struct typedefs, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 02/24] user: rename qemu-types.h to qemu-user-types.h, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 18/24] qdev: qdev_create(): use error_report() instead of hw_error(), Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 19/24] qdev: move reset handler list from vl.c to qdev.c, Eduardo Habkost, 2012/10/23
- [Qemu-devel] [PATCH 05/24] qdev: split up header so it can be used in cpu.h, Eduardo Habkost, 2012/10/23