Commit 91b99ea7 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Rename kvm_vcpu_block() => kvm_vcpu_halt() 



Rename kvm_vcpu_block() to kvm_vcpu_halt() in preparation for splitting
the actual "block" sequences into a separate helper (to be named
kvm_vcpu_block()).  x86 will use the standalone block-only path to handle
non-halt cases where the vCPU is not runnable.

Rename block_ns to halt_ns to match the new function name.

No functional change intended.

Reviewed-by: default avatarDavid Matlack <dmatlack@google.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20211009021236.4122790-14-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 005467e0

arch/arm64/kvm/arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static void timer_save_state(struct arch_timer_context *ctx) 
}



/*

 * Schedule the background timer before calling kvm_vcpu_block, so that this

 * Schedule the background timer before calling kvm_vcpu_halt, so that this

 * thread is removed from its waitqueue and made runnable when there's a timer

 * interrupt to handle.

 */

arch/arm64/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ void kvm_vcpu_wfi(struct kvm_vcpu *vcpu) 
	vgic_v4_put(vcpu, true);

	preempt_enable();



	kvm_vcpu_block(vcpu);

	kvm_vcpu_halt(vcpu);

	kvm_clear_request(KVM_REQ_UNHALT, vcpu);



	preempt_disable();

arch/arm64/kvm/handle_exit.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int handle_no_fpsimd(struct kvm_vcpu *vcpu) 
 *

 * WFE: Yield the CPU and come back to this vcpu when the scheduler

 * decides to.

 * WFI: Simply call kvm_vcpu_block(), which will halt execution of

 * WFI: Simply call kvm_vcpu_halt(), which will halt execution of

 * world-switches and schedule other host processes until there is an

 * incoming IRQ or FIQ to the VM.

 */

arch/arm64/kvm/psci.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static unsigned long kvm_psci_vcpu_suspend(struct kvm_vcpu *vcpu) 
	 * specification (ARM DEN 0022A). This means all suspend states

	 * for KVM will preserve the register state.

	 */

	kvm_vcpu_block(vcpu);

	kvm_vcpu_halt(vcpu);

	kvm_clear_request(KVM_REQ_UNHALT, vcpu);



	return PSCI_RET_SUCCESS;

arch/mips/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ enum emulation_result kvm_mips_emul_wait(struct kvm_vcpu *vcpu) 
	if (!vcpu->arch.pending_exceptions) {

		kvm_vz_lose_htimer(vcpu);

		vcpu->arch.wait = 1;

		kvm_vcpu_block(vcpu);

		kvm_vcpu_halt(vcpu);



		/*

		 * We we are runnable, then definitely go off to user space to