diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-16 14:39:46 +0100 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-16 14:39:46 +0100 |
commit | a6014f1ab7088dc02b58991cfb6b32a34afdbf12 (patch) | |
tree | 9076c27473660cd1ede44be8c8c5835836114e1b /include/uapi | |
parent | 61d750773df388632b11a6170098e2865977e1f6 (diff) | |
parent | da9a1446d248f673a8560ce46251ff620214ab7b (diff) | |
download | linux-a6014f1ab7088dc02b58991cfb6b32a34afdbf12.tar.gz linux-a6014f1ab7088dc02b58991cfb6b32a34afdbf12.tar.bz2 linux-a6014f1ab7088dc02b58991cfb6b32a34afdbf12.zip |
Merge tag 'kvm-s390-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: fixes and improvements for 4.15
- Some initial preparation patches for exitless interrupts and crypto
- New capability for AIS migration
- Fixes
- merge of the sthyi tree from the base s390 team, which moves the sthyi
out of KVM into a shared function also for non-KVM
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 838887587411..b60595696836 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -930,6 +930,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_PPC_SMT_POSSIBLE 147 #define KVM_CAP_HYPERV_SYNIC2 148 #define KVM_CAP_HYPERV_VP_INDEX 149 +#define KVM_CAP_S390_AIS_MIGRATION 150 #ifdef KVM_CAP_IRQ_ROUTING |