leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: PPC: Booke: only prepare to enter when we enter

Browse Source 
So far, we've always called prepare_to_enter even when all we did was return
to the host. This patch changes that semantic to only call prepare_to_enter
when we actually want to get back into the guest.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Alexander Graf 2012-02-28 12:00:41 +01:00 committed by Avi Kivity
parent 7cc1e8ee78
commit 03660ba270
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/powerpc/kvm/booke.c
View File

@ -464,7 +464,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu)
* *
* returns !0 if a signal is pending and check_signal is true * returns !0 if a signal is pending and check_signal is true
*/ */
static int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu, bool check_signal) static int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu)
{ {
int r = 0; int r = 0;
@ -477,7 +477,7 @@ static int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu, bool check_signal)
continue; continue;
} }
if (check_signal && signal_pending(current)) { if (signal_pending(current)) {
r = 1; r = 1;
break; break;
} }
@ -509,7 +509,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
} }
local_irq_disable(); local_irq_disable();
if (kvmppc_prepare_to_enter(vcpu, true)) { if (kvmppc_prepare_to_enter(vcpu)) {
kvm_run->exit_reason = KVM_EXIT_INTR; kvm_run->exit_reason = KVM_EXIT_INTR;
ret = -EINTR; ret = -EINTR;
goto out; goto out;
@ -946,11 +946,13 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
* To avoid clobbering exit_reason, only check for signals if we * To avoid clobbering exit_reason, only check for signals if we
* aren't already exiting to userspace for some other reason. * aren't already exiting to userspace for some other reason.
*/ */
local_irq_disable(); if (!(r & RESUME_HOST)) {
if (kvmppc_prepare_to_enter(vcpu, !(r & RESUME_HOST))) { local_irq_disable();
run->exit_reason = KVM_EXIT_INTR; if (kvmppc_prepare_to_enter(vcpu)) {
r = (-EINTR << 2) | RESUME_HOST | (r & RESUME_FLAG_NV); run->exit_reason = KVM_EXIT_INTR;
kvmppc_account_exit(vcpu, SIGNAL_EXITS); r = (-EINTR << 2) | RESUME_HOST | (r & RESUME_FLAG_NV);
kvmppc_account_exit(vcpu, SIGNAL_EXITS);
}
} }
return r; return r;