KVM: PPC: Exit guest context while handling exit

The x86 implementation of KVM accounts for host time while processing
guest exits. Do the same for us.

Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 2c268a15b20fa028c8f64b865cf4b424290bf69a..b4ae11ec068f0319b5fb1b5c0f1d29224e0e0095 100644 (file)
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -601,6 +601,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
        __hard_irq_enable();
 
        trace_kvm_exit(exit_nr, vcpu);
+       kvm_guest_exit();
        preempt_enable();
 
        switch (exit_nr) {
@@ -872,6 +873,7 @@ program_interrupt:
                }
        }
 
+       kvm_guest_enter();
        trace_kvm_book3s_reenter(r, vcpu);
 
        return r;

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 492c343f598ee0ab424ac76a44951c842564cc14..887c7cc0214621e79610d586b023a3c49d4493be 100644 (file)
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -650,6 +650,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
        local_irq_enable();
 
        trace_kvm_exit(exit_nr, vcpu);
+       kvm_guest_exit();
 
        run->exit_reason = KVM_EXIT_UNKNOWN;
        run->ready_for_interrupt_injection = 1;
@@ -952,6 +953,8 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                }
        }
 
+       kvm_guest_enter();
+
        return r;
 }