From 7e7ab0b4043fc31041c4f4e45ef3a035e237c1d3 Mon Sep 17 00:00:00 2001 From: Carsten Otte Date: Wed, 4 Jan 2012 10:25:24 +0100 Subject: [PATCH] --- yaml --- r: 297052 b: refs/heads/master c: c0d744a9c8aae81b624e0650e6fbbbb83db1a145 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kvm/kvm-s390.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1be43d0d8d07..bc2db76a3f05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b1c1493afe8d69909f9df3221bb2fffdf479f4a +refs/heads/master: c0d744a9c8aae81b624e0650e6fbbbb83db1a145 diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c index d6bc65aeb950..02510946864e 100644 --- a/trunk/arch/s390/kvm/kvm-s390.c +++ b/trunk/arch/s390/kvm/kvm-s390.c @@ -566,7 +566,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) rc = __vcpu_run(vcpu); if (rc) break; - rc = kvm_handle_sie_intercept(vcpu); + if (kvm_is_ucontrol(vcpu->kvm)) + rc = -EOPNOTSUPP; + else + rc = kvm_handle_sie_intercept(vcpu); } while (!signal_pending(current) && !rc); if (rc == SIE_INTERCEPT_RERUNVCPU)