aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorTakuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>2013-02-27 05:41:56 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2013-03-04 18:21:08 -0500
commit462fce46065ec4b200c08619c047b9e5a8fd154a (patch)
treec36cb39e0a8377da88b87ca5b99344357a6c31be /virt/kvm
parentee2c25efdd46d7ed5605d6fe877bdf4b47a4ab2e (diff)
KVM: set_memory_region: Drop user_alloc from prepare/commit_memory_region()
X86 does not use this any more. The remaining user, s390's !user_alloc check, can be simply removed since KVM_SET_MEMORY_REGION ioctl is no longer supported. Note: fixed powerpc's indentations with spaces to suppress checkpatch errors. Signed-off-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/kvm_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index adc68feb5c5a..fd3037010e75 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -875,7 +875,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
875 slots = old_memslots; 875 slots = old_memslots;
876 } 876 }
877 877
878 r = kvm_arch_prepare_memory_region(kvm, &new, old, mem, user_alloc); 878 r = kvm_arch_prepare_memory_region(kvm, &new, old, mem);
879 if (r) 879 if (r)
880 goto out_slots; 880 goto out_slots;
881 881
@@ -915,7 +915,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
915 915
916 old_memslots = install_new_memslots(kvm, slots, &new); 916 old_memslots = install_new_memslots(kvm, slots, &new);
917 917
918 kvm_arch_commit_memory_region(kvm, mem, old, user_alloc); 918 kvm_arch_commit_memory_region(kvm, mem, old);
919 919
920 kvm_free_physmem_slot(&old, &new); 920 kvm_free_physmem_slot(&old, &new);
921 kfree(old_memslots); 921 kfree(old_memslots);