From 4317b718d119ff1dc000cf7f3f909d644a69cdbf Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Wed, 21 May 2008 18:22:52 -0500
Subject: [PATCH] --- yaml --- r: 97977 b: refs/heads/master c:
 ac3cd34e4eb9e3dccaec8e586c073ba2660b322f h: refs/heads/master i:   97975:
 20d5e2d333a62838b3b50e729a7e611e0bdcaa35 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/powerpc/kvm/emulate.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9352632d8db1..b821edfc60fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce263d70e509287ee761f9bba519342f57b121ca
+refs/heads/master: ac3cd34e4eb9e3dccaec8e586c073ba2660b322f
diff --git a/trunk/arch/powerpc/kvm/emulate.c b/trunk/arch/powerpc/kvm/emulate.c
index a03fe0c80698..000097461283 100644
--- a/trunk/arch/powerpc/kvm/emulate.c
+++ b/trunk/arch/powerpc/kvm/emulate.c
@@ -246,6 +246,11 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 	case 31:
 		switch (get_xop(inst)) {
 
+		case 23:                                        /* lwzx */
+			rt = get_rt(inst);
+			emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
+			break;
+
 		case 83:                                        /* mfmsr */
 			rt = get_rt(inst);
 			vcpu->arch.gpr[rt] = vcpu->arch.msr;
@@ -267,6 +272,13 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 			kvmppc_set_msr(vcpu, vcpu->arch.gpr[rs]);
 			break;
 
+		case 151:                                       /* stwx */
+			rs = get_rs(inst);
+			emulated = kvmppc_handle_store(run, vcpu,
+			                               vcpu->arch.gpr[rs],
+			                               4, 1);
+			break;
+
 		case 163:                                       /* wrteei */
 			vcpu->arch.msr = (vcpu->arch.msr & ~MSR_EE)
 			                 | (inst & MSR_EE);