From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URsgm-0004Th-Po for qemu-devel@nongnu.org; Mon, 15 Apr 2013 19:20:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URsgh-0004k6-9L for qemu-devel@nongnu.org; Mon, 15 Apr 2013 19:19:56 -0400 From: Scott Wood Date: Mon, 15 Apr 2013 18:19:30 -0500 Message-ID: <1366067974-5413-3-git-send-email-scottwood@freescale.com> In-Reply-To: <1366067974-5413-1-git-send-email-scottwood@freescale.com> References: <1360823521-32306-1-git-send-email-scottwood@freescale.com> <1366067974-5413-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [RFC PATCH v2 2/6] kvm: use hw/kvm/Makefile.objs consistently for all relevant architectures List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Scott Wood , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Signed-off-by: Scott Wood --- Build tested on ppc and x86, but not arm as I currently lack a suitable toolchain. Maybe TARGET_I386 should be set on x86_64, instead of needing to test TARGET_BASE_ARCH in Makefile.objs? It seems odd that it's set for x86_64 in C code, but not in the makefiles. --- hw/Makefile.objs | 1 + hw/arm/Makefile.objs | 1 - hw/i386/Makefile.objs | 1 - hw/kvm/Makefile.objs | 7 ++++++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d0b2ecb..3ce4ccd 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -216,4 +216,5 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-$(CONFIG_LINUX) += vfio_pci.o endif +obj-$(CONFIG_KVM) += kvm/ endif diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index f5f7d0e..aebbc86 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o obj-y += strongarm.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o -obj-$(CONFIG_KVM) += kvm/arm_gic.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index a78c0b2..5c54054 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -9,7 +9,6 @@ obj-y += lpc_ich9.o q35.o obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o -obj-y += kvm/ obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-y += pc-testdev.o diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs index f620d7f..2a157a6 100644 --- a/hw/kvm/Makefile.objs +++ b/hw/kvm/Makefile.objs @@ -1 +1,6 @@ -obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o +ifeq ($(TARGET_BASE_ARCH),i386) +TARGET_BASE_I386=y +endif + +obj-$(TARGET_BASE_I386) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o +obj-$(TARGET_ARM) += arm_gic.o -- 1.7.10.4