Skip to content

Commit 66a9221

Browse files
martinezjavierbonzini
authored andcommitted
KVM: Delete all references to removed KVM_SET_MEMORY_ALIAS 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 61e15f8 commit 66a9221

File tree

5 files changed

+0
-31
lines changed
  • Documentation/virt/kvm
  • arch/x86/include/uapi/asm
  • include/uapi/linux
  • tools
    • arch/x86/include/uapi/asm
    • include/uapi/linux

5 files changed

+0
-31
lines changed

Documentation/virt/kvm/api.rst

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -356,17 +356,6 @@ see the description of the capability.
356356
Note that the Xen shared info page, if configured, shall always be assumed
357357
to be dirty. KVM will not explicitly mark it such.
358358

359-
4.9 KVM_SET_MEMORY_ALIAS
360-
------------------------
361-
362-
:Capability: basic
363-
:Architectures: x86
364-
:Type: vm ioctl
365-
:Parameters: struct kvm_memory_alias (in)
366-
:Returns: 0 (success), -1 (error)
367-
368-
This ioctl is obsolete and has been removed.
369-
370359

371360
4.10 KVM_RUN
372361
------------

arch/x86/include/uapi/asm/kvm.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@
5353
/* Architectural interrupt line count. */
5454
#define KVM_NR_INTERRUPTS 256
5555

56-
struct kvm_memory_alias {
57-
__u32 slot; /* this has a different namespace than memory slots */
58-
__u32 flags;
59-
__u64 guest_phys_addr;
60-
__u64 memory_size;
61-
__u64 target_phys_addr;
62-
};
63-
6456
/* for KVM_GET_IRQCHIP and KVM_SET_IRQCHIP */
6557
struct kvm_pic_state {
6658
__u8 last_irr; /* edge detection */

include/uapi/linux/kvm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,8 +1440,6 @@ struct kvm_vfio_spapr_tce {
14401440
*/
14411441
#define KVM_CREATE_VCPU _IO(KVMIO, 0x41)
14421442
#define KVM_GET_DIRTY_LOG _IOW(KVMIO, 0x42, struct kvm_dirty_log)
1443-
/* KVM_SET_MEMORY_ALIAS is obsolete: */
1444-
#define KVM_SET_MEMORY_ALIAS _IOW(KVMIO, 0x43, struct kvm_memory_alias)
14451443
#define KVM_SET_NR_MMU_PAGES _IO(KVMIO, 0x44)
14461444
#define KVM_GET_NR_MMU_PAGES _IO(KVMIO, 0x45)
14471445
#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46, \

tools/arch/x86/include/uapi/asm/kvm.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@
5353
/* Architectural interrupt line count. */
5454
#define KVM_NR_INTERRUPTS 256
5555

56-
struct kvm_memory_alias {
57-
__u32 slot; /* this has a different namespace than memory slots */
58-
__u32 flags;
59-
__u64 guest_phys_addr;
60-
__u64 memory_size;
61-
__u64 target_phys_addr;
62-
};
63-
6456
/* for KVM_GET_IRQCHIP and KVM_SET_IRQCHIP */
6557
struct kvm_pic_state {
6658
__u8 last_irr; /* edge detection */

tools/include/uapi/linux/kvm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,8 +1435,6 @@ struct kvm_vfio_spapr_tce {
14351435
*/
14361436
#define KVM_CREATE_VCPU _IO(KVMIO, 0x41)
14371437
#define KVM_GET_DIRTY_LOG _IOW(KVMIO, 0x42, struct kvm_dirty_log)
1438-
/* KVM_SET_MEMORY_ALIAS is obsolete: */
1439-
#define KVM_SET_MEMORY_ALIAS _IOW(KVMIO, 0x43, struct kvm_memory_alias)
14401438
#define KVM_SET_NR_MMU_PAGES _IO(KVMIO, 0x44)
14411439
#define KVM_GET_NR_MMU_PAGES _IO(KVMIO, 0x45)
14421440
#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46, \

0 commit comments

Comments
 (0)