KVM: PPC: Add return value in prepare_to_enter

[linux-imx.git] / arch / powerpc / kvm / book3s_pr.c

diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 1ff0d6ccc5897856d83a1d728d1d513213e4da32..71fa0f1873b3c1c6a19dab11bcfc9e5e513d0edb 100644 (file)
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -589,6 +589,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                        unsigned int exit_nr)
 {
        int r = RESUME_HOST;
+       int s;
 
        vcpu->stat.sum_exits++;
 
@@ -862,10 +863,10 @@ program_interrupt:
                 * again due to a host external interrupt.
                 */
                local_irq_disable();
-               if (kvmppc_prepare_to_enter(vcpu)) {
+               s = kvmppc_prepare_to_enter(vcpu);
+               if (s <= 0) {
                        local_irq_enable();
-                       run->exit_reason = KVM_EXIT_INTR;
-                       r = -EINTR;
+                       r = s;
                } else {
                        kvmppc_lazy_ee_enable();
                }
@@ -1074,10 +1075,9 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
         * a host external interrupt.
         */
        local_irq_disable();
-       if (kvmppc_prepare_to_enter(vcpu)) {
+       ret = kvmppc_prepare_to_enter(vcpu);
+       if (ret <= 0) {
                local_irq_enable();
-               kvm_run->exit_reason = KVM_EXIT_INTR;
-               ret = -EINTR;
                goto out;
        }