From 548c8f1efe3e2984df69cb4bfd5c2311418879c6 Mon Sep 17 00:00:00 2001 From: Zhang xiantao Date: Thu, 11 Sep 2008 13:19:32 +0800 Subject: [PATCH] --- yaml --- r: 115349 b: refs/heads/master c: 371c01b28e4049d1fbf60a9631cdad98f7cae030 h: refs/heads/master i: 115347: 00afa4206786e02377afba761ab9acfe0b960d68 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/Makefile | 6 +++--- trunk/{arch/x86 => virt}/kvm/vtd.c | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename trunk/{arch/x86 => virt}/kvm/vtd.c (100%) diff --git a/[refs] b/[refs] index bf1b293556b2..da33680e8a6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83dbc83a0d7c88c919d769177bd1924a46c9c034 +refs/heads/master: 371c01b28e4049d1fbf60a9631cdad98f7cae030 diff --git a/trunk/arch/x86/kvm/Makefile b/trunk/arch/x86/kvm/Makefile index 3072b17447ab..7dce593b9c66 100644 --- a/trunk/arch/x86/kvm/Makefile +++ b/trunk/arch/x86/kvm/Makefile @@ -7,14 +7,14 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ ifeq ($(CONFIG_KVM_TRACE),y) common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o) endif +ifeq ($(CONFIG_DMAR),y) +common-objs += $(addprefix ../../../virt/kvm/, vtd.o) +endif EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ i8254.o -ifeq ($(CONFIG_DMAR),y) -kvm-objs += vtd.o -endif obj-$(CONFIG_KVM) += kvm.o kvm-intel-objs = vmx.o obj-$(CONFIG_KVM_INTEL) += kvm-intel.o diff --git a/trunk/arch/x86/kvm/vtd.c b/trunk/virt/kvm/vtd.c similarity index 100% rename from trunk/arch/x86/kvm/vtd.c rename to trunk/virt/kvm/vtd.c