KVM: Drop "const" attribute from old memslot in commit_memory_region()

Sean Christopherson · bonzini · commit 9d4c197c0e94 · 2020-03-16T17:57:20.000+01:00
Drop the "const" attribute from @old in kvm_arch_commit_memory_region() to allow arch specific code to free arch specific resources in the old memslot without having to cast away the attribute. Freeing resources in kvm_arch_commit_memory_region() paves the way for simplifying kvm_free_memslot() by eliminating the last usage of its @dont param. Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
@@ -224,7 +224,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
 
 void kvm_arch_commit_memory_region(struct kvm *kvm,
 				   const struct kvm_userspace_memory_region *mem,
-				   const struct kvm_memory_slot *old,
+				   struct kvm_memory_slot *old,
 				   const struct kvm_memory_slot *new,
 				   enum kvm_mr_change change)
 {
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
@@ -701,7 +701,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
 
 void kvm_arch_commit_memory_region(struct kvm *kvm,
 				   const struct kvm_userspace_memory_region *mem,
-				   const struct kvm_memory_slot *old,
+				   struct kvm_memory_slot *old,
 				   const struct kvm_memory_slot *new,
 				   enum kvm_mr_change change)
 {
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
@@ -4532,7 +4532,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
 
 void kvm_arch_commit_memory_region(struct kvm *kvm,
 				const struct kvm_userspace_memory_region *mem,
-				const struct kvm_memory_slot *old,
+				struct kvm_memory_slot *old,
 				const struct kvm_memory_slot *new,
 				enum kvm_mr_change change)
 {
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
@@ -10024,7 +10024,7 @@ static void kvm_mmu_slot_apply_flags(struct kvm *kvm,
 
 void kvm_arch_commit_memory_region(struct kvm *kvm,
 				const struct kvm_userspace_memory_region *mem,
-				const struct kvm_memory_slot *old,
+				struct kvm_memory_slot *old,
 				const struct kvm_memory_slot *new,
 				enum kvm_mr_change change)
 {
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
@@ -678,7 +678,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
 				enum kvm_mr_change change);
 void kvm_arch_commit_memory_region(struct kvm *kvm,
 				const struct kvm_userspace_memory_region *mem,
-				const struct kvm_memory_slot *old,
+				struct kvm_memory_slot *old,
 				const struct kvm_memory_slot *new,
 				enum kvm_mr_change change);
 bool kvm_largepages_enabled(void);
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
@@ -2251,7 +2251,7 @@ int kvm_mmu_init(void)
 
 void kvm_arch_commit_memory_region(struct kvm *kvm,
 				   const struct kvm_userspace_memory_region *mem,
-				   const struct kvm_memory_slot *old,
+				   struct kvm_memory_slot *old,
 				   const struct kvm_memory_slot *new,
 				   enum kvm_mr_change change)
 {
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
@@ -985,7 +985,7 @@ static struct kvm_memslots *install_new_memslots(struct kvm *kvm,
 
 static int kvm_set_memslot(struct kvm *kvm,
 			   const struct kvm_userspace_memory_region *mem,
-			   const struct kvm_memory_slot *old,
+			   struct kvm_memory_slot *old,
 			   struct kvm_memory_slot *new, int as_id,
 			   enum kvm_mr_change change)
 {

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,`
`224`	`224`
`225`	`225`	`void kvm_arch_commit_memory_region(struct kvm *kvm,`
`226`	`226`	`const struct kvm_userspace_memory_region *mem,`
`227`		`- const struct kvm_memory_slot *old,`
	`227`	`+ struct kvm_memory_slot *old,`
`228`	`228`	`const struct kvm_memory_slot *new,`
`229`	`229`	`enum kvm_mr_change change)`
`230`	`230`	`{`
Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,`
`701`	`701`
`702`	`702`	`void kvm_arch_commit_memory_region(struct kvm *kvm,`
`703`	`703`	`const struct kvm_userspace_memory_region *mem,`
`704`		`- const struct kvm_memory_slot *old,`
	`704`	`+ struct kvm_memory_slot *old,`
`705`	`705`	`const struct kvm_memory_slot *new,`
`706`	`706`	`enum kvm_mr_change change)`
`707`	`707`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4532,7 +4532,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,`
`4532`	`4532`
`4533`	`4533`	`void kvm_arch_commit_memory_region(struct kvm *kvm,`
`4534`	`4534`	`const struct kvm_userspace_memory_region *mem,`
`4535`		`- const struct kvm_memory_slot *old,`
	`4535`	`+ struct kvm_memory_slot *old,`
`4536`	`4536`	`const struct kvm_memory_slot *new,`
`4537`	`4537`	`enum kvm_mr_change change)`
`4538`	`4538`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10024,7 +10024,7 @@ static void kvm_mmu_slot_apply_flags(struct kvm *kvm,`
`10024`	`10024`
`10025`	`10025`	`void kvm_arch_commit_memory_region(struct kvm *kvm,`
`10026`	`10026`	`const struct kvm_userspace_memory_region *mem,`
`10027`		`- const struct kvm_memory_slot *old,`
	`10027`	`+ struct kvm_memory_slot *old,`
`10028`	`10028`	`const struct kvm_memory_slot *new,`
`10029`	`10029`	`enum kvm_mr_change change)`
`10030`	`10030`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2251,7 +2251,7 @@ int kvm_mmu_init(void)`
`2251`	`2251`
`2252`	`2252`	`void kvm_arch_commit_memory_region(struct kvm *kvm,`
`2253`	`2253`	`const struct kvm_userspace_memory_region *mem,`
`2254`		`- const struct kvm_memory_slot *old,`
	`2254`	`+ struct kvm_memory_slot *old,`
`2255`	`2255`	`const struct kvm_memory_slot *new,`
`2256`	`2256`	`enum kvm_mr_change change)`
`2257`	`2257`	`{`
Original file line number	Diff line number	Diff line change
`@@ -985,7 +985,7 @@ static struct kvm_memslots install_new_memslots(struct kvm kvm,`
`985`	`985`
`986`	`986`	`static int kvm_set_memslot(struct kvm *kvm,`
`987`	`987`	`const struct kvm_userspace_memory_region *mem,`
`988`		`- const struct kvm_memory_slot *old,`
	`988`	`+ struct kvm_memory_slot *old,`
`989`	`989`	`struct kvm_memory_slot *new, int as_id,`
`990`	`990`	`enum kvm_mr_change change)`
`991`	`991`	`{`