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

Commit 7f39f8ac authored by Laurent Vivier's avatar Laurent Vivier Committed by Avi Kivity
Browse files

KVM: Add coalesced MMIO support (ia64 part) 



This patch enables coalesced MMIO for ia64 architecture.
It defines KVM_MMIO_PAGE_OFFSET and KVM_CAP_COALESCED_MMIO.
It enables the compilation of coalesced_mmio.c.

[akpm: fix compile error on ia64]

Signed-off-by: default avatarLaurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 588968b6

arch/ia64/kvm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s 
EXTRA_CFLAGS += -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)



kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o

obj-$(CONFIG_KVM) += kvm.o

arch/ia64/kvm/kvm-ia64.c

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,9 @@ int kvm_dev_ioctl_check_extension(long ext) 


		r = 1;

		break;

	case KVM_CAP_COALESCED_MMIO:

		r = KVM_COALESCED_MMIO_PAGE_OFFSET;

		break;

	default:

		r = 0;

	}

include/asm-ia64/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
/* memory slots that does not exposed to userspace */

#define KVM_PRIVATE_MEM_SLOTS 4



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



/* define exit reasons from vmm to kvm*/

#define EXIT_REASON_VM_PANIC		0