aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm/kvm-s390.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
-rw-r--r--arch/s390/kvm/kvm-s390.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 90d9d1ba258b..1d65f6277166 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -490,6 +490,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
490 490
491 vcpu_load(vcpu); 491 vcpu_load(vcpu);
492 492
493rerun_vcpu:
493 /* verify, that memory has been registered */ 494 /* verify, that memory has been registered */
494 if (!vcpu->kvm->arch.guest_memsize) { 495 if (!vcpu->kvm->arch.guest_memsize) {
495 vcpu_put(vcpu); 496 vcpu_put(vcpu);
@@ -509,6 +510,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
509 vcpu->arch.sie_block->gpsw.addr = kvm_run->s390_sieic.addr; 510 vcpu->arch.sie_block->gpsw.addr = kvm_run->s390_sieic.addr;
510 break; 511 break;
511 case KVM_EXIT_UNKNOWN: 512 case KVM_EXIT_UNKNOWN:
513 case KVM_EXIT_INTR:
512 case KVM_EXIT_S390_RESET: 514 case KVM_EXIT_S390_RESET:
513 break; 515 break;
514 default: 516 default:
@@ -522,6 +524,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
522 rc = kvm_handle_sie_intercept(vcpu); 524 rc = kvm_handle_sie_intercept(vcpu);
523 } while (!signal_pending(current) && !rc); 525 } while (!signal_pending(current) && !rc);
524 526
527 if (rc == SIE_INTERCEPT_RERUNVCPU)
528 goto rerun_vcpu;
529
525 if (signal_pending(current) && !rc) 530 if (signal_pending(current) && !rc)
526 rc = -EINTR; 531 rc = -EINTR;
527 532