tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Paolo Bonzini <pbonzini@redhat.com>
+5
-7
+5
arch/arm64/include/uapi/asm/kvm.h
+5
arch/arm64/include/uapi/asm/kvm.h
···
162
162
__u64 device_irq_level;
163
163
};
164
164
165
+
/* Bits for run->s.regs.device_irq_level */
166
+
#define KVM_ARM_DEV_EL1_VTIMER (1 << 0)
167
+
#define KVM_ARM_DEV_EL1_PTIMER (1 << 1)
168
+
#define KVM_ARM_DEV_PMU (1 << 2)
169
+
165
170
/*
166
171
* PMU filter structure. Describe a range of events with a particular
167
172
* action. To be used with KVM_ARM_VCPU_PMU_V3_FILTER.
-7
include/uapi/linux/kvm.h
-7
include/uapi/linux/kvm.h
···
1384
1384
#define KVM_GET_SREGS2 _IOR(KVMIO, 0xcc, struct kvm_sregs2)
1385
1385
#define KVM_SET_SREGS2 _IOW(KVMIO, 0xcd, struct kvm_sregs2)
1386
1386
1387
-
/* Available with KVM_CAP_ARM_USER_IRQ */
1388
-
1389
-
/* Bits for run->s.regs.device_irq_level */
1390
-
#define KVM_ARM_DEV_EL1_VTIMER (1 << 0)
1391
-
#define KVM_ARM_DEV_EL1_PTIMER (1 << 1)
1392
-
#define KVM_ARM_DEV_PMU (1 << 2)
1393
-
1394
1387
#define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (1 << 0)
1395
1388
#define KVM_DIRTY_LOG_INITIALLY_SET (1 << 1)
1396
1389