diff options
| author | Paolo Bonzini | 2014-02-14 11:10:07 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2014-02-14 11:10:07 +0100 |
| commit | f18eb31f9df52c28ec86d18d72f66ef689878daa (patch) | |
| tree | 1e472c25551774897e54b143bab3f463f31cda43 /arch | |
| parent | KVM: async_pf: Add missing call for async page present (diff) | |
| parent | arm64: KVM: Add VGIC device control for arm64 (diff) | |
| download | kernel-qcow2-linux-f18eb31f9df52c28ec86d18d72f66ef689878daa.tar.gz kernel-qcow2-linux-f18eb31f9df52c28ec86d18d72f66ef689878daa.tar.xz kernel-qcow2-linux-f18eb31f9df52c28ec86d18d72f66ef689878daa.zip | |
Merge branch 'kvm-master' into kvm-queue
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/uapi/asm/kvm.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 495ab6f84a61..eaf54a30bedc 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -148,6 +148,15 @@ struct kvm_arch_memory_slot { #define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2) #define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2) +/* Device Control API: ARM VGIC */ +#define KVM_DEV_ARM_VGIC_GRP_ADDR 0 +#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 +#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS 2 +#define KVM_DEV_ARM_VGIC_CPUID_SHIFT 32 +#define KVM_DEV_ARM_VGIC_CPUID_MASK (0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT) +#define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0 +#define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT) + /* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24 #define KVM_ARM_IRQ_TYPE_MASK 0xff |