Patchwork KVM: Move some PPC ioctl definitions to the correct place

login
register
mail settings
Submitter Paul Mackerras
Date Sept. 14, 2012, 7:44 a.m.
Message ID <20120914074430.GB15028@bloggs.ozlabs.ibm.com>
Download mbox | patch
Permalink /patch/183821/
State New
Headers show

Comments

Paul Mackerras - Sept. 14, 2012, 7:44 a.m.
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>
---
I just noticed this.  This patch is against the next branch of the
kvm tree.  It would be good to get this applied to next as soon as
possible so no-one else allocates these VM ioctl numbers.
Documentation/virtual/kvm/api.txt has these correctly listed as
VM ioctls.

 include/linux/kvm.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Alexander Graf - Sept. 14, 2012, 2:19 p.m.
On 14.09.2012, at 09:44, Paul Mackerras wrote:

> 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>


Avi / Marcelo, please pull this in directly.

Alex

> ---
> I just noticed this.  This patch is against the next branch of the
> kvm tree.  It would be good to get this applied to next as soon as
> possible so no-one else allocates these VM ioctl numbers.
> Documentation/virtual/kvm/api.txt has these correctly listed as
> VM ioctls.
> 
> include/linux/kvm.h |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/kvm.h b/include/linux/kvm.h
> index d808694..acb6333 100644
> --- a/include/linux/kvm.h
> +++ b/include/linux/kvm.h
> @@ -838,6 +838,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
> @@ -901,9 +904,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 */
> -- 
> 1.7.10.rc3.219.g53414
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marcelo Tosatti - Sept. 15, 2012, 3:40 p.m.
On Fri, Sep 14, 2012 at 04:19:29PM +0200, Alexander Graf wrote:
> 
> On 14.09.2012, at 09:44, Paul Mackerras wrote:
> 
> > 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>
> 
> 
> Avi / Marcelo, please pull this in directly.
> 
> Alex

Can you please bounce it to me? I deleted on the basis it would be
integrated through kvm-ppc tree.


--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index d808694..acb6333 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -838,6 +838,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
@@ -901,9 +904,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 */