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

Commit 26535037 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: replace vmalloc and memset with vzalloc 



Let's use newly introduced vzalloc().

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent ec25d5e6

arch/powerpc/kvm/book3s.c

+1 −3
Original line number Diff line number Diff line
@@ -1307,12 +1307,10 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id) 
	int err = -ENOMEM;

	unsigned long p;



	vcpu_book3s = vmalloc(sizeof(struct kvmppc_vcpu_book3s));

	vcpu_book3s = vzalloc(sizeof(struct kvmppc_vcpu_book3s));

	if (!vcpu_book3s)

		goto out;



	memset(vcpu_book3s, 0, sizeof(struct kvmppc_vcpu_book3s));



	vcpu_book3s->shadow_vcpu = (struct kvmppc_book3s_shadow_vcpu *)

		kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL);

	if (!vcpu_book3s->shadow_vcpu)

virt/kvm/kvm_main.c

+2 −7
Original line number Diff line number Diff line
@@ -640,13 +640,11 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	/* Allocate if a slot is being created */

#ifndef CONFIG_S390

	if (npages && !new.rmap) {

		new.rmap = vmalloc(npages * sizeof(*new.rmap));

		new.rmap = vzalloc(npages * sizeof(*new.rmap));



		if (!new.rmap)

			goto out_free;



		memset(new.rmap, 0, npages * sizeof(*new.rmap));



		new.user_alloc = user_alloc;

		new.userspace_addr = mem->userspace_addr;

	}
@@ -669,14 +667,11 @@ int __kvm_set_memory_region(struct kvm *kvm, 
			     >> KVM_HPAGE_GFN_SHIFT(level));

		lpages -= base_gfn >> KVM_HPAGE_GFN_SHIFT(level);



		new.lpage_info[i] = vmalloc(lpages * sizeof(*new.lpage_info[i]));

		new.lpage_info[i] = vzalloc(lpages * sizeof(*new.lpage_info[i]));



		if (!new.lpage_info[i])

			goto out_free;



		memset(new.lpage_info[i], 0,

		       lpages * sizeof(*new.lpage_info[i]));



		if (base_gfn & (KVM_PAGES_PER_HPAGE(level) - 1))

			new.lpage_info[i][0].write_count = 1;

		if ((base_gfn+npages) & (KVM_PAGES_PER_HPAGE(level) - 1))