Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f01fbd2f authored by Longpeng(Mike)'s avatar Longpeng(Mike) Committed by Paolo Bonzini
Browse files

KVM: arm: implements the kvm_arch_vcpu_in_kernel() 



This implements the kvm_arch_vcpu_in_kernel() for ARM, and adjusts
the calls to kvm_vcpu_on_spin().

Signed-off-by: default avatarLongpeng(Mike) <longpeng2@huawei.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0546c63d

arch/arm/kvm/handle_exit.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	if (kvm_vcpu_get_hsr(vcpu) & HSR_WFI_IS_WFE) {

		trace_kvm_wfx(*vcpu_pc(vcpu), true);

		vcpu->stat.wfe_exit_stat++;

		kvm_vcpu_on_spin(vcpu, false);

		kvm_vcpu_on_spin(vcpu, vcpu_mode_priv(vcpu));

	} else {

		trace_kvm_wfx(*vcpu_pc(vcpu), false);

		vcpu->stat.wfi_exit_stat++;

arch/arm64/kvm/handle_exit.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	if (kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WFx_ISS_WFE) {

		trace_kvm_wfx_arm64(*vcpu_pc(vcpu), true);

		vcpu->stat.wfe_exit_stat++;

		kvm_vcpu_on_spin(vcpu, false);

		kvm_vcpu_on_spin(vcpu, vcpu_mode_priv(vcpu));

	} else {

		trace_kvm_wfx_arm64(*vcpu_pc(vcpu), false);

		vcpu->stat.wfi_exit_stat++;

virt/kvm/arm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) 


bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu)

{

	return false;

	return vcpu_mode_priv(vcpu);

}



/* Just ensure a guest exit from a particular CPU */