From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3Jnc-0003wr-4O for qemu-devel@nongnu.org; Mon, 20 Aug 2012 00:41:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3JnZ-0002L5-1u for qemu-devel@nongnu.org; Mon, 20 Aug 2012 00:41:12 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:36328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3JnY-0002Kh-Oc for qemu-devel@nongnu.org; Mon, 20 Aug 2012 00:41:08 -0400 Message-ID: <5031BFE0.1070909@weilnetz.de> Date: Mon, 20 Aug 2012 06:41:04 +0200 From: Stefan Weil MIME-Version: 1.0 References: <1345419579-25499-1-git-send-email-imammedo@redhat.com> <1345419579-25499-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1345419579-25499-2-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/5] move qemu_irq typedef out of cpu-common.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: peter.maydell@linaro.org, jan.kiszka@siemens.com, mjt@tls.msk.ru, qemu-devel@nongnu.org, armbru@redhat.com, blauwirbel@gmail.com, kraxel@redhat.com, xen-devel@lists.xensource.com, i.mitsyanko@samsung.com, mdroth@linux.vnet.ibm.com, avi@redhat.com, anthony.perard@citrix.com, lersek@redhat.com, stefanha@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, rth@twiddle.net, kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, pbonzini@redhat.com, afaerber@suse.de Am 20.08.2012 01:39, schrieb Igor Mammedov: > it's necessary for making CPU child of DEVICE without > causing circular header deps. > > Signed-off-by: Igor Mammedov > --- > 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 - > sysemu.h | 1 + > 9 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/hw/arm-misc.h b/hw/arm-misc.h > index bdd8fec..b13aa59 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 56c55f0..1339a3a 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 413851b..8b08462 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 904b26c..e386ace 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 e5926b7..ff11dfd 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 e5c2bcd..6677a30 100644 > --- a/qemu-common.h > +++ b/qemu-common.h > @@ -273,7 +273,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; Just move the declaration of qemu_irq to the beginning of qemu-common.h and leave the rest of files untouched. That also fixes the circular dependency. I already have a patch that does this, so you can integrate it in your series instead of this one. > diff --git a/sysemu.h b/sysemu.h > index 65552ac..f765821 100644 > --- a/sysemu.h > +++ b/sysemu.h > @@ -9,6 +9,7 @@ > #include "qapi-types.h" > #include "notify.h" > #include "main-loop.h" > +#include "hw/irq.h" > > /* vl.c */ > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Weil Subject: Re: [PATCH 1/5] move qemu_irq typedef out of cpu-common.h Date: Mon, 20 Aug 2012 06:41:04 +0200 Message-ID: <5031BFE0.1070909@weilnetz.de> References: <1345419579-25499-1-git-send-email-imammedo@redhat.com> <1345419579-25499-2-git-send-email-imammedo@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1345419579-25499-2-git-send-email-imammedo@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org To: Igor Mammedov Cc: peter.maydell@linaro.org, jan.kiszka@siemens.com, mjt@tls.msk.ru, qemu-devel@nongnu.org, armbru@redhat.com, blauwirbel@gmail.com, kraxel@redhat.com, xen-devel@lists.xensource.com, i.mitsyanko@samsung.com, mdroth@linux.vnet.ibm.com, avi@redhat.com, anthony.perard@citrix.com, lersek@redhat.com, stefanha@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, rth@twiddle.net, kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, pbonzini@redhat.com, afaerber@suse.de List-Id: xen-devel@lists.xenproject.org Am 20.08.2012 01:39, schrieb Igor Mammedov: > it's necessary for making CPU child of DEVICE without > causing circular header deps. > > Signed-off-by: Igor Mammedov > --- > 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 - > sysemu.h | 1 + > 9 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/hw/arm-misc.h b/hw/arm-misc.h > index bdd8fec..b13aa59 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 56c55f0..1339a3a 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 413851b..8b08462 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 904b26c..e386ace 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 e5926b7..ff11dfd 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 e5c2bcd..6677a30 100644 > --- a/qemu-common.h > +++ b/qemu-common.h > @@ -273,7 +273,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; Just move the declaration of qemu_irq to the beginning of qemu-common.h and leave the rest of files untouched. That also fixes the circular dependency. I already have a patch that does this, so you can integrate it in your series instead of this one. > diff --git a/sysemu.h b/sysemu.h > index 65552ac..f765821 100644 > --- a/sysemu.h > +++ b/sysemu.h > @@ -9,6 +9,7 @@ > #include "qapi-types.h" > #include "notify.h" > #include "main-loop.h" > +#include "hw/irq.h" > > /* vl.c */ >