From: David Hildenbrand <dahi@linux.vnet.ibm.com>
Date: Mon, 12 Oct 2015 10:57:22 +0000 (+0200)
Subject: KVM: s390: don't switch to ESCA for ucontrol
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4215825eeb1f704d1bd327ca01fb753b53ea34d3;p=openwrt%2Fstaging%2Fblogic.git

KVM: s390: don't switch to ESCA for ucontrol

sca_add_vpcu is not called for ucontrol guests. We must also not
apply the sca checking for sca_can_add_vcpu as ucontrol guests
do not have to follow the sca limits.

As common code already checks that id < KVM_MAX_VCPUS all other
data structures are safe as well.

Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index d9d71bb91404..539d3857a59a 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1588,7 +1588,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 	struct sie_page *sie_page;
 	int rc = -EINVAL;
 
-	if (!sca_can_add_vcpu(kvm, id))
+	if (!kvm_is_ucontrol(kvm) && !sca_can_add_vcpu(kvm, id))
 		goto out;
 
 	rc = -ENOMEM;