---

yaml --- r: 215687 b: refs/heads/master c: beb03f1 h: refs/heads/master i: 215685: 2406e88 215683: b042665 215679: 54b6497 v: v3
git-mirror · Oct 24, 2010 · 873d3d8 · 873d3d8
1 parent 73e3aa8
commit 873d3d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28e83b4fa7f8bd114940fa933ac8cbe80969eba2
+refs/heads/master: beb03f14da9ceff76ff08cbb8af064b52dc21f7e
diff --git a/trunk/arch/powerpc/include/asm/kvm_host.h b/trunk/arch/powerpc/include/asm/kvm_host.h
@@ -287,6 +287,8 @@ struct kvm_vcpu_arch {
 	u64 dec_jiffies;
 	unsigned long pending_exceptions;
 	struct kvm_vcpu_arch_shared *shared;
+	unsigned long magic_page_pa; /* phys addr to map the magic page to */
+	unsigned long magic_page_ea; /* effect. addr to map the magic page to */
 
 #ifdef CONFIG_PPC_BOOK3S
 	struct hlist_head hpte_hash_pte[HPTEG_HASH_NUM_PTE];

diff --git a/trunk/include/linux/kvm_para.h b/trunk/include/linux/kvm_para.h
@@ -18,6 +18,7 @@
 #define KVM_HC_VAPIC_POLL_IRQ		1
 #define KVM_HC_MMU_OP			2
 #define KVM_HC_FEATURES			3
+#define KVM_HC_PPC_MAP_MAGIC_PAGE	4
 
 /*
  * hypercalls use architecture specific