1 files changed, 5 insertions, 0 deletions

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 35c21bf910c..d4bd4c73faa 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)
@@ -220,6 +224,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu,
                         offsetof(struct _lowcore, restart_psw), sizeof(psw_t));
                 if (rc == -EFAULT)
                         exception = 1;
+                atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
                 break;
 
         case KVM_S390_PROGRAM_INT: