Commit 5587027c authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Alexander Graf
Browse files

kvm: Add struct kvm arg to memslot APIs 



We will use that in the later patch to find the kvm ops handler

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 2ba9f0d8

arch/arm/kvm/arm.c

+3 −2
Original line number Diff line number Diff line
@@ -152,12 +152,13 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) 
	return VM_FAULT_SIGBUS;

}



void kvm_arch_free_memslot(struct kvm_memory_slot *free,

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_memory_slot *slot, unsigned long npages)

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

			    unsigned long npages)

{

	return 0;

}

arch/ia64/kvm/kvm-ia64.c

+3 −2
Original line number Diff line number Diff line
@@ -1550,12 +1550,13 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) 
	return VM_FAULT_SIGBUS;

}



void kvm_arch_free_memslot(struct kvm_memory_slot *free,

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_memory_slot *slot, unsigned long npages)

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

			    unsigned long npages)

{

	return 0;

}

arch/mips/kvm/kvm_mips.c

+3 −2
Original line number Diff line number Diff line
@@ -198,12 +198,13 @@ kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) 
	return -ENOIOCTLCMD;

}



void kvm_arch_free_memslot(struct kvm_memory_slot *free,

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_memory_slot *slot, unsigned long npages)

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

			    unsigned long npages)

{

	return 0;

}

arch/powerpc/include/asm/kvm_ppc.h

+4 −2
Original line number Diff line number Diff line
@@ -134,9 +134,11 @@ extern struct page *kvm_alloc_hpt(unsigned long nr_pages); 
extern void kvm_release_hpt(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_memory_slot *free,

extern void kvmppc_core_free_memslot(struct kvm *kvm,

				     struct kvm_memory_slot *free,

				     struct kvm_memory_slot *dont);

extern int kvmppc_core_create_memslot(struct kvm_memory_slot *slot,

extern int kvmppc_core_create_memslot(struct kvm *kvm,

				      struct kvm_memory_slot *slot,

				      unsigned long npages);

extern int kvmppc_core_prepare_memory_region(struct kvm *kvm,

				struct kvm_memory_slot *memslot,

arch/powerpc/kvm/book3s.c

+2 −2
Original line number Diff line number Diff line
@@ -761,13 +761,13 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) 
	return kvmppc_ops->get_dirty_log(kvm, log);

}



void kvmppc_core_free_memslot(struct kvm_memory_slot *free,

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

			      struct kvm_memory_slot *dont)

{

	kvmppc_ops->free_memslot(free, dont);

}



int kvmppc_core_create_memslot(struct kvm_memory_slot *slot,

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

			       unsigned long npages)

{

	return kvmppc_ops->create_memslot(slot, npages);