diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2016-08-15 18:25:52 +0200 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-07-14 12:29:10 +0200 |
| commit | 3272f0e22fefa4a364cdbdb01975f9178177ab37 (patch) | |
| tree | 72f512bebe05991d2c67f02bd4048f8ad4a2afa2 /linux-headers/asm-arm/kvm.h | |
| parent | 03f47ee49e1478b5ffffb3a9b6203c672903196c (diff) | |
| download | qemu-3272f0e22fefa4a364cdbdb01975f9178177ab37.zip qemu-3272f0e22fefa4a364cdbdb01975f9178177ab37.tar.gz qemu-3272f0e22fefa4a364cdbdb01975f9178177ab37.tar.bz2 | |
linux-headers: update to 4.13-rc0
commit af3c8d98508d37541d4bf57f13a984a7f73a328c
Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux
There is a change pending for v4.13-rc1 in linux-headers/linux/kvm.h
I will submit a fixup patch for 2.10 as soon as it hits the kernel.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'linux-headers/asm-arm/kvm.h')
| -rw-r--r-- | linux-headers/asm-arm/kvm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h index 7258a00..fa9fae8 100644 --- a/linux-headers/asm-arm/kvm.h +++ b/linux-headers/asm-arm/kvm.h @@ -203,6 +203,14 @@ struct kvm_arch_memory_slot { #define KVM_DEV_ARM_VGIC_LINE_LEVEL_INTID_MASK 0x3ff #define VGIC_LEVEL_INFO_LINE_LEVEL 0 +/* Device Control API on vcpu fd */ +#define KVM_ARM_VCPU_PMU_V3_CTRL 0 +#define KVM_ARM_VCPU_PMU_V3_IRQ 0 +#define KVM_ARM_VCPU_PMU_V3_INIT 1 +#define KVM_ARM_VCPU_TIMER_CTRL 1 +#define KVM_ARM_VCPU_TIMER_IRQ_VTIMER 0 +#define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1 + #define KVM_DEV_ARM_VGIC_CTRL_INIT 0 #define KVM_DEV_ARM_ITS_SAVE_TABLES 1 #define KVM_DEV_ARM_ITS_RESTORE_TABLES 2 |