asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: PPC: Move kvm_guest_enter call into generic code

Browse source 
We need to call kvm_guest_enter in booke and book3s, so move its
call to generic code.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2012-08-13 01:24:01 +02:00
parent bd2be6836e
commit 3766a4c693
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/kvm/book3s_pr.c
View file

@ -867,8 +867,6 @@ program_interrupt:
run->exit_reason = KVM_EXIT_INTR;
r = -EINTR;
} else {
/* Going back to guest */
kvm_guest_enter();
kvmppc_lazy_ee_enable();
}
}

2
arch/powerpc/kvm/booke.c
View file

@ -954,8 +954,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
r = (-EINTR << 2) | RESUME_HOST | (r & RESUME_FLAG_NV);
kvmppc_account_exit(vcpu, SIGNAL_EXITS);
} else {
/* Going back to guest */
kvm_guest_enter();
kvmppc_lazy_ee_enable();
}
}

3
arch/powerpc/kvm/powerpc.c
View file

@ -101,12 +101,15 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu)
/* Got an interrupt in between, try again */
local_irq_enable();
local_irq_disable();
kvm_guest_exit();
continue;
}
trace_hardirqs_on();
#endif
kvm_guest_enter();
/* Going into guest context! Yay! */
vcpu->mode = IN_GUEST_MODE;
smp_wmb();