From patchwork Mon Apr 15 23:19:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 236763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 24E302C00E3 for ; Tue, 16 Apr 2013 09:20:36 +1000 (EST) Received: from localhost ([::1]:53100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URshN-0004cJ-Uk for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 19:20:33 -0400 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 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:34722 helo=va3outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URsgX-0004bx-Ko; Mon, 15 Apr 2013 19:19:41 -0400 Received: from mail230-va3-R.bigfish.com (10.7.14.225) by VA3EHSOBE010.bigfish.com (10.7.40.12) with Microsoft SMTP Server id 14.1.225.23; Mon, 15 Apr 2013 23:19:41 +0000 Received: from mail230-va3 (localhost [127.0.0.1]) by mail230-va3-R.bigfish.com (Postfix) with ESMTP id F25B2700779; Mon, 15 Apr 2013 23:19:40 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 1 X-BigFish: VS1(z551bizzz1f42h1fc6h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail230-va3 (localhost.localdomain [127.0.0.1]) by mail230-va3 (MessageSwitch) id 136606797983525_29079; Mon, 15 Apr 2013 23:19:39 +0000 (UTC) Received: from VA3EHSMHS017.bigfish.com (unknown [10.7.14.237]) by mail230-va3.bigfish.com (Postfix) with ESMTP id 124F33A0218; Mon, 15 Apr 2013 23:19:39 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS017.bigfish.com (10.7.99.27) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 15 Apr 2013 23:19:38 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 15 Apr 2013 23:19:37 +0000 Received: from snotra.am.freescale.net ([10.214.83.122]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r3FNJYs1017756; Mon, 15 Apr 2013 16:19:36 -0700 From: Scott Wood To: Alexander Graf Date: Mon, 15 Apr 2013 18:19:30 -0500 Message-ID: <1366067974-5413-3-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.7.10.4 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 X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 216.32.180.13 Cc: Scott Wood , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [RFC PATCH v2 2/6] kvm: use hw/kvm/Makefile.objs consistently for all relevant architectures X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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