Commit 5d9cb716 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: arm64: move ARM-specific defines to uapi/asm/kvm.h 



While this in principle breaks userspace code that mentions KVM_ARM_DEV_*
on architectures other than aarch64, this seems unlikely to be
a problem considering that run->s.regs.device_irq_level is only
defined on that architecture.

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

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

+5 −0
Original line number Diff line number Diff line
@@ -162,6 +162,11 @@ struct kvm_sync_regs { 
	__u64 device_irq_level;

};



/* Bits for run->s.regs.device_irq_level */

#define KVM_ARM_DEV_EL1_VTIMER		(1 << 0)

#define KVM_ARM_DEV_EL1_PTIMER		(1 << 1)

#define KVM_ARM_DEV_PMU			(1 << 2)



/*

 * PMU filter structure. Describe a range of events with a particular

 * action. To be used with KVM_ARM_VCPU_PMU_V3_FILTER.

include/uapi/linux/kvm.h

+0 −7
Original line number Diff line number Diff line
@@ -1384,13 +1384,6 @@ struct kvm_enc_region { 
#define KVM_GET_SREGS2             _IOR(KVMIO,  0xcc, struct kvm_sregs2)

#define KVM_SET_SREGS2             _IOW(KVMIO,  0xcd, struct kvm_sregs2)



/* Available with KVM_CAP_ARM_USER_IRQ */



/* Bits for run->s.regs.device_irq_level */

#define KVM_ARM_DEV_EL1_VTIMER		(1 << 0)

#define KVM_ARM_DEV_EL1_PTIMER		(1 << 1)

#define KVM_ARM_DEV_PMU			(1 << 2)



#define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE    (1 << 0)

#define KVM_DIRTY_LOG_INITIALLY_SET            (1 << 1)