---

yaml --- r: 103728 b: refs/heads/master c: 7f39f8a h: refs/heads/master v: v3
git-mirror · Jul 20, 2008 · efbe06c · efbe06c
1 parent 5647cad
commit efbe06c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
     	}
@@ Expand Down @@