Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 766d3571 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Paolo Bonzini
Browse files

kvm: fix typo in flag name 



KVM_X86_DISABLE_EXITS_HTL really refers to exit on halt.
Obviously a typo: should be named KVM_X86_DISABLE_EXITS_HLT.

Fixes: caa057a2 ("KVM: X86: Provide a capability to disable HLT intercepts")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3c9fa24c

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -2899,7 +2899,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		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;
@@ -4253,7 +4253,7 @@ static int kvm_vm_ioctl_enable_cap(struct kvm *kvm, 
		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;

include/uapi/linux/kvm.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

tools/include/uapi/linux/kvm.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */