summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm/book3s_pr_papr.c
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-03-14 16:55:08 +0100
committerAvi Kivity <avi@redhat.com>2012-04-08 13:02:38 +0200
commit966cd0f3bdd422f0b10686fb59d0d456fbbb6398 (patch)
treea28548a9ef496989cd8fdb2f3b21fd7d5241f996 /arch/powerpc/kvm/book3s_pr_papr.c
parentKVM: PPC: Book3s: PR: Add HV traps so we can run in HV=1 mode on p7 (diff)
downloadlinux-966cd0f3bdd422f0b10686fb59d0d456fbbb6398.tar.xz
linux-966cd0f3bdd422f0b10686fb59d0d456fbbb6398.zip
KVM: PPC: Ignore unhalt request from kvm_vcpu_block
When running kvm_vcpu_block and it realizes that the CPU is actually good to run, we get a request bit set for KVM_REQ_UNHALT. Right now, there's nothing we can do with that bit, so let's unset it right after the call again so we don't get confused in our later checks for pending work. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/book3s_pr_papr.c')
-rw-r--r--arch/powerpc/kvm/book3s_pr_papr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c
index 6d1bfe246f0a..60ac0e793476 100644
--- a/arch/powerpc/kvm/book3s_pr_papr.c
+++ b/arch/powerpc/kvm/book3s_pr_papr.c
@@ -224,6 +224,7 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)
return kvmppc_h_pr_bulk_remove(vcpu);
case H_CEDE:
kvm_vcpu_block(vcpu);
+ clear_bit(KVM_REQ_UNHALT, &vcpu->requests);
vcpu->stat.halt_wakeup++;
return EMULATE_DONE;
}