From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxKFG-0001AC-8D for qemu-devel@nongnu.org; Thu, 11 Jul 2013 13:01:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UxKFD-0001Ng-Ot for qemu-devel@nongnu.org; Thu, 11 Jul 2013 13:01:30 -0400 From: Alexander Graf Date: Thu, 11 Jul 2013 19:01:08 +0200 Message-Id: <1373562085-29728-6-git-send-email-agraf@suse.de> In-Reply-To: <1373562085-29728-1-git-send-email-agraf@suse.de> References: <1373562085-29728-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 05/22] pseries: move interrupt controllers to hw/intc/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Alexey Kardashevskiy , qemu-ppc@nongnu.org, Aurelien Jarno From: Alexey Kardashevskiy Signed-off-by: Alexey Kardashevskiy Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- default-configs/ppc64-softmmu.mak | 2 ++ hw/intc/Makefile.objs | 1 + hw/{ppc =3D> intc}/xics.c | 0 hw/ppc/Makefile.objs | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename hw/{ppc =3D> intc}/xics.c (100%) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-so= ftmmu.mak index 5a72b5f..6d1933b 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -45,5 +45,7 @@ CONFIG_OPENPIC=3Dy CONFIG_PSERIES=3Dy CONFIG_E500=3Dy CONFIG_OPENPIC_KVM=3D$(and $(CONFIG_E500),$(CONFIG_KVM)) +# For pSeries +CONFIG_XICS=3D$(CONFIG_PSERIES) # For PReP CONFIG_MC146818RTC=3Dy diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 86f9d5b..2851eed 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -22,3 +22,4 @@ obj-$(CONFIG_IOAPIC) +=3D ioapic.o obj-$(CONFIG_OMAP) +=3D omap_intc.o obj-$(CONFIG_OPENPIC_KVM) +=3D openpic_kvm.o obj-$(CONFIG_SH4) +=3D sh_intc.o +obj-$(CONFIG_XICS) +=3D 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 +=3D ppc.o ppc_booke.o # IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) +=3D spapr.o xics.o spapr_vio.o spapr_events.o +obj-$(CONFIG_PSERIES) +=3D spapr.o spapr_vio.o spapr_events.o obj-$(CONFIG_PSERIES) +=3D spapr_hcall.o spapr_iommu.o spapr_rtas.o obj-$(CONFIG_PSERIES) +=3D spapr_pci.o # PowerPC 4xx boards --=20 1.8.1.4