Commit 966cd0f3 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

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: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 4f225ae0

arch/powerpc/kvm/book3s_pr.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/kvm/book3s_pr_papr.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

	}

arch/powerpc/kvm/booke.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE