diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-11 20:54:40 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-11 20:54:40 +0200 |
| commit | f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04 (patch) | |
| tree | f73da1077b7053b24a9af2d8e34b6180d5d5217e /include/uapi/linux/kvm.h | |
| parent | 28d06353881939703c34d82a1465136af176c620 (diff) | |
| parent | 47a4693e1d3eb09e523c223753fb5a97721f49b8 (diff) | |
Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
From: Christian Borntraeger <borntraeger@de.ibm.com>
KVM: s390: features for 4.12
1. guarded storage support for guests
This contains an s390 base Linux feature branch that is necessary
to implement the KVM part
2. Provide an interface to implement adapter interruption suppression
which is necessary for proper zPCI support
3. Use more defines instead of numbers
4. Provide logging for lazy enablement of runtime instrumentation
Diffstat (limited to 'include/uapi/linux/kvm.h')
| -rw-r--r-- | include/uapi/linux/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 1e1a6c728a18..6180ea50e9ef 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -890,6 +890,8 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_MIPS_VZ 137 #define KVM_CAP_MIPS_TE 138 #define KVM_CAP_MIPS_64BIT 139 +#define KVM_CAP_S390_GS 140 +#define KVM_CAP_S390_AIS 141 #ifdef KVM_CAP_IRQ_ROUTING |