Commit b74a07beed0e64bfba413dcb70dd6749c57f43dc
1 parent
a1f4d39500
Exists in
master
and in
7 other branches
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>
Showing 3 changed files with 1 additions and 49 deletions Side-by-side Diff
Documentation/feature-removal-schedule.txt
| ... | ... | @@ -548,16 +548,6 @@ |
| 548 | 548 | |
| 549 | 549 | ---------------------------- |
| 550 | 550 | |
| 551 | -What: KVM kernel-allocated memory slots | |
| 552 | -When: July 2010 | |
| 553 | -Why: Since 2.6.25, kvm supports user-allocated memory slots, which are | |
| 554 | - much more flexible than kernel-allocated slots. All current userspace | |
| 555 | - supports the newer interface and this code can be removed with no | |
| 556 | - impact. | |
| 557 | -Who: Avi Kivity <avi@redhat.com> | |
| 558 | - | |
| 559 | ----------------------------- | |
| 560 | - | |
| 561 | 551 | What: KVM paravirt mmu host support |
| 562 | 552 | When: January 2011 |
| 563 | 553 | Why: The paravirt mmu host support is slower than non-paravirt mmu, both |
Documentation/kvm/api.txt
| ... | ... | @@ -160,29 +160,7 @@ |
| 160 | 160 | Parameters: struct kvm_memory_region (in) |
| 161 | 161 | Returns: 0 on success, -1 on error |
| 162 | 162 | |
| 163 | -struct kvm_memory_region { | |
| 164 | - __u32 slot; | |
| 165 | - __u32 flags; | |
| 166 | - __u64 guest_phys_addr; | |
| 167 | - __u64 memory_size; /* bytes */ | |
| 168 | -}; | |
| 169 | - | |
| 170 | -/* for kvm_memory_region::flags */ | |
| 171 | -#define KVM_MEM_LOG_DIRTY_PAGES 1UL | |
| 172 | - | |
| 173 | -This ioctl allows the user to create or modify a guest physical memory | |
| 174 | -slot. When changing an existing slot, it may be moved in the guest | |
| 175 | -physical memory space, or its flags may be modified. It may not be | |
| 176 | -resized. Slots may not overlap. | |
| 177 | - | |
| 178 | -The flags field supports just one flag, KVM_MEM_LOG_DIRTY_PAGES, which | |
| 179 | -instructs kvm to keep track of writes to memory within the slot. See | |
| 180 | -the KVM_GET_DIRTY_LOG ioctl. | |
| 181 | - | |
| 182 | -It is recommended to use the KVM_SET_USER_MEMORY_REGION ioctl instead | |
| 183 | -of this API, if available. This newer API allows placing guest memory | |
| 184 | -at specified locations in the host address space, yielding better | |
| 185 | -control and easy access. | |
| 163 | +This ioctl is obsolete and has been removed. | |
| 186 | 164 | |
| 187 | 165 | 4.6 KVM_CREATE_VCPU |
| 188 | 166 |
arch/x86/kvm/x86.c
| ... | ... | @@ -2967,22 +2967,6 @@ |
| 2967 | 2967 | goto out; |
| 2968 | 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 | 2970 | case KVM_SET_NR_MMU_PAGES: |
| 2987 | 2971 | r = kvm_vm_ioctl_set_nr_mmu_pages(kvm, arg); |
| 2988 | 2972 | if (r) |