2 files changed, 9 insertions, 0 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index e5d082c4f3aa..00ff00dfb24c 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -174,6 +174,10 @@ struct kvm_s390_prefix_info {
         __u32 address;
 };
 
+struct kvm_s390_emerg_info {
+        __u16 code;
+};
+
 struct kvm_s390_interrupt_info {
         struct list_head list;
         u64     type;
@@ -181,6 +185,7 @@ struct kvm_s390_interrupt_info {
                 struct kvm_s390_io_info io;
                 struct kvm_s390_ext_info ext;
                 struct kvm_s390_pgm_info pgm;
+                struct kvm_s390_emerg_info emerg;
                 struct kvm_s390_prefix_info prefix;
         };
 };
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 35c21bf910c5..c9aeb4b4d0b8 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -128,6 +128,10 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu,
                 if (rc == -EFAULT)
                         exception = 1;
 
+                rc = put_guest_u16(vcpu, __LC_CPU_ADDRESS, inti->emerg.code);
+                if (rc == -EFAULT)
+                        exception = 1;
+
                 rc = copy_to_guest(vcpu, __LC_EXT_OLD_PSW,
                          &vcpu->arch.sie_block->gpsw, sizeof(psw_t));
                 if (rc == -EFAULT)