Re: [PATCH 49/49] virt/kvm/kvm_main.c: Use vzalloc

[Takuya Yoshikawa]

(2010/11/05 12:08), Joe Perches wrote:
> Signed-off-by: Joe Perches<joe@xxxxxxxxxxx>
> ---
>   virt/kvm/kvm_main.c |   13 +++----------
>   1 files changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c

Already changed to vzalloc(), see kvm.git.

Takuya


> index 5225052..c2a08e6e 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -604,13 +604,10 @@ 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;
>   	}
> @@ -633,14 +630,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))
> @@ -663,10 +657,9 @@ skip_lpage:
>   	if ((new.flags&  KVM_MEM_LOG_DIRTY_PAGES)&&  !new.dirty_bitmap) {
>   		unsigned long dirty_bytes = kvm_dirty_bitmap_bytes(&new);
> 
> -		new.dirty_bitmap = vmalloc(dirty_bytes);
> +		new.dirty_bitmap = vzalloc(dirty_bytes);
>   		if (!new.dirty_bitmap)
>   			goto out_free;
> -		memset(new.dirty_bitmap, 0, dirty_bytes);
>   		/* destroy any largepage mappings for dirty tracking */
>   		if (old.npages)
>   			flush_shadow = 1;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/