Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfd99ff5 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Move assigned device code to own file 



Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 367e1319

arch/ia64/kvm/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 
EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/

EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/





common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o irq_comm.o)

		coalesced_mmio.o irq_comm.o assigned-dev.o)





ifeq ($(CONFIG_IOMMU_API),y)

ifeq ($(CONFIG_IOMMU_API),y)

common-objs += $(addprefix ../../../virt/kvm/, iommu.o)

common-objs += $(addprefix ../../../virt/kvm/, iommu.o)

arch/x86/kvm/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,8 @@ CFLAGS_svm.o := -I. 
CFLAGS_vmx.o := -I.

CFLAGS_vmx.o := -I.





kvm-y			+= $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

kvm-y			+= $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

				coalesced_mmio.o irq_comm.o eventfd.o)

				coalesced_mmio.o irq_comm.o eventfd.o \

				assigned-dev.o)

kvm-$(CONFIG_IOMMU_API)	+= $(addprefix ../../../virt/kvm/, iommu.o)

kvm-$(CONFIG_IOMMU_API)	+= $(addprefix ../../../virt/kvm/, iommu.o)





kvm-y			+= x86.o mmu.o emulate.o i8259.o irq.o lapic.o \

kvm-y			+= x86.o mmu.o emulate.o i8259.o irq.o lapic.o \

include/linux/kvm_host.h

+17 −0
Original line number Original line Diff line number Diff line
@@ -577,4 +577,21 @@ static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu) 
	return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id;

	return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id;

}

}

#endif

#endif



#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT



long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,

				  unsigned long arg);



#else



static inline long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,

						unsigned long arg)

{

	return -ENOTTY;

}



#endif

#endif



#endif

virt/kvm/assigned-dev.c

0 → 100644
+818 −0

File added.

Preview size limit exceeded, changes collapsed.

virt/kvm/kvm_main.c

+2 −796

File changed.

Preview size limit exceeded, changes collapsed.