Skip to content

Commit 61e15f8

Browse files
martinezjavierbonzini
authored andcommitted
KVM: Delete all references to removed KVM_SET_MEMORY_REGION ioctl
The documentation says that the ioctl has been deprecated, but it has been actually removed and the remaining references are just left overs. Suggested-by: Sean Christopherson <[email protected]> Signed-off-by: Javier Martinez Canillas <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent df0bb47 commit 61e15f8

File tree

3 files changed

+0
-40
lines changed

3 files changed

+0
-40
lines changed

Documentation/virt/kvm/api.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,6 @@ the VCPU file descriptor can be mmap-ed, including:
272272
KVM_CAP_DIRTY_LOG_RING, see section 8.3.
273273

274274

275-
4.6 KVM_SET_MEMORY_REGION
276-
-------------------------
277-
278-
:Capability: basic
279-
:Architectures: all
280-
:Type: vm ioctl
281-
:Parameters: struct kvm_memory_region (in)
282-
:Returns: 0 on success, -1 on error
283-
284-
This ioctl is obsolete and has been removed.
285-
286-
287275
4.7 KVM_CREATE_VCPU
288276
-------------------
289277

@@ -1377,10 +1365,6 @@ the memory region are automatically reflected into the guest. For example, an
13771365
mmap() that affects the region will be made visible immediately. Another
13781366
example is madvise(MADV_DROP).
13791367

1380-
It is recommended to use this API instead of the KVM_SET_MEMORY_REGION ioctl.
1381-
The KVM_SET_MEMORY_REGION does not allow fine grained control over memory
1382-
allocation and is deprecated.
1383-
13841368

13851369
4.36 KVM_SET_TSS_ADDR
13861370
---------------------

include/uapi/linux/kvm.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ struct kvm_debug_guest {
8686
/* *** End of deprecated interfaces *** */
8787

8888

89-
/* for KVM_CREATE_MEMORY_REGION */
90-
struct kvm_memory_region {
91-
__u32 slot;
92-
__u32 flags;
93-
__u64 guest_phys_addr;
94-
__u64 memory_size; /* bytes */
95-
};
96-
9789
/* for KVM_SET_USER_MEMORY_REGION */
9890
struct kvm_userspace_memory_region {
9991
__u32 slot;
@@ -1442,10 +1434,6 @@ struct kvm_vfio_spapr_tce {
14421434
__s32 tablefd;
14431435
};
14441436

1445-
/*
1446-
* ioctls for VM fds
1447-
*/
1448-
#define KVM_SET_MEMORY_REGION _IOW(KVMIO, 0x40, struct kvm_memory_region)
14491437
/*
14501438
* KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
14511439
* a vcpu fd.

tools/include/uapi/linux/kvm.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ struct kvm_debug_guest {
8686
/* *** End of deprecated interfaces *** */
8787

8888

89-
/* for KVM_CREATE_MEMORY_REGION */
90-
struct kvm_memory_region {
91-
__u32 slot;
92-
__u32 flags;
93-
__u64 guest_phys_addr;
94-
__u64 memory_size; /* bytes */
95-
};
96-
9789
/* for KVM_SET_USER_MEMORY_REGION */
9890
struct kvm_userspace_memory_region {
9991
__u32 slot;
@@ -1437,10 +1429,6 @@ struct kvm_vfio_spapr_tce {
14371429
__s32 tablefd;
14381430
};
14391431

1440-
/*
1441-
* ioctls for VM fds
1442-
*/
1443-
#define KVM_SET_MEMORY_REGION _IOW(KVMIO, 0x40, struct kvm_memory_region)
14441432
/*
14451433
* KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
14461434
* a vcpu fd.

0 commit comments

Comments
 (0)