---

yaml --- r: 125219 b: refs/heads/master c: fcfdbd2 h: refs/heads/master i: 125217: e7a0fc7 125215: 0384f61 v: v3
git-mirror · Dec 31, 2008 · ad68a91 · ad68a91
1 parent db5b7cd
commit ad68a91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4cf3892e50b8e35341086a4fe2bb8a3989b55d4
+refs/heads/master: fcfdbd266a41d3e41d17666de410a24995fde03a
diff --git a/trunk/arch/powerpc/kvm/emulate.c b/trunk/arch/powerpc/kvm/emulate.c
@@ -74,8 +74,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 	int advance = 1;
 
 	switch (get_op(inst)) {
-	case 3:                                                 /* trap */
-		printk("trap!\n");
+	case 3:                                             /* trap */
+		vcpu->arch.esr |= ESR_PTR;
 		kvmppc_core_queue_program(vcpu);
 		advance = 0;
 		break;