Commit c9b929b3 authored by Ben Gardon's avatar Ben Gardon Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Deduplicate rmap freeing 



Small code deduplication. No functional change expected.

Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>

Signed-off-by: default avatarBen Gardon <bgardon@google.com>
Message-Id: <20210518173414.450044-2-bgardon@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 89212919

arch/x86/kvm/x86.c

+11 −8
Original line number Diff line number Diff line
@@ -10917,17 +10917,23 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
	kvm_hv_destroy_vm(kvm);

}



void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)

static void memslot_rmap_free(struct kvm_memory_slot *slot)

{

	int i;



	for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {

		kvfree(slot->arch.rmap[i]);

		slot->arch.rmap[i] = NULL;

	}

}



		if (i == 0)

			continue;

void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)

{

	int i;



	memslot_rmap_free(slot);



	for (i = 1; i < KVM_NR_PAGE_SIZES; ++i) {

		kvfree(slot->arch.lpage_info[i - 1]);

		slot->arch.lpage_info[i - 1] = NULL;

	}
@@ -10993,12 +10999,9 @@ static int kvm_alloc_memslot_metadata(struct kvm_memory_slot *slot, 
	return 0;



out_free:

	for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {

		kvfree(slot->arch.rmap[i]);

		slot->arch.rmap[i] = NULL;

		if (i == 0)

			continue;

	memslot_rmap_free(slot);



	for (i = 1; i < KVM_NR_PAGE_SIZES; ++i) {

		kvfree(slot->arch.lpage_info[i - 1]);

		slot->arch.lpage_info[i - 1] = NULL;

	}