Commit 882dd4ae authored by Dionna Glaze's avatar Dionna Glaze Committed by Paolo Bonzini
Browse files

kvm: x86: use a uapi-friendly macro for BIT 



Change uapi header uses of BIT to instead use the uapi/linux/const.h bit
macros, since BIT is not defined in uapi headers.

The PMU mask uses _BITUL since it targets a 32 bit flag field, whereas
the longmode definition is meant for a 64 bit flag field.

Cc: Sean Christophersen <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: default avatarDionna Glaze <dionnaglaze@google.com>
Message-Id: <20231207001142.3617856-1-dionnaglaze@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3c7a8e19

arch/x86/include/uapi/asm/kvm.h

+4 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *

 */



#include <linux/const.h>

#include <linux/types.h>

#include <linux/ioctl.h>

#include <linux/stddef.h>
@@ -526,7 +527,7 @@ struct kvm_pmu_event_filter { 
#define KVM_PMU_EVENT_ALLOW 0

#define KVM_PMU_EVENT_DENY 1



#define KVM_PMU_EVENT_FLAG_MASKED_EVENTS BIT(0)

#define KVM_PMU_EVENT_FLAG_MASKED_EVENTS _BITUL(0)

#define KVM_PMU_EVENT_FLAGS_VALID_MASK (KVM_PMU_EVENT_FLAG_MASKED_EVENTS)



/*
@@ -552,7 +553,7 @@ struct kvm_pmu_event_filter { 
	(GENMASK_ULL(7, 0) | GENMASK_ULL(35, 32))

#define KVM_PMU_MASKED_ENTRY_UMASK_MASK		(GENMASK_ULL(63, 56))

#define KVM_PMU_MASKED_ENTRY_UMASK_MATCH	(GENMASK_ULL(15, 8))

#define KVM_PMU_MASKED_ENTRY_EXCLUDE		(BIT_ULL(55))

#define KVM_PMU_MASKED_ENTRY_EXCLUDE		(_BITULL(55))

#define KVM_PMU_MASKED_ENTRY_UMASK_MASK_SHIFT	(56)



/* for KVM_{GET,SET,HAS}_DEVICE_ATTR */
@@ -560,7 +561,7 @@ struct kvm_pmu_event_filter { 
#define   KVM_VCPU_TSC_OFFSET 0 /* attribute for the TSC offset */



/* x86-specific KVM_EXIT_HYPERCALL flags. */

#define KVM_EXIT_HYPERCALL_LONG_MODE	BIT(0)

#define KVM_EXIT_HYPERCALL_LONG_MODE	_BITULL(0)



#define KVM_X86_DEFAULT_VM	0

#define KVM_X86_SW_PROTECTED_VM	1