Commit 4215825e authored Oct 12, 2015 by David Hildenbrand Committed by Christian Borntraeger Nov 30, 2015

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>

parent eaa78f34

arch/s390/kvm/kvm-s390.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message