From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOY32-0006pW-5R for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:08:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOY2x-00028i-RJ for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:08:52 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:43621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOY2x-00028a-MV for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:08:47 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so7446005oag.4 for ; Wed, 17 Oct 2012 11:08:47 -0700 (PDT) From: Anthony Liguori In-Reply-To: <1350414523-8117-10-git-send-email-ehabkost@redhat.com> References: <1350414523-8117-1-git-send-email-ehabkost@redhat.com> <1350414523-8117-10-git-send-email-ehabkost@redhat.com> Date: Wed, 17 Oct 2012 13:08:43 -0500 Message-ID: <871ugxug2c.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 09/12] move qemu_irq typedef out of cpu-common.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Igor Mammedov , riku.voipio@iki.fi, Andreas =?utf-8?Q?F=C3=A4rber?= , peter.maydell@linaro.org Eduardo Habkost writes: > From: Igor Mammedov > > it's necessary for making CPU child of DEVICE without > causing circular header deps. > > Signed-off-by: Igor Mammedov Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > Changes v2 -> v3: > imammedo: sysemu.h doesn't need irq.h since 013c2f150 > --- > hw/arm-misc.h | 1 + > hw/bt.h | 2 ++ > hw/devices.h | 2 ++ > hw/omap.h | 1 + > hw/soc_dma.h | 1 + > hw/xen.h | 1 + > qemu-common.h | 1 - > 7 files changed, 8 insertions(+), 1 deletion(-) > > 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/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 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 b54612b..95585b8 100644 > --- a/qemu-common.h > +++ b/qemu-common.h > @@ -286,7 +286,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