diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-12-28 06:26:36 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-12-28 07:19:14 -0500 |
commit | a5496886eb130ea08b1a5cd5c284543909bde749 (patch) | |
tree | 6d0508cafff254dfe3974786f0d664d255835733 /arch/x86/kvm/x86.c | |
parent | 1b929c02afd37871d5afb9d498426f83432e71c2 (diff) | |
parent | 129c48cde6c9e519d033305649665427c6cac494 (diff) | |
download | linux-a5496886eb130ea08b1a5cd5c284543909bde749.tar.bz2 |
Merge branch 'kvm-late-6.1-fixes' into HEAD
x86:
* several fixes to nested VMX execution controls
* fixes and clarification to the documentation for Xen emulation
* do not unnecessarily release a pmu event with zero period
* MMU fixes
* fix Coverity warning in kvm_hv_flush_tlb()
selftests:
* fixes for the ucall mechanism in selftests
* other fixes mostly related to compilation with clang
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 312aea1854ae..da4bbd043a7b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13132,6 +13132,9 @@ int kvm_handle_memory_failure(struct kvm_vcpu *vcpu, int r, struct x86_exception *e) { if (r == X86EMUL_PROPAGATE_FAULT) { + if (KVM_BUG_ON(!e, vcpu->kvm)) + return -EIO; + kvm_inject_emulated_page_fault(vcpu, e); return 1; } |