diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-03 20:19:13 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-03 20:19:13 +0200 |
| commit | f3633c2683545213de4a00a9b0c3fba741321fb2 (patch) | |
| tree | 72855284c8b9e080bfa765f01bfbfda55305e422 /arch/s390/include/asm/kvm_host.h | |
| parent | KVM: SVM: Fix sev_pin_memory() error handling (diff) | |
| parent | s390/kvm: diagnose 0x318 sync and reset (diff) | |
| download | linux-f3633c2683545213de4a00a9b0c3fba741321fb2.tar.xz linux-f3633c2683545213de4a00a9b0c3fba741321fb2.zip | |
Merge tag 'kvm-s390-next-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next-5.6
KVM: s390: Enhancement for 5.9
- implement diagnose 318
Diffstat (limited to 'arch/s390/include/asm/kvm_host.h')
| -rw-r--r-- | arch/s390/include/asm/kvm_host.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 6ea0820e7c7f..463c24e26000 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -260,7 +260,8 @@ struct kvm_s390_sie_block { __u32 scaol; /* 0x0064 */ __u8 sdf; /* 0x0068 */ __u8 epdx; /* 0x0069 */ - __u8 reserved6a[2]; /* 0x006a */ + __u8 cpnc; /* 0x006a */ + __u8 reserved6b; /* 0x006b */ __u32 todpr; /* 0x006c */ #define GISA_FORMAT1 0x00000001 __u32 gd; /* 0x0070 */ @@ -745,6 +746,7 @@ struct kvm_vcpu_arch { bool gs_enabled; bool skey_enabled; struct kvm_s390_pv_vcpu pv; + union diag318_info diag318_info; }; struct kvm_vm_stat { |