|
@@ -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))
|