From efbe06c55d7315a09255e94cdb674a9870795c7f Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 30 May 2008 16:05:57 +0200 Subject: [PATCH] --- yaml --- r: 103728 b: refs/heads/master c: 7f39f8ac177db258200053074aa7a3d98656b1cf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kvm/Makefile | 3 ++- trunk/arch/ia64/kvm/kvm-ia64.c | 3 +++ trunk/include/asm-ia64/kvm_host.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a7dc3aa3550..1e8c1348d0e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 588968b6b7d34e6a88f538d1db9aca47b203623e +refs/heads/master: 7f39f8ac177db258200053074aa7a3d98656b1cf diff --git a/trunk/arch/ia64/kvm/Makefile b/trunk/arch/ia64/kvm/Makefile index 112791dd2542..bf22fb9e6dcf 100644 --- a/trunk/arch/ia64/kvm/Makefile +++ b/trunk/arch/ia64/kvm/Makefile @@ -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 diff --git a/trunk/arch/ia64/kvm/kvm-ia64.c b/trunk/arch/ia64/kvm/kvm-ia64.c index bb58df7cc418..9408b30576d6 100644 --- a/trunk/arch/ia64/kvm/kvm-ia64.c +++ b/trunk/arch/ia64/kvm/kvm-ia64.c @@ -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; } diff --git a/trunk/include/asm-ia64/kvm_host.h b/trunk/include/asm-ia64/kvm_host.h index 5c958b0c46b1..1efe513a9941 100644 --- a/trunk/include/asm-ia64/kvm_host.h +++ b/trunk/include/asm-ia64/kvm_host.h @@ -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