From 5647cad8781eb1c5d033bf4d05dbaab16e466270 Mon Sep 17 00:00:00 2001
From: Laurent Vivier <Laurent.Vivier@bull.net>
Date: Fri, 30 May 2008 16:05:56 +0200
Subject: [PATCH] --- yaml --- r: 103727 b: refs/heads/master c:
 588968b6b7d34e6a88f538d1db9aca47b203623e h: refs/heads/master i:   103725:
 c4bc354bcc470062e931574b40ec8fd85b375184   103723:
 9edba6da0115f6cc0cf1fed47ed8cdef05c0e1fe   103719:
 2f3e1302f30e629a789718e61db5fb602f2abeb6   103711:
 ee32b20e12a3c8e2134128683ab0d32687459b04 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kvm/Makefile      | 2 +-
 trunk/arch/powerpc/kvm/powerpc.c     | 3 +++
 trunk/include/asm-powerpc/kvm_host.h | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c1cd6c387eae..8a7dc3aa3550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 542472b53ea9e0add0ba23976018210191d84754
+refs/heads/master: 588968b6b7d34e6a88f538d1db9aca47b203623e
diff --git a/trunk/arch/powerpc/kvm/Makefile b/trunk/arch/powerpc/kvm/Makefile
index d0d358d367ec..04e3449e1f42 100644
--- a/trunk/arch/powerpc/kvm/Makefile
+++ b/trunk/arch/powerpc/kvm/Makefile
@@ -4,7 +4,7 @@
 
 EXTRA_CFLAGS += -Ivirt/kvm -Iarch/powerpc/kvm
 
-common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
+common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o)
 
 kvm-objs := $(common-objs) powerpc.o emulate.o booke_guest.o
 obj-$(CONFIG_KVM) += kvm.o
diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c
index 0513b359851b..b850d2497027 100644
--- a/trunk/arch/powerpc/kvm/powerpc.c
+++ b/trunk/arch/powerpc/kvm/powerpc.c
@@ -145,6 +145,9 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_USER_MEMORY:
 		r = 1;
 		break;
+	case KVM_CAP_COALESCED_MMIO:
+		r = KVM_COALESCED_MMIO_PAGE_OFFSET;
+		break;
 	default:
 		r = 0;
 		break;
diff --git a/trunk/include/asm-powerpc/kvm_host.h b/trunk/include/asm-powerpc/kvm_host.h
index 81a69d711017..2655e2a4831e 100644
--- a/trunk/include/asm-powerpc/kvm_host.h
+++ b/trunk/include/asm-powerpc/kvm_host.h
@@ -31,6 +31,8 @@
 /* memory slots that does not exposed to userspace */
 #define KVM_PRIVATE_MEM_SLOTS 4
 
+#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
+
 /* We don't currently support large pages. */
 #define KVM_PAGES_PER_HPAGE (1<<31)