diff options
| author | Alexander Graf <agraf@suse.de> | 2012-03-14 19:55:08 +0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-04-08 15:02:38 +0400 |
| commit | 966cd0f3bdd422f0b10686fb59d0d456fbbb6398 (patch) | |
| tree | a28548a9ef496989cd8fdb2f3b21fd7d5241f996 /arch/powerpc/kvm/booke.c | |
| parent | 4f225ae06e7f39a523ec500c3cf127e50797983e (diff) | |
| download | linux-966cd0f3bdd422f0b10686fb59d0d456fbbb6398.tar.xz | |
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/booke.c')
| -rw-r--r-- | arch/powerpc/kvm/booke.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 2675dcb40a7f..72f13f4a06e0 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -449,6 +449,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) if (vcpu->arch.shared->msr & MSR_WE) { local_irq_enable(); kvm_vcpu_block(vcpu); + clear_bit(KVM_REQ_UNHALT, &vcpu->requests); local_irq_disable(); kvmppc_set_exit_type(vcpu, EMULATED_MTMSRWE_EXITS); |