From 60017597edf75f05d644b72e8fbf3e27877191ee Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 26 Nov 2008 15:51:19 +0100 Subject: [PATCH] --- yaml --- r: 125585 b: refs/heads/master c: c4fa3864281c7d88b7262cbc6cbd5c90bb59860e h: refs/heads/master i: 125583: 396b6d7e0ef0132843e7f8450de3b269cea831f3 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kvm/Makefile | 2 +- trunk/arch/x86/kvm/Makefile | 2 +- trunk/virt/kvm/{vtd.c => iommu.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/virt/kvm/{vtd.c => iommu.c} (100%) diff --git a/[refs] b/[refs] index 53431625ca25..c836957a2f3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b653574a7d14b663cc812cb20be6a114939ba186 +refs/heads/master: c4fa3864281c7d88b7262cbc6cbd5c90bb59860e diff --git a/trunk/arch/ia64/kvm/Makefile b/trunk/arch/ia64/kvm/Makefile index 76464dc312e6..cb69dfcfb1a6 100644 --- a/trunk/arch/ia64/kvm/Makefile +++ b/trunk/arch/ia64/kvm/Makefile @@ -52,7 +52,7 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ coalesced_mmio.o irq_comm.o) ifeq ($(CONFIG_DMAR),y) -common-objs += $(addprefix ../../../virt/kvm/, vtd.o) +common-objs += $(addprefix ../../../virt/kvm/, iommu.o) endif kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o diff --git a/trunk/arch/x86/kvm/Makefile b/trunk/arch/x86/kvm/Makefile index c02343594b4d..00f46c2d14bd 100644 --- a/trunk/arch/x86/kvm/Makefile +++ b/trunk/arch/x86/kvm/Makefile @@ -8,7 +8,7 @@ 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) +common-objs += $(addprefix ../../../virt/kvm/, iommu.o) endif EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm diff --git a/trunk/virt/kvm/vtd.c b/trunk/virt/kvm/iommu.c similarity index 100% rename from trunk/virt/kvm/vtd.c rename to trunk/virt/kvm/iommu.c