From: Eduardo Habkost <ehabkost@redhat.com> To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jan.kiszka@siemens.com, mjt@tls.msk.ru, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, kraxel@redhat.com, xen-devel@lists.xensource.com, i.mitsyanko@samsung.com, armbru@redhat.com, avi@redhat.com, anthony.perard@citrix.com, lersek@redhat.com, stefanha@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, sw@weilnetz.de, imammedo@redhat.com, lcapitulino@redhat.com, rth@twiddle.net, kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [RFC 1/8] move qemu_irq typedef out of cpu-common.h Date: Tue, 21 Aug 2012 12:42:55 -0300 [thread overview] Message-ID: <1345563782-11224-2-git-send-email-ehabkost@redhat.com> (raw) In-Reply-To: <1345563782-11224-1-git-send-email-ehabkost@redhat.com> From: Igor Mammedov <imammedo@redhat.com> it's necessary for making CPU child of DEVICE without causing circular header deps. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- 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 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 <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 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 <inttypes.h> +#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; 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 */ -- 1.7.11.4
WARNING: multiple messages have this Message-ID (diff)
From: Eduardo Habkost <ehabkost@redhat.com> To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jan.kiszka@siemens.com, mjt@tls.msk.ru, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, kraxel@redhat.com, xen-devel@lists.xensource.com, i.mitsyanko@samsung.com, armbru@redhat.com, avi@redhat.com, anthony.perard@citrix.com, lersek@redhat.com, stefanha@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, sw@weilnetz.de, imammedo@redhat.com, lcapitulino@redhat.com, rth@twiddle.net, kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, pbonzini@redhat.com, afaerber@suse.de Subject: [RFC 1/8] move qemu_irq typedef out of cpu-common.h Date: Tue, 21 Aug 2012 12:42:55 -0300 [thread overview] Message-ID: <1345563782-11224-2-git-send-email-ehabkost@redhat.com> (raw) In-Reply-To: <1345563782-11224-1-git-send-email-ehabkost@redhat.com> From: Igor Mammedov <imammedo@redhat.com> it's necessary for making CPU child of DEVICE without causing circular header deps. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- 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 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 <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 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 <inttypes.h> +#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; 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 */ -- 1.7.11.4
next prev parent reply other threads:[~2012-08-21 15:42 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-21 15:42 [Qemu-devel] [RFC 0/8] include qdev core in *-user, make CPU child of DeviceState Eduardo Habkost 2012-08-21 15:42 ` Eduardo Habkost 2012-08-21 15:42 ` Eduardo Habkost [this message] 2012-08-21 15:42 ` [RFC 1/8] move qemu_irq typedef out of cpu-common.h Eduardo Habkost 2012-08-21 16:10 ` [Qemu-devel] " Peter Maydell 2012-08-21 16:10 ` Peter Maydell 2012-08-27 14:28 ` [Qemu-devel] " Igor Mammedov 2012-08-27 14:28 ` Igor Mammedov 2012-08-29 15:36 ` [Qemu-devel] [Xen-devel] " Igor Mammedov 2012-08-29 15:36 ` Igor Mammedov 2012-08-29 15:38 ` [Qemu-devel] " Peter Maydell 2012-08-29 15:38 ` Peter Maydell 2012-08-21 15:42 ` [Qemu-devel] [RFC 2/8] qdev: split up header so it can be used in cpu.h Eduardo Habkost 2012-08-21 15:42 ` Eduardo Habkost 2012-08-21 15:42 ` [Qemu-devel] [RFC 3/8] qapi-types.h doesn't really need to include qemu-common.h Eduardo Habkost 2012-08-21 15:42 ` Eduardo Habkost 2012-08-21 18:21 ` [Qemu-devel] " Luiz Capitulino 2012-08-21 18:21 ` Luiz Capitulino 2012-08-21 15:42 ` [Qemu-devel] [RFC 4/8] cleanup error.h, included qapi-types.h aready has stdbool.h Eduardo Habkost 2012-08-21 15:42 ` Eduardo Habkost 2012-08-21 16:45 ` [Qemu-devel] " Peter Maydell 2012-08-21 16:45 ` Peter Maydell 2012-08-21 16:53 ` [Qemu-devel] " Eduardo Habkost 2012-08-21 16:53 ` Eduardo Habkost 2012-08-21 15:42 ` [Qemu-devel] [RFC 5/8] split qdev into a core and code used only by qemu-system-* Eduardo Habkost 2012-08-21 15:42 ` Eduardo Habkost 2012-08-21 18:44 ` [Qemu-devel] " Blue Swirl 2012-08-21 18:44 ` Blue Swirl 2012-08-21 15:43 ` [Qemu-devel] [RFC 6/8] qdev: use full qdev.h include path on qdev*.c Eduardo Habkost 2012-08-21 15:43 ` Eduardo Habkost 2012-08-21 16:29 ` [Qemu-devel] " Peter Maydell 2012-08-21 16:29 ` Peter Maydell 2012-08-21 18:25 ` [Qemu-devel] " Eduardo Habkost 2012-08-21 18:25 ` Eduardo Habkost 2012-08-21 15:43 ` [Qemu-devel] [RFC 7/8] include core qdev code into *-user, too Eduardo Habkost 2012-08-21 15:43 ` Eduardo Habkost 2012-08-21 16:59 ` [Qemu-devel] " Peter Maydell 2012-08-21 16:59 ` Peter Maydell 2012-08-21 18:55 ` [Qemu-devel] " Eduardo Habkost 2012-08-21 18:55 ` Eduardo Habkost 2012-08-21 15:43 ` [Qemu-devel] [RFC 8/8] make CPU a child of DeviceState Eduardo Habkost 2012-08-21 15:43 ` Eduardo Habkost 2012-08-22 9:05 ` [Qemu-devel] [RFC 0/8] include qdev core in *-user, make CPU " Avi Kivity 2012-08-22 9:05 ` Avi Kivity 2012-08-22 13:08 ` [Qemu-devel] " Eduardo Habkost 2012-08-22 13:08 ` Eduardo Habkost
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1345563782-11224-2-git-send-email-ehabkost@redhat.com \ --to=ehabkost@redhat.com \ --cc=afaerber@suse.de \ --cc=aliguori@us.ibm.com \ --cc=anthony.perard@citrix.com \ --cc=armbru@redhat.com \ --cc=avi@redhat.com \ --cc=blauwirbel@gmail.com \ --cc=i.mitsyanko@samsung.com \ --cc=imammedo@redhat.com \ --cc=jan.kiszka@siemens.com \ --cc=kraxel@redhat.com \ --cc=kwolf@redhat.com \ --cc=lcapitulino@redhat.com \ --cc=lersek@redhat.com \ --cc=mdroth@linux.vnet.ibm.com \ --cc=mjt@tls.msk.ru \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=stefanha@linux.vnet.ibm.com \ --cc=stefano.stabellini@eu.citrix.com \ --cc=sw@weilnetz.de \ --cc=xen-devel@lists.xensource.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.