diff options
| author | Alexander Graf <agraf@suse.de> | 2013-04-04 15:40:44 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-04-26 23:02:40 +0200 |
| commit | cae7f586419ad261f55ef8700bf8f3fa5b4879d4 (patch) | |
| tree | 17ee19206bba8f4f8740ec94613fe4f884345a8a /linux-headers | |
| parent | 752d634ecc74c76eb5e32db0e536d84c2d6aa3d8 (diff) | |
| download | qemu-cae7f586419ad261f55ef8700bf8f3fa5b4879d4.zip qemu-cae7f586419ad261f55ef8700bf8f3fa5b4879d4.tar.gz qemu-cae7f586419ad261f55ef8700bf8f3fa5b4879d4.tar.bz2 | |
linux-headers: Update to kvm/queue
Based on kvm.git queue branch with commit e1e2e605.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'linux-headers')
| -rw-r--r-- | linux-headers/asm-powerpc/kvm.h | 5 | ||||
| -rw-r--r-- | linux-headers/linux/kvm.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/linux-headers/asm-powerpc/kvm.h b/linux-headers/asm-powerpc/kvm.h index 16064d0..ef072b1 100644 --- a/linux-headers/asm-powerpc/kvm.h +++ b/linux-headers/asm-powerpc/kvm.h @@ -417,4 +417,9 @@ struct kvm_get_htab_header { #define KVM_REG_PPC_EPCR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x85) #define KVM_REG_PPC_EPR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x86) +/* Timer Status Register OR/CLEAR interface */ +#define KVM_REG_PPC_OR_TSR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x87) +#define KVM_REG_PPC_CLEAR_TSR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x88) +#define KVM_REG_PPC_TCR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x89) +#define KVM_REG_PPC_TSR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x8a) #endif /* __LINUX_KVM_POWERPC_H */ diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index caca979..eb02d8a 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -449,12 +449,15 @@ enum { kvm_ioeventfd_flag_nr_datamatch, kvm_ioeventfd_flag_nr_pio, kvm_ioeventfd_flag_nr_deassign, + kvm_ioeventfd_flag_nr_virtio_ccw_notify, kvm_ioeventfd_flag_nr_max, }; #define KVM_IOEVENTFD_FLAG_DATAMATCH (1 << kvm_ioeventfd_flag_nr_datamatch) #define KVM_IOEVENTFD_FLAG_PIO (1 << kvm_ioeventfd_flag_nr_pio) #define KVM_IOEVENTFD_FLAG_DEASSIGN (1 << kvm_ioeventfd_flag_nr_deassign) +#define KVM_IOEVENTFD_FLAG_VIRTIO_CCW_NOTIFY \ + (1 << kvm_ioeventfd_flag_nr_virtio_ccw_notify) #define KVM_IOEVENTFD_VALID_FLAG_MASK ((1 << kvm_ioeventfd_flag_nr_max) - 1) |