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

Commit 22e64024 authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: IA64: Carry non-ia64 changes into ia64 



We changed a few things in non-ia64 code paths. This patch blindly applies
the changes to the ia64 code as well, hoping it proves useful in case anyone
revives the ia64 kvm code.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 447a03c0

arch/ia64/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define KVM_USER_MEM_SLOTS 32



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_IRQCHIP_NUM_PINS  KVM_IOAPIC_NUM_PINS



/* define exit reasons from vmm to kvm*/

#define EXIT_REASON_VM_PANIC		0

arch/ia64/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config KVM 
	select PREEMPT_NOTIFIERS

	select ANON_INODES

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select KVM_APIC_ARCHITECTURE

	select KVM_MMIO

	---help---

arch/ia64/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 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)

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



ifeq ($(CONFIG_IOMMU_API),y)

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