| Message ID | 20170605084108.28844-1-sergey.dyasli@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> 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
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
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) {
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(-)