diff options
| author | Alexander Graf | 2012-06-12 11:15:23 +0200 |
|---|---|---|
| committer | Alexander Graf | 2012-06-18 15:32:45 +0200 |
| commit | 2a60dba43cbf607c2d8ac3f30d5515267b4739b2 (patch) | |
| tree | 2e4e014975e452d263774aea04facfa718eb97c9 /linux-headers | |
| parent | s390x: fix s390 virtio aliases (diff) | |
| download | qemu-2a60dba43cbf607c2d8ac3f30d5515267b4739b2.tar.gz qemu-2a60dba43cbf607c2d8ac3f30d5515267b4739b2.tar.xz qemu-2a60dba43cbf607c2d8ac3f30d5515267b4739b2.zip | |
kvm: Update kernel headers
Corresponding kvm.git hash: 4e3c8a1b1c
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'linux-headers')
| -rw-r--r-- | linux-headers/asm-s390/kvm.h | 5 | ||||
| -rw-r--r-- | linux-headers/linux/kvm.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h index 96076676e2..bdcbe0f8dd 100644 --- a/linux-headers/asm-s390/kvm.h +++ b/linux-headers/asm-s390/kvm.h @@ -52,4 +52,9 @@ struct kvm_sync_regs { __u32 acrs[16]; /* access registers */ __u64 crs[16]; /* control registers */ }; + +#define KVM_REG_S390_TODPR (KVM_REG_S390 | KVM_REG_SIZE_U32 | 0x1) +#define KVM_REG_S390_EPOCHDIFF (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x2) +#define KVM_REG_S390_CPU_TIMER (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x3) +#define KVM_REG_S390_CLOCK_COMP (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x4) #endif diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index c4426ec73d..5a9d4e350d 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -616,6 +616,7 @@ struct kvm_ppc_smmu_info { #define KVM_CAP_KVMCLOCK_CTRL 76 #define KVM_CAP_SIGNAL_MSI 77 #define KVM_CAP_PPC_GET_SMMU_INFO 78 +#define KVM_CAP_S390_COW 79 #ifdef KVM_CAP_IRQ_ROUTING |