Commit 45882241 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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



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

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 882dd4ae

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

+4 −4
Original line number Diff line number Diff line
@@ -76,10 +76,10 @@ struct kvm_regs { 


/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */

#define KVM_ARM_DEVICE_TYPE_SHIFT	0

#define KVM_ARM_DEVICE_TYPE_MASK	GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

#define KVM_ARM_DEVICE_TYPE_MASK	__GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

						  KVM_ARM_DEVICE_TYPE_SHIFT)

#define KVM_ARM_DEVICE_ID_SHIFT		16

#define KVM_ARM_DEVICE_ID_MASK		GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

#define KVM_ARM_DEVICE_ID_MASK		__GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

						  KVM_ARM_DEVICE_ID_SHIFT)



/* Supported device IDs */

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

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



#include <linux/const.h>

#include <linux/bits.h>

#include <linux/types.h>

#include <linux/ioctl.h>

#include <linux/stddef.h>
@@ -550,9 +551,9 @@ struct kvm_pmu_event_filter { 
	((__u64)(!!(exclude)) << 55))



#define KVM_PMU_MASKED_ENTRY_EVENT_SELECT \

	(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))

	(__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		(_BITULL(55))

#define KVM_PMU_MASKED_ENTRY_UMASK_MASK_SHIFT	(56)

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct kvm_clock_pairing { 
#define KVM_ASYNC_PF_DELIVERY_AS_INT		(1 << 3)



/* MSR_KVM_ASYNC_PF_INT */

#define KVM_ASYNC_PF_VEC_MASK			GENMASK(7, 0)

#define KVM_ASYNC_PF_VEC_MASK			__GENMASK(7, 0)



/* MSR_KVM_MIGRATION_CONTROL */

#define KVM_MIGRATION_READY		(1 << 0)