diff options
| author | Alexander Graf <agraf@suse.de> | 2012-03-14 16:55:08 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-04-08 14:02:38 +0300 |
| commit | 966cd0f3bdd422f0b10686fb59d0d456fbbb6398 (patch) | |
| tree | a28548a9ef496989cd8fdb2f3b21fd7d5241f996 /arch/powerpc/kvm/book3s_pr.c | |
| parent | 4f225ae06e7f39a523ec500c3cf127e50797983e (diff) | |
| download | talos-obmc-linux-966cd0f3bdd422f0b10686fb59d0d456fbbb6398.tar.gz talos-obmc-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.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_pr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index a7f031b6fc98..912e10fbf6ef 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -120,6 +120,7 @@ void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 msr) if (msr & MSR_POW) { if (!vcpu->arch.pending_exceptions) { kvm_vcpu_block(vcpu); + clear_bit(KVM_REQ_UNHALT, &vcpu->requests); vcpu->stat.halt_wakeup++; /* Unset POW bit after we woke up */ |
