Commit e96c81ee authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Simplify kvm_free_memslot() and all its descendents 



Now that all callers of kvm_free_memslot() pass NULL for @dont, remove
the param from the top-level routine and all arch's implementations.

No functional change intended.

Tested-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5c0b4f3d

arch/mips/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ extern unsigned long kvm_mips_get_ramsize(struct kvm *kvm); 
static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_free_memslot(struct kvm *kvm,

		struct kvm_memory_slot *free, struct kvm_memory_slot *dont) {}

					 struct kvm_memory_slot *slot) {}

static inline void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}

static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}

arch/powerpc/include/asm/kvm_ppc.h

+2 −4
Original line number Diff line number Diff line
@@ -200,8 +200,7 @@ extern void kvm_free_hpt_cma(struct page *page, unsigned long nr_pages); 
extern int kvmppc_core_init_vm(struct kvm *kvm);

extern void kvmppc_core_destroy_vm(struct kvm *kvm);

extern void kvmppc_core_free_memslot(struct kvm *kvm,

				     struct kvm_memory_slot *free,

				     struct kvm_memory_slot *dont);

				     struct kvm_memory_slot *slot);

extern int kvmppc_core_prepare_memory_region(struct kvm *kvm,

				struct kvm_memory_slot *memslot,

				const struct kvm_userspace_memory_region *mem,
@@ -291,8 +290,7 @@ struct kvmppc_ops { 
	int (*test_age_hva)(struct kvm *kvm, unsigned long hva);

	void (*set_spte_hva)(struct kvm *kvm, unsigned long hva, pte_t pte);

	void (*mmu_destroy)(struct kvm_vcpu *vcpu);

	void (*free_memslot)(struct kvm_memory_slot *free,

			     struct kvm_memory_slot *dont);

	void (*free_memslot)(struct kvm_memory_slot *slot);

	int (*init_vm)(struct kvm *kvm);

	void (*destroy_vm)(struct kvm *kvm);

	int (*get_smmu_info)(struct kvm *kvm, struct kvm_ppc_smmu_info *info);

arch/powerpc/kvm/book3s.c

+2 −3
Original line number Diff line number Diff line
@@ -804,10 +804,9 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) 
	return kvm->arch.kvm_ops->get_dirty_log(kvm, log);

}



void kvmppc_core_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,

			      struct kvm_memory_slot *dont)

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

{

	kvm->arch.kvm_ops->free_memslot(free, dont);

	kvm->arch.kvm_ops->free_memslot(slot);

}



void kvmppc_core_flush_memslot(struct kvm *kvm, struct kvm_memory_slot *memslot)

arch/powerpc/kvm/book3s_hv.c

+3 −6
Original line number Diff line number Diff line
@@ -4447,13 +4447,10 @@ out: 
	return r;

}



static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *free,

					struct kvm_memory_slot *dont)

static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *slot)

{

	if (!dont || free->arch.rmap != dont->arch.rmap) {

		vfree(free->arch.rmap);

		free->arch.rmap = NULL;

	}

	vfree(slot->arch.rmap);

	slot->arch.rmap = NULL;

}



static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,

arch/powerpc/kvm/book3s_pr.c

+1 −2
Original line number Diff line number Diff line
@@ -1942,8 +1942,7 @@ static void kvmppc_core_commit_memory_region_pr(struct kvm *kvm, 
	return;

}



static void kvmppc_core_free_memslot_pr(struct kvm_memory_slot *free,

					struct kvm_memory_slot *dont)

static void kvmppc_core_free_memslot_pr(struct kvm_memory_slot *slot)

{

	return;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE