Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1657397 > unrolled thread

[PATCH v1] xen: fix HYPERVISOR_dm_op() prototype

Started bySergey Dyasli <sergey.dyasli@citrix.com>
First post2017-06-05 10:50 +0200
Last post2017-06-06 11:50 +0200
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v1] xen: fix HYPERVISOR_dm_op() prototype Sergey Dyasli <sergey.dyasli@citrix.com> - 2017-06-05 10:50 +0200
    Re: [Xen-devel] [PATCH v1] xen: fix HYPERVISOR_dm_op()  prototype "Jan Beulich" <JBeulich@suse.com> - 2017-06-06 10:10 +0200
      Re: [Xen-devel] [PATCH v1] xen: fix HYPERVISOR_dm_op() prototype Sergey Dyasli <sergey.dyasli@citrix.com> - 2017-06-06 11:50 +0200

#1657397 — [PATCH v1] xen: fix HYPERVISOR_dm_op() prototype

FromSergey Dyasli <sergey.dyasli@citrix.com>
Date2017-06-05 10:50 +0200
Subject[PATCH v1] xen: fix HYPERVISOR_dm_op() prototype
Message-ID<tOVS2-Bi-27@gated-at.bofh.it>
Change the third parameter to be the required struct xen_dm_op_buf *
instead of a generic void * (which blindly accepts any pointer).

Signed-off-by: Sergey Dyasli <sergey.dyasli@citrix.com>
---
 arch/x86/include/asm/xen/hypercall.h | 3 ++-
 include/xen/arm/hypercall.h          | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index f6d20f6cca12..e111ae874647 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -49,6 +49,7 @@
 #include <xen/interface/physdev.h>
 #include <xen/interface/platform.h>
 #include <xen/interface/xen-mca.h>
+#include <xen/interface/hvm/dm_op.h>
 
 /*
  * The hypercall asms have to meet several constraints:
@@ -474,7 +475,7 @@ HYPERVISOR_xenpmu_op(unsigned int op, void *arg)
 
 static inline int
 HYPERVISOR_dm_op(
-	domid_t dom, unsigned int nr_bufs, void *bufs)
+	domid_t dom, unsigned int nr_bufs, struct xen_dm_op_buf *bufs)
 {
 	return _hypercall3(int, dm_op, dom, nr_bufs, bufs);
 }
diff --git a/include/xen/arm/hypercall.h b/include/xen/arm/hypercall.h
index 73db4b2eeb89..d3a732d1ede8 100644
--- a/include/xen/arm/hypercall.h
+++ b/include/xen/arm/hypercall.h
@@ -38,6 +38,7 @@
 #include <xen/interface/xen.h>
 #include <xen/interface/sched.h>
 #include <xen/interface/platform.h>
+#include <xen/interface/hvm/dm_op.h>
 
 long privcmd_call(unsigned call, unsigned long a1,
 		unsigned long a2, unsigned long a3,
@@ -53,7 +54,8 @@ int HYPERVISOR_physdev_op(int cmd, void *arg);
 int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args);
 int HYPERVISOR_tmem_op(void *arg);
 int HYPERVISOR_vm_assist(unsigned int cmd, unsigned int type);
-int HYPERVISOR_dm_op(domid_t domid, unsigned int nr_bufs, void *bufs);
+int HYPERVISOR_dm_op(domid_t domid, unsigned int nr_bufs,
+		     struct xen_dm_op_buf *bufs);
 int HYPERVISOR_platform_op_raw(void *arg);
 static inline int HYPERVISOR_platform_op(struct xen_platform_op *op)
 {
-- 
2.11.0

[toc] | [next] | [standalone]

#1658471 — Re: [Xen-devel] [PATCH v1] xen: fix HYPERVISOR_dm_op() prototype

From"Jan Beulich" <JBeulich@suse.com>
Date2017-06-06 10:10 +0200
SubjectRe: [Xen-devel] [PATCH v1] xen: fix HYPERVISOR_dm_op() prototype
Message-ID<tPhIS-68H-9@gated-at.bofh.it>
In reply to#1657397
>>> On 05.06.17 at 10:41, <sergey.dyasli@citrix.com> wrote:
> --- a/arch/x86/include/asm/xen/hypercall.h
> +++ b/arch/x86/include/asm/xen/hypercall.h
> @@ -49,6 +49,7 @@
>  #include <xen/interface/physdev.h>
>  #include <xen/interface/platform.h>
>  #include <xen/interface/xen-mca.h>
> +#include <xen/interface/hvm/dm_op.h>

Why?

> @@ -474,7 +475,7 @@ HYPERVISOR_xenpmu_op(unsigned int op, void *arg)
>  
>  static inline int
>  HYPERVISOR_dm_op(
> -	domid_t dom, unsigned int nr_bufs, void *bufs)
> +	domid_t dom, unsigned int nr_bufs, struct xen_dm_op_buf *bufs)

All you need above here is a forward declaration of the structure.
We should really avoid forcing source files to include all sorts of
headers without actually needing anything from them.

> --- a/include/xen/arm/hypercall.h
> +++ b/include/xen/arm/hypercall.h
> @@ -38,6 +38,7 @@
>  #include <xen/interface/xen.h>
>  #include <xen/interface/sched.h>
>  #include <xen/interface/platform.h>
> +#include <xen/interface/hvm/dm_op.h>

Same here.

> @@ -53,7 +54,8 @@ int HYPERVISOR_physdev_op(int cmd, void *arg);
>  int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args);
>  int HYPERVISOR_tmem_op(void *arg);
>  int HYPERVISOR_vm_assist(unsigned int cmd, unsigned int type);
> -int HYPERVISOR_dm_op(domid_t domid, unsigned int nr_bufs, void *bufs);
> +int HYPERVISOR_dm_op(domid_t domid, unsigned int nr_bufs,
> +		     struct xen_dm_op_buf *bufs);

How come you get away with changing a declaration without
also changing the matching definition?

Jan

[toc] | [prev] | [next] | [standalone]

#1658550 — Re: [Xen-devel] [PATCH v1] xen: fix HYPERVISOR_dm_op() prototype

FromSergey Dyasli <sergey.dyasli@citrix.com>
Date2017-06-06 11:50 +0200
SubjectRe: [Xen-devel] [PATCH v1] xen: fix HYPERVISOR_dm_op() prototype
Message-ID<tPjhE-6Wc-11@gated-at.bofh.it>
In reply to#1658471
On Tue, 2017-06-06 at 02:03 -0600, Jan Beulich wrote:
> > > > On 05.06.17 at 10:41, <sergey.dyasli@citrix.com> wrote:
> > 
> > --- a/arch/x86/include/asm/xen/hypercall.h
> > +++ b/arch/x86/include/asm/xen/hypercall.h
> > @@ -49,6 +49,7 @@
> >  #include <xen/interface/physdev.h>
> >  #include <xen/interface/platform.h>
> >  #include <xen/interface/xen-mca.h>
> > +#include <xen/interface/hvm/dm_op.h>
> 
> Why?
> 
> > @@ -474,7 +475,7 @@ HYPERVISOR_xenpmu_op(unsigned int op, void *arg)
> >  
> >  static inline int
> >  HYPERVISOR_dm_op(
> > -	domid_t dom, unsigned int nr_bufs, void *bufs)
> > +	domid_t dom, unsigned int nr_bufs, struct xen_dm_op_buf *bufs)
> 
> All you need above here is a forward declaration of the structure.
> We should really avoid forcing source files to include all sorts of
> headers without actually needing anything from them.

Thank you for the good suggestion. I will fix this in v2.

> 
> > --- a/include/xen/arm/hypercall.h
> > +++ b/include/xen/arm/hypercall.h
> > @@ -38,6 +38,7 @@
> >  #include <xen/interface/xen.h>
> >  #include <xen/interface/sched.h>
> >  #include <xen/interface/platform.h>
> > +#include <xen/interface/hvm/dm_op.h>
> 
> Same here.
> 
> > @@ -53,7 +54,8 @@ int HYPERVISOR_physdev_op(int cmd, void *arg);
> >  int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args);
> >  int HYPERVISOR_tmem_op(void *arg);
> >  int HYPERVISOR_vm_assist(unsigned int cmd, unsigned int type);
> > -int HYPERVISOR_dm_op(domid_t domid, unsigned int nr_bufs, void *bufs);
> > +int HYPERVISOR_dm_op(domid_t domid, unsigned int nr_bufs,
> > +		     struct xen_dm_op_buf *bufs);
> 
> How come you get away with changing a declaration without
> also changing the matching definition?

The definition of HYPERVISOR_dm_op() is in arch/arm/xen/hypercall.S

-- 
Thanks,
Sergey

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web