2 files changed, 12 insertions, 1 deletions

diff --git a/include/asm-s390/kvm_host.h b/include/asm-s390/kvm_host.h
index 1c829bdf5889..f8204a4f2e02 100644
--- a/include/asm-s390/kvm_host.h
+++ b/include/asm-s390/kvm_host.h
@@ -94,7 +94,9 @@ struct sie_block {
         psw_t   gpsw;                   /* 0x0090 */
         __u64   gg14;                   /* 0x00a0 */
         __u64   gg15;                   /* 0x00a8 */
-        __u8    reservedb0[80];         /* 0x00b0 */
+        __u8    reservedb0[30];         /* 0x00b0 */
+        __u16   iprcc;                  /* 0x00ce */
+        __u8    reservedd0[48];         /* 0x00d0 */
         __u64   gcr[16];                /* 0x0100 */
         __u64   gbea;                   /* 0x0180 */
         __u8    reserved188[120];       /* 0x0188 */
@@ -134,6 +136,7 @@ struct kvm_vcpu_stat {
         u32 instruction_sigp_arch;
         u32 instruction_sigp_prefix;
         u32 instruction_sigp_restart;
+        u32 diagnose_44;
 };
 
 struct io_info {
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 029f0284a2fd..f04bb426618f 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -75,6 +75,7 @@ struct kvm_irqchip {
 #define KVM_EXIT_SET_TPR          11
 #define KVM_EXIT_TPR_ACCESS       12
 #define KVM_EXIT_S390_SIEIC       13
+#define KVM_EXIT_S390_RESET       14
 
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
@@ -147,6 +148,13 @@ struct kvm_run {
                         __u16 ipa;
                         __u32 ipb;
                 } s390_sieic;
+                /* KVM_EXIT_S390_RESET */
+#define KVM_S390_RESET_POR       1
+#define KVM_S390_RESET_CLEAR     2
+#define KVM_S390_RESET_SUBSYSTEM 4
+#define KVM_S390_RESET_CPU_INIT  8
+#define KVM_S390_RESET_IPL       16
+                __u64 s390_reset_flags;
                 /* Fix the size of the union. */
                 char padding[256];
         };