KVM: PPC: Use same kvmppc_prepare_to_enter code for booke and book3s_pr
Subsystems (2)
PATCH 20/56 KVM: PPC: Use same kvmppc_prepare_to_enter code for booke and book3s_pr
We need to do the same things when preparing to enter a guest for booke and book3s_pr cores. Fold the generic code into a generic function that both call.
Signed-off-by Alexander Graf <[email protected]>
--- arch/powerpc/include/asm/kvm_ppc.h | 3 ++ arch/powerpc/kvm/book3s_pr.c | 22 ++++---------- arch/powerpc/kvm/booke.c | 58 +----------------------------------- arch/powerpc/kvm/powerpc.c | 57 +++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 73 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +3 -0
@@ -112,6 +112,7 @@ extern int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong val);extern int kvmppc_core_emulate_mfspr (struct kvm_vcpu *vcpu,int sprn,ulong *val); +extern void kvmppc_core_check_requests (struct kvm_vcpu *vcpu);extern int kvmppc_booke_init (void );extern void kvmppc_booke_exit (void );
@@ -150,6 +151,8 @@ extern int kvm_vm_ioctl_get_smmu_info(struct kvm *kvm,extern int kvmppc_bookehv_init (void );extern void kvmppc_bookehv_exit (void ); +extern int kvmppc_prepare_to_enter (struct kvm_vcpu *vcpu); +/* * Cuts out inst bits with ordering according to spec. * That means the leftmost bit is zero. All given bits are included.
arch/powerpc/kvm/book3s_pr.c +6 -16
@@ -88,6 +88,10 @@ void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu)kvmppc_giveup_ext (vcpu,MSR_VSX ); } +void kvmppc_core_check_requests (struct kvm_vcpu *vcpu) +{ +} +static void kvmppc_recalc_shadow_msr (struct kvm_vcpu *vcpu) {ulong smsr = vcpu->arch.shared->msr;
@@ -815,19 +819,9 @@ program_interrupt:* again due to a host external interrupt. */ __hard_irq_disable (); -if (signal_pending (current)) { -__hard_irq_enable (); -#ifdef EXIT_DEBUG -printk (KERN_EMERG "KVM: Going back to host\n" ); -#endif - vcpu->stat.signal_exits++; +if (kvmppc_prepare_to_enter (vcpu)) { run->exit_reason =KVM_EXIT_INTR ; r = -EINTR ; - }else { -/* In case an interrupt came in that was triggered -* from userspace (like DEC), we need to check what -* to inject now! */ -kvmppc_core_prepare_to_enter (vcpu); } }
@@ -1029,8 +1023,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) goto out; } -kvmppc_core_prepare_to_enter (vcpu); -/* * Interrupts could be timers for the guest which we have to inject * again, so let's postpone them until we're in the guest and if we
@@ -1038,9 +1030,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)* a host external interrupt. */ __hard_irq_disable (); - -/* No need to go into the guest when all we do is going out */ -if (signal_pending (current)) { +if (kvmppc_prepare_to_enter (vcpu)) {__hard_irq_enable (); kvm_run->exit_reason =KVM_EXIT_INTR ; ret = -EINTR ;
arch/powerpc/kvm/booke.c +1 -57
71 lines not on this page · raw message
arch/powerpc/kvm/powerpc.c +57 -0
63 lines not on this page · raw message
Signature · 1 line
1.6.0.2