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

Commit b110feaf authored by Michael Mueller's avatar Michael Mueller Committed by Paolo Bonzini
Browse files

KVM: s390: code cleanup to use common vcpu slab cache 



cleanup of arch specific code to use common code provided vcpu slab cache
instead of kzalloc() provided memory

Signed-off-by: default avatarMichael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 69d0d3a3

arch/s390/kvm/kvm-s390.c

+3 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 


	free_page((unsigned long)(vcpu->arch.sie_block));

	kvm_vcpu_uninit(vcpu);

	kfree(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}



static void kvm_free_vcpus(struct kvm *kvm)
@@ -408,7 +408,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, 


	rc = -ENOMEM;



	vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL);

	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);

	if (!vcpu)

		goto out;
@@ -453,7 +453,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, 
out_free_sie_block:

	free_page((unsigned long)(vcpu->arch.sie_block));

out_free_cpu:

	kfree(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

out:

	return ERR_PTR(rc);

}