Re: [Qemu-devel] [PATCH 09/12] move qemu_irq typedef out of cpu-common.h

[Anthony Liguori]

Eduardo Habkost <address@hidden> writes:

> 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>

Reviewed-by: Anthony Liguori <address@hidden>

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 <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/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 <inttypes.h>
>  
> +#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