From: Carsten Otte <cotte@de.ibm.com>
Date: Wed, 4 Jan 2012 09:25:24 +0000 (+0100)
Subject: KVM: s390: ucontrol: disable in-kernel handling of SIE intercepts
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c0d744a9c8aae81b624e0650e6fbbbb83db1a145;p=openwrt%2Fstaging%2Fblogic.git

KVM: s390: ucontrol: disable in-kernel handling of SIE intercepts

This patch disables in-kernel handling of SIE intercepts for user
controlled virtual machines. All intercepts are passed to userspace
via KVM_EXIT_SIE exit reason just like SIE intercepts that cannot be
handled in-kernel for regular KVM guests.

Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index d6bc65aeb950..02510946864e 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -566,7 +566,10 @@ rerun_vcpu:
 		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)