Currently in kvm_emulate_hypercall, KVM_HC_MAP_GPA_RANGE is checked specifically to decide whether a KVM hypercall needs to exit to userspace or not. Do the check based on the hypercall_exit_enabled field of struct kvm_arch. Also use the API is_kvm_hc_exit_enabled() to replace the opencode. Binbin Wu (2): KVM: x86: Check hypercall's exit to userspace generically KVM: x86: Use is_kvm_hc_exit_enabled() instead of opencode arch/x86/kvm/svm/sev.c | 4 ++-- arch/x86/kvm/x86.c | 6 +++--- arch/x86/kvm/x86.h | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) base-commit: 771df9ffadb8204e61d3e98f36c5067102aab78f -- 2.43.2