Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb5bf93f authored by Michael Mueller's avatar Michael Mueller Committed by Christian Borntraeger
Browse files

KVM: s390: non-LPAR case obsolete during facilities mask init 



With patch "include guest facilities in kvm facility test" it is no
longer necessary to have special handling for the non-LPAR case.

Signed-off-by: default avatarMichael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 981467c9

arch/s390/kvm/kvm-s390.c

+1 −16
Original line number Diff line number Diff line
@@ -902,24 +902,9 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	if (!kvm->arch.model.fac)

		goto out_nofac;



	/* Populate the facility mask initially. */

	memcpy(kvm->arch.model.fac->mask, S390_lowcore.stfle_fac_list,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);



	/*

	 * If this KVM host runs *not* in a LPAR, relax the facility bits

	 * of the kvm facility mask by all missing facilities. This will allow

	 * to determine the right CPU model by means of the remaining facilities.

	 * Live guest migration must prohibit the migration of KVMs running in

	 * a LPAR to non LPAR hosts.

	 */

	if (!MACHINE_IS_LPAR)

		for (i = 0; i < kvm_s390_fac_list_mask_size(); i++)

			kvm_s390_fac_list_mask[i] &= kvm->arch.model.fac->mask[i];



	/*

	 * Apply the kvm facility mask to limit the kvm supported/tolerated

	 * facility list.

	 */

	for (i = 0; i < S390_ARCH_FAC_LIST_SIZE_U64; i++) {

		if (i < kvm_s390_fac_list_mask_size())

			kvm->arch.model.fac->mask[i] &= kvm_s390_fac_list_mask[i];