diff options
| author |   Alex Williamson <alex.williamson@redhat.com> | 2013-04-16 13:49:18 -0600 |
|---|---|---|
| committer |   Gleb Natapov <gleb@redhat.com> | 2013-04-28 12:58:56 +0300 |
| commit | 2a5bab1004729f3302c776e53ee7c895b98bb1ce (patch) | |
| tree | 281519b89e9f766a3d83c6978850e9eb72b3e0df /arch/ia64/kvm/Makefile | |
| parent | Merge git://github.com/agraf/linux-2.6.git kvm-ppc-next into queue (diff) | |
| download | linux-dev-2a5bab1004729f3302c776e53ee7c895b98bb1ce.tar.xz linux-dev-2a5bab1004729f3302c776e53ee7c895b98bb1ce.zip | |
kvm: Allow build-time configuration of KVM device assignment
We hope to at some point deprecate KVM legacy device assignment in
favor of VFIO-based assignment. Towards that end, allow legacy
device assignment to be deconfigured.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/ia64/kvm/Makefile')
| -rw-r--r-- | arch/ia64/kvm/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 511f64a78d56..1a4053789d01 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile @@ -49,10 +49,10 @@ ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/ asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ - coalesced_mmio.o irq_comm.o assigned-dev.o irqchip.o) + coalesced_mmio.o irq_comm.o) -ifeq ($(CONFIG_IOMMU_API),y) -common-objs += $(addprefix ../../../virt/kvm/, iommu.o) +ifeq ($(CONFIG_KVM_DEVICE_ASSIGNMENT),y) +common-objs += $(addprefix ../../../virt/kvm/, assigned-dev.o iommu.o) endif kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o |