1 files changed, 9 insertions, 2 deletions

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index fe0257a8e335..cfa6cfabf4a3 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -280,6 +280,9 @@ int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu)
                  * actually modified. */
                 r = RESUME_GUEST_NV;
                 break;
+        case EMULATE_AGAIN:
+                r = RESUME_GUEST;
+                break;
         case EMULATE_DO_MMIO:
                 run->exit_reason = KVM_EXIT_MMIO;
                 /* We must reload nonvolatiles because "update" load/store
@@ -289,11 +292,15 @@ int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 r = RESUME_HOST_NV;
                 break;
         case EMULATE_FAIL:
+        {
+                u32 last_inst;
+
+                kvmppc_get_last_inst(vcpu, false, &last_inst);
                 /* XXX Deliver Program interrupt to guest. */
-                printk(KERN_EMERG "%s: emulation failed (%08x)\n", __func__,
-                       kvmppc_get_last_inst(vcpu));
+                pr_emerg("%s: emulation failed (%08x)\n", __func__, last_inst);
                 r = RESUME_HOST;
                 break;
+        }
         default:
                 WARN_ON(1);
                 r = RESUME_GUEST;