From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 4 Mar 2022 23:39:29 +0000 (-0500)
Subject: Merge branch 'kvm-bugfixes' into HEAD
X-Git-Tag: v5.18-rc1~10^2~87
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0564eeb71bbb0e1a566fb701f90155bef9e7a224;p=linux-block.git

Merge branch 'kvm-bugfixes' into HEAD

Merge bugfixes from 5.17 before merging more tricky work.
---

0564eeb71bbb0e1a566fb701f90155bef9e7a224
diff --cc arch/x86/kvm/x86.c
index cf17af4d6904,eb4029660bd9..f79bf4552082
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -4251,7 -4245,7 +4263,8 @@@ int kvm_vm_ioctl_check_extension(struc
  	case KVM_CAP_EXIT_ON_EMULATION_FAILURE:
  	case KVM_CAP_VCPU_ATTRIBUTES:
  	case KVM_CAP_SYS_ATTRIBUTES:
 +	case KVM_CAP_VAPIC:
+ 	case KVM_CAP_ENABLE_CAP:
  		r = 1;
  		break;
  	case KVM_CAP_EXIT_HYPERCALL: