KVM: Move some PPC ioctl definitions to the correct place (ed7a8d7a) · Commits · 戴 / test

This moves the definitions of KVM_CREATE_SPAPR_TCE and KVM_ALLOCATE_RMA in include/linux/kvm.h from the section listing the vcpu ioctls to the section listing VM ioctls, as these are both implemented and documented as VM ioctls. Fortunately there is no actual collision of ioctl numbers at this point. Moving these to the correct section will reduce the probability of a future collision. This does not change the user/kernel ABI at all. Signed-off-by:

Paul Mackerras <paulus@samba.org> Acked-by:

Alexander Graf <agraf@suse.de> Signed-off-by:

Alexander Graf <agraf@suse.de>

include/linux/kvm.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -852,6 +852,9 @@ struct kvm_s390_ucas_mapping {
		#define KVM_PPC_GET_SMMU_INFO _IOR(KVMIO, 0xa6, struct kvm_ppc_smmu_info)
		/* Available with KVM_CAP_PPC_ALLOC_HTAB */
		#define KVM_PPC_ALLOCATE_HTAB _IOWR(KVMIO, 0xa7, __u32)
		#define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct kvm_create_spapr_tce)
		/* Available with KVM_CAP_RMA */
		#define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma)

		/*
		* ioctls for vcpu fds
		@@ -915,9 +918,6 @@ struct kvm_s390_ucas_mapping {
		/* Available with KVM_CAP_XCRS */
		#define KVM_GET_XCRS _IOR(KVMIO, 0xa6, struct kvm_xcrs)
		#define KVM_SET_XCRS _IOW(KVMIO, 0xa7, struct kvm_xcrs)
		#define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct kvm_create_spapr_tce)
		/* Available with KVM_CAP_RMA */
		#define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma)
		/* Available with KVM_CAP_SW_TLB */
		#define KVM_DIRTY_TLB _IOW(KVMIO, 0xaa, struct kvm_dirty_tlb)
		/* Available with KVM_CAP_ONE_REG */

Admin message