diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-04-30 21:29:14 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-04-30 21:29:14 +0200 |
| commit | da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8 (patch) | |
| tree | 6f357846ce6e69463973e2e902be2c0d6afbdabd /tools | |
| parent | c110ae578ca0a10064dfbda3d786d6a733b9fe69 (diff) | |
| parent | b2d0371d2e374facd45e115d3668086df13730ff (diff) | |
| download | linux-stable-da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8.tar.gz linux-stable-da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8.tar.bz2 linux-stable-da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8.zip | |
Merge tag 'kvm-s390-next-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Features and fixes for 5.2
- VSIE crypto fixes
- new guest features for gen15
- disable halt polling for nested virtualization with overcommit
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/arch/s390/include/uapi/asm/kvm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/arch/s390/include/uapi/asm/kvm.h b/tools/arch/s390/include/uapi/asm/kvm.h index 16511d97e8dc..09652eabe769 100644 --- a/tools/arch/s390/include/uapi/asm/kvm.h +++ b/tools/arch/s390/include/uapi/asm/kvm.h @@ -152,7 +152,8 @@ struct kvm_s390_vm_cpu_subfunc { __u8 pcc[16]; /* with MSA4 */ __u8 ppno[16]; /* with MSA5 */ __u8 kma[16]; /* with MSA8 */ - __u8 reserved[1808]; + __u8 kdsa[16]; /* with MSA9 */ + __u8 reserved[1792]; }; /* kvm attributes for crypto */ |