diff options
| author | Ard Biesheuvel | 2014-11-17 19:28:18 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-11-18 12:24:31 +0100 |
| commit | 444b1996cb3769d8636b223c281fb09ab89b7a31 (patch) | |
| tree | 016828095e3c111100a89797e3b7a8cb2d944151 /linux-headers/asm-arm | |
| parent | exec: Handle multipage ranges in invalidate_and_set_dirty() (diff) | |
| download | qemu-444b1996cb3769d8636b223c281fb09ab89b7a31.tar.gz qemu-444b1996cb3769d8636b223c281fb09ab89b7a31.tar.xz qemu-444b1996cb3769d8636b223c281fb09ab89b7a31.zip | |
linux-headers: update to 3.18-rc5
This updates the Linux header to version 3.18-rc5, adding support for
(among other things) read-only memslots on ARM and arm64.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Message-id: 1416248898-6302-1-git-send-email-ard.biesheuvel@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/asm-arm')
| -rw-r--r-- | linux-headers/asm-arm/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h index e6ebdd3471..09ee408c1a 100644 --- a/linux-headers/asm-arm/kvm.h +++ b/linux-headers/asm-arm/kvm.h @@ -25,6 +25,7 @@ #define __KVM_HAVE_GUEST_DEBUG #define __KVM_HAVE_IRQ_LINE +#define __KVM_HAVE_READONLY_MEM #define KVM_REG_SIZE(id) \ (1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT)) @@ -173,6 +174,7 @@ struct kvm_arch_memory_slot { #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) +#define KVM_DEV_ARM_VGIC_GRP_NR_IRQS 3 /* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24 |