Re: [Qemu-ppc] [Qemu-devel] [PATCH 01/17] pseries: move interrupt controllers to hw/intc/

[Anthony Liguori]

Alexey Kardashevskiy <address@hidden> writes:

> Signed-off-by: Alexey Kardashevskiy <address@hidden>

Reviewed-by: Anthony Liguori <address@hidden>

Regards,

Anthony Liguori

> ---
>  default-configs/ppc64-softmmu.mak |    1 +
>  hw/intc/Makefile.objs             |    1 +
>  hw/{ppc => intc}/xics.c           |    0
>  hw/ppc/Makefile.objs              |    2 +-
>  4 files changed, 3 insertions(+), 1 deletion(-)
>  rename hw/{ppc => intc}/xics.c (100%)
>
> diff --git a/default-configs/ppc64-softmmu.mak 
> b/default-configs/ppc64-softmmu.mak
> index cb279cb..69a9f8d 100644
> --- a/default-configs/ppc64-softmmu.mak
> +++ b/default-configs/ppc64-softmmu.mak
> @@ -47,5 +47,6 @@ CONFIG_E500=y
>  CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
>  # For pSeries
>  CONFIG_PCI_HOTPLUG=y
> +CONFIG_XICS=$(CONFIG_PSERIES)
>  # For PReP
>  CONFIG_MC146818RTC=y
> diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
> index 2ba49d0..abe8f80 100644
> --- a/hw/intc/Makefile.objs
> +++ b/hw/intc/Makefile.objs
> @@ -22,3 +22,4 @@ obj-$(CONFIG_OMAP) += omap_intc.o
>  obj-$(CONFIG_OPENPIC) += openpic.o
>  obj-$(CONFIG_OPENPIC_KVM) += openpic_kvm.o
>  obj-$(CONFIG_SH4) += sh_intc.o
> +obj-$(CONFIG_XICS) += xics.o
> diff --git a/hw/ppc/xics.c b/hw/intc/xics.c
> similarity index 100%
> rename from hw/ppc/xics.c
> rename to hw/intc/xics.c
> diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
> index be00d1d..7a1cd5d 100644
> --- a/hw/ppc/Makefile.objs
> +++ b/hw/ppc/Makefile.objs
> @@ -1,7 +1,7 @@
>  # shared objects
>  obj-y += ppc.o ppc_booke.o
>  # IBM pSeries (sPAPR)
> -obj-$(CONFIG_PSERIES) += spapr.o xics.o spapr_vio.o spapr_events.o
> +obj-$(CONFIG_PSERIES) += spapr.o spapr_vio.o spapr_events.o
>  obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
>  obj-$(CONFIG_PSERIES) += spapr_pci.o
>  # PowerPC 4xx boards
> -- 
> 1.7.10.4