diff options
| author | Paolo Bonzini | 2023-07-01 07:07:55 -0400 |
|---|---|---|
| committer | Paolo Bonzini | 2023-07-01 07:07:55 -0400 |
| commit | d74669ebaeb6e5c786b939dc8c48cf7db9d44c84 (patch) | |
| tree | 4deacd98f4e95c10ab10a0068586fed198221db9 /include/uapi | |
| parent | cc744042d90809ccb7cac7f9fb773f5c9cb9f835 (diff) | |
| parent | cc77b95acf3c7d9a24204b0555fed2014f300fd5 (diff) | |
Merge tag 'kvm-x86-generic-6.5' of https://github.com/kvm-x86/linux into HEAD
Common KVM changes for 6.5:
- Fix unprotected vcpu->pid dereference via debugfs
- Fix KVM_BUG() and KVM_BUG_ON() macros with 64-bit conditionals
- Refactor failure path in kvm_io_bus_unregister_dev() to simplify the code
- Misc cleanups
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/kvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index f2a6326ae082..f089ab290978 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1617,7 +1617,7 @@ struct kvm_s390_ucas_mapping { #define KVM_GET_DEBUGREGS _IOR(KVMIO, 0xa1, struct kvm_debugregs) #define KVM_SET_DEBUGREGS _IOW(KVMIO, 0xa2, struct kvm_debugregs) /* - * vcpu version available with KVM_ENABLE_CAP + * vcpu version available with KVM_CAP_ENABLE_CAP * vm version available with KVM_CAP_ENABLE_CAP_VM */ #define KVM_ENABLE_CAP _IOW(KVMIO, 0xa3, struct kvm_enable_cap) |