From patchwork Tue Jul 14 15:35:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 35560 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6EFaN4T023441 for ; Tue, 14 Jul 2009 15:36:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755188AbZGNPf1 (ORCPT ); Tue, 14 Jul 2009 11:35:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755166AbZGNPfZ (ORCPT ); Tue, 14 Jul 2009 11:35:25 -0400 Received: from mx2.redhat.com ([66.187.237.31]:59976 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755176AbZGNPfV (ORCPT ); Tue, 14 Jul 2009 11:35:21 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6EFZL7m019343 for ; Tue, 14 Jul 2009 11:35:21 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6EFZKqq009331; Tue, 14 Jul 2009 11:35:20 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6EFZJ3N019321; Tue, 14 Jul 2009 11:35:20 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com Subject: [PATCH v3 2/8] Do not compile qemu-kvm.c and qemu-kvm-x86.c Date: Tue, 14 Jul 2009 11:35:12 -0400 Message-Id: <1247585718-32738-3-git-send-email-glommer@redhat.com> In-Reply-To: <1247585718-32738-2-git-send-email-glommer@redhat.com> References: <1247585718-32738-1-git-send-email-glommer@redhat.com> <1247585718-32738-2-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Instead, include them from upstream files Signed-off-by: Glauber Costa --- Makefile.target | 5 ++--- kvm-all.c | 2 ++ target-i386/kvm.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.target b/Makefile.target index e0edd27..df1f32b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -160,7 +160,6 @@ ifeq ($(ARCH),sparc64) CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc endif -libobj-$(CONFIG_KVM) += qemu-kvm.o ifdef CONFIG_SOFTFLOAT libobj-y += fpu/softfloat.o else @@ -171,13 +170,13 @@ libobj-y += op_helper.o helper.o ifeq ($(TARGET_ARCH), i386) libobj-y += helper.o -libobj-$(CONFIG_KVM) += qemu-kvm-x86.o kvm-tpr-opt.o +libobj-$(CONFIG_KVM) += kvm-tpr-opt.o libobj-$(CONFIG_KVM) += qemu-kvm-helper.o endif ifeq ($(TARGET_ARCH), x86_64) libobj-y += helper.o -libobj-$(CONFIG_KVM) += qemu-kvm-x86.o kvm-tpr-opt.o +libobj-$(CONFIG_KVM) += kvm-tpr-opt.o libobj-$(CONFIG_KVM) += qemu-kvm-helper.o endif diff --git a/kvm-all.c b/kvm-all.c index 4c2fdf5..e42b1f6 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1029,3 +1029,5 @@ void kvm_remove_all_breakpoints(CPUState *current_env) } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ #endif + +#include "qemu-kvm.c" diff --git a/target-i386/kvm.c b/target-i386/kvm.c index b7eb096..cfa5b80 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -964,3 +964,5 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) } #endif /* KVM_CAP_SET_GUEST_DEBUG */ #endif + +#include "qemu-kvm-x86.c"