| From 766d3571d8e50d3a73b77043dc632226f9e6b389 Mon Sep 17 00:00:00 2001 |
| From: "Michael S. Tsirkin" <mst@redhat.com> |
| Date: Fri, 8 Jun 2018 02:19:53 +0300 |
| Subject: kvm: fix typo in flag name |
| |
| From: Michael S. Tsirkin <mst@redhat.com> |
| |
| commit 766d3571d8e50d3a73b77043dc632226f9e6b389 upstream. |
| |
| KVM_X86_DISABLE_EXITS_HTL really refers to exit on halt. |
| Obviously a typo: should be named KVM_X86_DISABLE_EXITS_HLT. |
| |
| Fixes: caa057a2cad ("KVM: X86: Provide a capability to disable HLT intercepts") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kvm/x86.c | 4 ++-- |
| include/uapi/linux/kvm.h | 4 ++-- |
| tools/include/uapi/linux/kvm.h | 4 ++-- |
| 3 files changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -2894,7 +2894,7 @@ int kvm_vm_ioctl_check_extension(struct |
| r = KVM_CLOCK_TSC_STABLE; |
| break; |
| case KVM_CAP_X86_DISABLE_EXITS: |
| - r |= KVM_X86_DISABLE_EXITS_HTL | KVM_X86_DISABLE_EXITS_PAUSE; |
| + r |= KVM_X86_DISABLE_EXITS_HLT | KVM_X86_DISABLE_EXITS_PAUSE; |
| if(kvm_can_mwait_in_guest()) |
| r |= KVM_X86_DISABLE_EXITS_MWAIT; |
| break; |
| @@ -4248,7 +4248,7 @@ split_irqchip_unlock: |
| if ((cap->args[0] & KVM_X86_DISABLE_EXITS_MWAIT) && |
| kvm_can_mwait_in_guest()) |
| kvm->arch.mwait_in_guest = true; |
| - if (cap->args[0] & KVM_X86_DISABLE_EXITS_HTL) |
| + if (cap->args[0] & KVM_X86_DISABLE_EXITS_HLT) |
| kvm->arch.hlt_in_guest = true; |
| if (cap->args[0] & KVM_X86_DISABLE_EXITS_PAUSE) |
| kvm->arch.pause_in_guest = true; |
| --- a/include/uapi/linux/kvm.h |
| +++ b/include/uapi/linux/kvm.h |
| @@ -677,10 +677,10 @@ struct kvm_ioeventfd { |
| }; |
| |
| #define KVM_X86_DISABLE_EXITS_MWAIT (1 << 0) |
| -#define KVM_X86_DISABLE_EXITS_HTL (1 << 1) |
| +#define KVM_X86_DISABLE_EXITS_HLT (1 << 1) |
| #define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2) |
| #define KVM_X86_DISABLE_VALID_EXITS (KVM_X86_DISABLE_EXITS_MWAIT | \ |
| - KVM_X86_DISABLE_EXITS_HTL | \ |
| + KVM_X86_DISABLE_EXITS_HLT | \ |
| KVM_X86_DISABLE_EXITS_PAUSE) |
| |
| /* for KVM_ENABLE_CAP */ |
| --- a/tools/include/uapi/linux/kvm.h |
| +++ b/tools/include/uapi/linux/kvm.h |
| @@ -677,10 +677,10 @@ struct kvm_ioeventfd { |
| }; |
| |
| #define KVM_X86_DISABLE_EXITS_MWAIT (1 << 0) |
| -#define KVM_X86_DISABLE_EXITS_HTL (1 << 1) |
| +#define KVM_X86_DISABLE_EXITS_HLT (1 << 1) |
| #define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2) |
| #define KVM_X86_DISABLE_VALID_EXITS (KVM_X86_DISABLE_EXITS_MWAIT | \ |
| - KVM_X86_DISABLE_EXITS_HTL | \ |
| + KVM_X86_DISABLE_EXITS_HLT | \ |
| KVM_X86_DISABLE_EXITS_PAUSE) |
| |
| /* for KVM_ENABLE_CAP */ |