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

KVM: Drop kvm_arch_create_memslot() 



Remove kvm_arch_create_memslot() now that all arch implementations are
effectively nops.  Removing kvm_arch_create_memslot() eliminates the
possibility for arch specific code to allocate memory prior to setting
a memslot, which sets the stage for simplifying kvm_free_memslot().

Cc: Janosch Frank <frankja@linux.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.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 0dab98b7

arch/mips/kvm/mips.c

+0 −6
Original line number Diff line number Diff line
@@ -188,12 +188,6 @@ long kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl, 
	return -ENOIOCTLCMD;

}



int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}



void kvm_arch_flush_shadow_all(struct kvm *kvm)

{

	/* Flush whole GPA */

arch/powerpc/kvm/powerpc.c

+0 −6
Original line number Diff line number Diff line
@@ -691,12 +691,6 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free, 
	kvmppc_core_free_memslot(kvm, free, dont);

}



int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}



int kvm_arch_prepare_memory_region(struct kvm *kvm,

				   struct kvm_memory_slot *memslot,

				   const struct kvm_userspace_memory_region *mem,

arch/s390/kvm/kvm-s390.c

+0 −6
Original line number Diff line number Diff line
@@ -4507,12 +4507,6 @@ vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) 
	return VM_FAULT_SIGBUS;

}



int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}



/* Section: memory related */

int kvm_arch_prepare_memory_region(struct kvm *kvm,

				   struct kvm_memory_slot *memslot,

arch/x86/kvm/x86.c

+0 −6
Original line number Diff line number Diff line
@@ -9873,12 +9873,6 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free, 
	kvm_page_track_free_memslot(free, dont);

}



int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}



static int kvm_alloc_memslot_metadata(struct kvm_memory_slot *slot,

				      unsigned long npages)

{

include/linux/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -671,8 +671,6 @@ int __kvm_set_memory_region(struct kvm *kvm, 
			    const struct kvm_userspace_memory_region *mem);

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

			   struct kvm_memory_slot *dont);

int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages);

void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen);

int kvm_arch_prepare_memory_region(struct kvm *kvm,

				struct kvm_memory_slot *memslot,

CRA Git | Maintained and supported by SUSTech CRA and CCSE