aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-06-21 04:48:05 -0400
committerAvi Kivity <avi@redhat.com>2010-08-01 03:47:01 -0400
commitb74a07beed0e64bfba413dcb70dd6749c57f43dc (patch)
tree7a04532866b919718d41bbb75a21966aa4e48904 /arch/x86/kvm/x86.c
parenta1f4d39500ad8ed61825eff061debff42386ab5b (diff)
KVM: Remove kernel-allocated memory regions
Equivalent (and better) functionality is provided by user-allocated memory regions. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 62596d373a4..9be6e4e5e8e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2967,22 +2967,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
2967 goto out; 2967 goto out;
2968 break; 2968 break;
2969 } 2969 }
2970 case KVM_SET_MEMORY_REGION: {
2971 struct kvm_memory_region kvm_mem;
2972 struct kvm_userspace_memory_region kvm_userspace_mem;
2973
2974 r = -EFAULT;
2975 if (copy_from_user(&kvm_mem, argp, sizeof kvm_mem))
2976 goto out;
2977 kvm_userspace_mem.slot = kvm_mem.slot;
2978 kvm_userspace_mem.flags = kvm_mem.flags;
2979 kvm_userspace_mem.guest_phys_addr = kvm_mem.guest_phys_addr;
2980 kvm_userspace_mem.memory_size = kvm_mem.memory_size;
2981 r = kvm_vm_ioctl_set_memory_region(kvm, &kvm_userspace_mem, 0);
2982 if (r)
2983 goto out;
2984 break;
2985 }
2986 case KVM_SET_NR_MMU_PAGES: 2970 case KVM_SET_NR_MMU_PAGES:
2987 r = kvm_vm_ioctl_set_nr_mmu_pages(kvm, arg); 2971 r = kvm_vm_ioctl_set_nr_mmu_pages(kvm, arg);
2988 if (r) 2972 if (r)