diff options
author | Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp> | 2013-02-27 05:43:00 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2013-03-04 18:21:08 -0500 |
commit | 47ae31e257c548abdb199e0d26723139a9a967ba (patch) | |
tree | e2888e7839935423a3afc64c0296eb9e4eed23c4 /arch/ia64 | |
parent | 462fce46065ec4b200c08619c047b9e5a8fd154a (diff) |
KVM: set_memory_region: Drop user_alloc from set_memory_region()
Except ia64's stale code, KVM_SET_MEMORY_REGION support, this is only
used for sanity checks in __kvm_set_memory_region() which can easily
be changed to use slot id instead.
Signed-off-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index cbc5b0417dab..43701f0c0f71 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -942,24 +942,6 @@ long kvm_arch_vm_ioctl(struct file *filp, | |||
942 | int r = -ENOTTY; | 942 | int r = -ENOTTY; |
943 | 943 | ||
944 | switch (ioctl) { | 944 | switch (ioctl) { |
945 | case KVM_SET_MEMORY_REGION: { | ||
946 | struct kvm_memory_region kvm_mem; | ||
947 | struct kvm_userspace_memory_region kvm_userspace_mem; | ||
948 | |||
949 | r = -EFAULT; | ||
950 | if (copy_from_user(&kvm_mem, argp, sizeof kvm_mem)) | ||
951 | goto out; | ||
952 | kvm_userspace_mem.slot = kvm_mem.slot; | ||
953 | kvm_userspace_mem.flags = kvm_mem.flags; | ||
954 | kvm_userspace_mem.guest_phys_addr = | ||
955 | kvm_mem.guest_phys_addr; | ||
956 | kvm_userspace_mem.memory_size = kvm_mem.memory_size; | ||
957 | r = kvm_vm_ioctl_set_memory_region(kvm, | ||
958 | &kvm_userspace_mem, false); | ||
959 | if (r) | ||
960 | goto out; | ||
961 | break; | ||
962 | } | ||
963 | case KVM_CREATE_IRQCHIP: | 945 | case KVM_CREATE_IRQCHIP: |
964 | r = -EFAULT; | 946 | r = -EFAULT; |
965 | r = kvm_ioapic_init(kvm); | 947 | r = kvm_ioapic_init(kvm); |