mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 13:43:55 +08:00
kvm/x86: Pass return code of kvm_emulate_hypercall
Pass the return code from kvm_emulate_hypercall on to the caller, in order to allow it to indicate to the userspace that the hypercall has to be handled there. Also adjust all the existing code paths to return 1 to make sure the hypercall isn't passed to the userspace without setting kvm_run appropriately. Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com> Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> CC: Gleb Natapov <gleb@kernel.org> CC: Paolo Bonzini <pbonzini@redhat.com> CC: Joerg Roedel <joro@8bytes.org> CC: "K. Y. Srinivasan" <kys@microsoft.com> CC: Haiyang Zhang <haiyangz@microsoft.com> CC: Roman Kagan <rkagan@virtuozzo.com> CC: Denis V. Lunev <den@openvz.org> CC: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
18f098618a
commit
0d9c055eaa
@ -1055,7 +1055,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
|
||||
*/
|
||||
if (kvm_x86_ops->get_cpl(vcpu) != 0 || !is_protmode(vcpu)) {
|
||||
kvm_queue_exception(vcpu, UD_VECTOR);
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
longmode = is_64_bit_mode(vcpu);
|
||||
|
@ -1858,8 +1858,7 @@ static int halt_interception(struct vcpu_svm *svm)
|
||||
static int vmmcall_interception(struct vcpu_svm *svm)
|
||||
{
|
||||
svm->next_rip = kvm_rip_read(&svm->vcpu) + 3;
|
||||
kvm_emulate_hypercall(&svm->vcpu);
|
||||
return 1;
|
||||
return kvm_emulate_hypercall(&svm->vcpu);
|
||||
}
|
||||
|
||||
static unsigned long nested_svm_get_tdp_cr3(struct kvm_vcpu *vcpu)
|
||||
|
@ -5758,8 +5758,7 @@ static int handle_halt(struct kvm_vcpu *vcpu)
|
||||
|
||||
static int handle_vmcall(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
kvm_emulate_hypercall(vcpu);
|
||||
return 1;
|
||||
return kvm_emulate_hypercall(vcpu);
|
||||
}
|
||||
|
||||
static int handle_invd(struct kvm_vcpu *vcpu)
|
||||
|
Loading…
Reference in New Issue
Block a user