From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoFLY-0007X6-9c for qemu-devel@nongnu.org; Sun, 16 Jun 2013 11:58:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoFLV-0007Ap-Fs for qemu-devel@nongnu.org; Sun, 16 Jun 2013 11:58:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60045 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoFLV-0007AX-AF for qemu-devel@nongnu.org; Sun, 16 Jun 2013 11:58:25 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BB842A41E0 for ; Sun, 16 Jun 2013 17:58:24 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 16 Jun 2013 17:57:47 +0200 Message-Id: <1371398269-6213-28-git-send-email-afaerber@suse.de> In-Reply-To: <1371398269-6213-1-git-send-email-afaerber@suse.de> References: <1371398269-6213-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-cpu v2 27/29] intc/arm_gic: Build arm_gic only once List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Since cpu_single_cpu is CPUState it no longer needs CPUArchState. Signed-off-by: Andreas F=C3=A4rber --- hw/intc/Makefile.objs | 2 +- hw/intc/arm_gic.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 9e92a0b..f75fb27 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -10,10 +10,10 @@ common-obj-$(CONFIG_REALVIEW) +=3D realview_gic.o common-obj-$(CONFIG_SLAVIO) +=3D slavio_intctl.o common-obj-$(CONFIG_IOAPIC) +=3D ioapic_common.o common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic_common.o +common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic.o common-obj-$(CONFIG_SH4) +=3D sh_intc.o =20 obj-$(CONFIG_APIC) +=3D apic.o apic_common.o -obj-$(CONFIG_ARM_GIC) +=3D arm_gic.o obj-$(CONFIG_ARM_GIC_KVM) +=3D arm_gic_kvm.o obj-$(CONFIG_STELLARIS) +=3D armv7m_nvic.o obj-$(CONFIG_EXYNOS4) +=3D exynos4210_gic.o exynos4210_combiner.o diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 79fd4a9..4153ff4 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -20,6 +20,7 @@ =20 #include "hw/sysbus.h" #include "gic_internal.h" +#include "qom/cpu.h" =20 //#define DEBUG_GIC =20 --=20 1.8.1.4