From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWq04-00075c-G1 for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:56:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWpzs-0005VE-H4 for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:56:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWpzs-0005Ul-86 for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:55:52 -0500 From: Eduardo Habkost Date: Fri, 9 Nov 2012 12:56:32 -0200 Message-Id: <1352473012-20500-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> References: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 04/24] move qemu_irq typedef out of cpu-common.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Igor Mammedov it's necessary for making CPU child of DEVICE without causing circular header deps. Signed-off-by: Igor Mammedov [ehabkost: re-added the typedef to hw/irq.h after rebasing] Signed-off-by: Eduardo Habkost --- 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 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 . */ +#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 +#include "hw/irq.h" #include "qemu-common.h" /* xen-machine.c */ diff --git a/qemu-common.h b/qemu-common.h index ea43bfa..6441bee 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.11.7