GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kvm: commonize allocation of the new memory slots

Browse source 
The two kmemdup invocations can be unified.  I find that the new
placement of the comment makes it easier to see what happens.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-11-14 10:46:45 +01:00
parent 8593176c67
commit f2a8103651
1 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
virt/kvm/kvm_main.c
View file

@ -866,11 +866,12 @@ int __kvm_set_memory_region(struct kvm *kvm,
goto out_free; goto out_free;
} }
if ((change == KVM_MR_DELETE) || (change == KVM_MR_MOVE)) {
slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots), slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
GFP_KERNEL); GFP_KERNEL);
if (!slots) if (!slots)
goto out_free; goto out_free;
if ((change == KVM_MR_DELETE) || (change == KVM_MR_MOVE)) {
slot = id_to_memslot(slots, mem->slot); slot = id_to_memslot(slots, mem->slot);
slot->flags |= KVM_MEMSLOT_INVALID; slot->flags |= KVM_MEMSLOT_INVALID;
@ -886,6 +887,12 @@ int __kvm_set_memory_region(struct kvm *kvm,
* - kvm_is_visible_gfn (mmu_check_roots) * - kvm_is_visible_gfn (mmu_check_roots)
*/ */
kvm_arch_flush_shadow_memslot(kvm, slot); kvm_arch_flush_shadow_memslot(kvm, slot);
/*
* We can re-use the old_memslots from above, the only difference
* from the currently installed memslots is the invalid flag. This
* will get overwritten by update_memslots anyway.
*/
slots = old_memslots; slots = old_memslots;
} }
@ -893,19 +900,6 @@ int __kvm_set_memory_region(struct kvm *kvm,
if (r) if (r)
goto out_slots; goto out_slots;
r = -ENOMEM;
/*
* We can re-use the old_memslots from above, the only difference
* from the currently installed memslots is the invalid flag. This
* will get overwritten by update_memslots anyway.
*/
if (!slots) {
slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
GFP_KERNEL);
if (!slots)
goto out_free;
}
/* actual memory is freed via old in kvm_free_physmem_slot below */ /* actual memory is freed via old in kvm_free_physmem_slot below */
if (change == KVM_MR_DELETE) { if (change == KVM_MR_DELETE) {
new.dirty_bitmap = NULL; new.dirty_bitmap = NULL;