Commit 09170a49 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: const-ify uses of struct kvm_userspace_memory_region 



Architecture-specific helpers are not supposed to muck with
struct kvm_userspace_memory_region contents.  Add const to
enforce this.

In order to eliminate the only write in __kvm_set_memory_region,
the cleaning of deleted slots is pulled up from update_memslots
to __kvm_set_memory_region.

Reviewed-by: default avatarTakuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Reviewed-by: default avatarRadim Krcmar <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9f6b8029

arch/arm/kvm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1719,7 +1719,7 @@ int kvm_mmu_init(void) 
}



void kvm_arch_commit_memory_region(struct kvm *kvm,

				   struct kvm_userspace_memory_region *mem,

				   const struct kvm_userspace_memory_region *mem,

				   const struct kvm_memory_slot *old,

				   enum kvm_mr_change change)

{
@@ -1734,7 +1734,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 


int kvm_arch_prepare_memory_region(struct kvm *kvm,

				   struct kvm_memory_slot *memslot,

				   struct kvm_userspace_memory_region *mem,

				   const struct kvm_userspace_memory_region *mem,

				   enum kvm_mr_change change)

{

	hva_t hva = mem->userspace_addr;

arch/mips/kvm/mips.c

+2 −2
Original line number Diff line number Diff line
@@ -198,14 +198,14 @@ int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot, 


int kvm_arch_prepare_memory_region(struct kvm *kvm,

				   struct kvm_memory_slot *memslot,

				   struct kvm_userspace_memory_region *mem,

				   const struct kvm_userspace_memory_region *mem,

				   enum kvm_mr_change change)

{

	return 0;

}



void kvm_arch_commit_memory_region(struct kvm *kvm,

				   struct kvm_userspace_memory_region *mem,

				   const struct kvm_userspace_memory_region *mem,

				   const struct kvm_memory_slot *old,

				   enum kvm_mr_change change)

{

arch/powerpc/include/asm/kvm_ppc.h

+4 −4
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ extern int kvmppc_core_create_memslot(struct kvm *kvm, 
				      unsigned long npages);

extern int kvmppc_core_prepare_memory_region(struct kvm *kvm,

				struct kvm_memory_slot *memslot,

				struct kvm_userspace_memory_region *mem);

				const struct kvm_userspace_memory_region *mem);

extern void kvmppc_core_commit_memory_region(struct kvm *kvm,

				struct kvm_userspace_memory_region *mem,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old);

extern int kvm_vm_ioctl_get_smmu_info(struct kvm *kvm,

				      struct kvm_ppc_smmu_info *info);
@@ -243,9 +243,9 @@ struct kvmppc_ops { 
	void (*flush_memslot)(struct kvm *kvm, struct kvm_memory_slot *memslot);

	int (*prepare_memory_region)(struct kvm *kvm,

				     struct kvm_memory_slot *memslot,

				     struct kvm_userspace_memory_region *mem);

				     const struct kvm_userspace_memory_region *mem);

	void (*commit_memory_region)(struct kvm *kvm,

				     struct kvm_userspace_memory_region *mem,

				     const struct kvm_userspace_memory_region *mem,

				     const struct kvm_memory_slot *old);

	int (*unmap_hva)(struct kvm *kvm, unsigned long hva);

	int (*unmap_hva_range)(struct kvm *kvm, unsigned long start,

arch/powerpc/kvm/book3s.c

+2 −2
Original line number Diff line number Diff line
@@ -757,13 +757,13 @@ void kvmppc_core_flush_memslot(struct kvm *kvm, struct kvm_memory_slot *memslot) 


int kvmppc_core_prepare_memory_region(struct kvm *kvm,

				struct kvm_memory_slot *memslot,

				struct kvm_userspace_memory_region *mem)

				const struct kvm_userspace_memory_region *mem)

{

	return kvm->arch.kvm_ops->prepare_memory_region(kvm, memslot, mem);

}



void kvmppc_core_commit_memory_region(struct kvm *kvm,

				struct kvm_userspace_memory_region *mem,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old)

{

	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old);

arch/powerpc/kvm/book3s_hv.c

+2 −2
Original line number Diff line number Diff line
@@ -2376,13 +2376,13 @@ static int kvmppc_core_create_memslot_hv(struct kvm_memory_slot *slot, 


static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,

					struct kvm_memory_slot *memslot,

					struct kvm_userspace_memory_region *mem)

					const struct kvm_userspace_memory_region *mem)

{

	return 0;

}



static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,

				struct kvm_userspace_memory_region *mem,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old)

{

	unsigned long npages = mem->memory_size >> PAGE_SHIFT;