* [PATCH] vNUMA: rename interface structures
@ 2014-11-25 12:36 Jan Beulich
2014-11-25 12:45 ` Andrew Cooper
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jan Beulich @ 2014-11-25 12:36 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Stefano Stabellini, Tim Deegan, Ian Jackson,
Ian Campbell, Wei Liu
[-- Attachment #1: Type: text/plain, Size: 4936 bytes --]
No-one (including me) paid attention during review that these
structures don't adhere to the naming requirements of the public
interface: Consistently use xen_ prefixes at least for all new
additions.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/tools/libxc/include/xenctrl.h
+++ b/tools/libxc/include/xenctrl.h
@@ -1264,7 +1264,7 @@ int xc_domain_setvnuma(xc_interface *xch
uint32_t nr_vnodes,
uint32_t nr_regions,
uint32_t nr_vcpus,
- vmemrange_t *vmemrange,
+ xen_vmemrange_t *vmemrange,
unsigned int *vdistance,
unsigned int *vcpu_to_vnode,
unsigned int *vnode_to_pnode);
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -2171,7 +2171,7 @@ int xc_domain_setvnuma(xc_interface *xch
uint32_t nr_vnodes,
uint32_t nr_vmemranges,
uint32_t nr_vcpus,
- vmemrange_t *vmemrange,
+ xen_vmemrange_t *vmemrange,
unsigned int *vdistance,
unsigned int *vcpu_to_vnode,
unsigned int *vnode_to_pnode)
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(un
vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes);
vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus);
vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes);
- vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges);
+ vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges);
if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL ||
vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL )
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd, XEN
case XENMEM_get_vnumainfo:
{
- struct vnuma_topology_info topology;
+ struct xen_vnuma_topology_info topology;
struct domain *d;
unsigned int dom_vnodes, dom_vranges, dom_vcpus;
struct vnuma_info tmp;
@@ -1033,7 +1033,7 @@ long do_memory_op(unsigned long cmd, XEN
read_unlock(&d->vnuma_rwlock);
tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes * dom_vnodes);
- tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges);
+ tmp.vmemrange = xmalloc_array(xen_vmemrange_t, dom_vranges);
tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus);
if ( tmp.vdistance == NULL ||
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -980,7 +980,7 @@ struct xen_domctl_vnuma {
/*
* memory rages for each vNUMA node
*/
- XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange;
+ XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange;
};
typedef struct xen_domctl_vnuma xen_domctl_vnuma_t;
DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t);
--- a/xen/include/public/memory.h
+++ b/xen/include/public/memory.h
@@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_
#define XENMEM_get_vnumainfo 26
/* vNUMA node memory ranges */
-struct vmemrange {
+struct xen_vmemrange {
uint64_t start, end;
unsigned int flags;
unsigned int nid;
};
-
-typedef struct vmemrange vmemrange_t;
-DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
+typedef struct xen_vmemrange xen_vmemrange_t;
+DEFINE_XEN_GUEST_HANDLE(xen_vmemrange_t);
/*
* vNUMA topology specifies vNUMA node number, distance table,
@@ -548,7 +547,7 @@ DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
* copied back to guest. Domain returns expected values of nr_vnodes,
* nr_vmemranges and nr_vcpus to guest if the values where incorrect.
*/
-struct vnuma_topology_info {
+struct xen_vnuma_topology_info {
/* IN */
domid_t domid;
uint16_t pad;
@@ -566,12 +565,12 @@ struct vnuma_topology_info {
uint64_t pad;
} vcpu_to_vnode;
union {
- XEN_GUEST_HANDLE(vmemrange_t) h;
+ XEN_GUEST_HANDLE(xen_vmemrange_t) h;
uint64_t pad;
} vmemrange;
};
-typedef struct vnuma_topology_info vnuma_topology_info_t;
-DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t);
+typedef struct xen_vnuma_topology_info xen_vnuma_topology_info_t;
+DEFINE_XEN_GUEST_HANDLE(xen_vnuma_topology_info_t);
/* Next available subop number is 27 */
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -100,7 +100,7 @@ struct vnuma_info {
unsigned int *vdistance;
unsigned int *vcpu_to_vnode;
unsigned int *vnode_to_pnode;
- struct vmemrange *vmemrange;
+ struct xen_vmemrange *vmemrange;
};
void vnuma_destroy(struct vnuma_info *vnuma);
[-- Attachment #2: memop-vnuma-rename.patch --]
[-- Type: text/plain, Size: 4970 bytes --]
vNUMA: rename interface structures
No-one (including me) paid attention during review that these
structures don't adhere to the naming requirements of the public
interface: Consistently use xen_ prefixes at least for all new
additions.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/tools/libxc/include/xenctrl.h
+++ b/tools/libxc/include/xenctrl.h
@@ -1264,7 +1264,7 @@ int xc_domain_setvnuma(xc_interface *xch
uint32_t nr_vnodes,
uint32_t nr_regions,
uint32_t nr_vcpus,
- vmemrange_t *vmemrange,
+ xen_vmemrange_t *vmemrange,
unsigned int *vdistance,
unsigned int *vcpu_to_vnode,
unsigned int *vnode_to_pnode);
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -2171,7 +2171,7 @@ int xc_domain_setvnuma(xc_interface *xch
uint32_t nr_vnodes,
uint32_t nr_vmemranges,
uint32_t nr_vcpus,
- vmemrange_t *vmemrange,
+ xen_vmemrange_t *vmemrange,
unsigned int *vdistance,
unsigned int *vcpu_to_vnode,
unsigned int *vnode_to_pnode)
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(un
vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes);
vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus);
vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes);
- vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges);
+ vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges);
if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL ||
vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL )
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd, XEN
case XENMEM_get_vnumainfo:
{
- struct vnuma_topology_info topology;
+ struct xen_vnuma_topology_info topology;
struct domain *d;
unsigned int dom_vnodes, dom_vranges, dom_vcpus;
struct vnuma_info tmp;
@@ -1033,7 +1033,7 @@ long do_memory_op(unsigned long cmd, XEN
read_unlock(&d->vnuma_rwlock);
tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes * dom_vnodes);
- tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges);
+ tmp.vmemrange = xmalloc_array(xen_vmemrange_t, dom_vranges);
tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus);
if ( tmp.vdistance == NULL ||
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -980,7 +980,7 @@ struct xen_domctl_vnuma {
/*
* memory rages for each vNUMA node
*/
- XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange;
+ XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange;
};
typedef struct xen_domctl_vnuma xen_domctl_vnuma_t;
DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t);
--- a/xen/include/public/memory.h
+++ b/xen/include/public/memory.h
@@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_
#define XENMEM_get_vnumainfo 26
/* vNUMA node memory ranges */
-struct vmemrange {
+struct xen_vmemrange {
uint64_t start, end;
unsigned int flags;
unsigned int nid;
};
-
-typedef struct vmemrange vmemrange_t;
-DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
+typedef struct xen_vmemrange xen_vmemrange_t;
+DEFINE_XEN_GUEST_HANDLE(xen_vmemrange_t);
/*
* vNUMA topology specifies vNUMA node number, distance table,
@@ -548,7 +547,7 @@ DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
* copied back to guest. Domain returns expected values of nr_vnodes,
* nr_vmemranges and nr_vcpus to guest if the values where incorrect.
*/
-struct vnuma_topology_info {
+struct xen_vnuma_topology_info {
/* IN */
domid_t domid;
uint16_t pad;
@@ -566,12 +565,12 @@ struct vnuma_topology_info {
uint64_t pad;
} vcpu_to_vnode;
union {
- XEN_GUEST_HANDLE(vmemrange_t) h;
+ XEN_GUEST_HANDLE(xen_vmemrange_t) h;
uint64_t pad;
} vmemrange;
};
-typedef struct vnuma_topology_info vnuma_topology_info_t;
-DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t);
+typedef struct xen_vnuma_topology_info xen_vnuma_topology_info_t;
+DEFINE_XEN_GUEST_HANDLE(xen_vnuma_topology_info_t);
/* Next available subop number is 27 */
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -100,7 +100,7 @@ struct vnuma_info {
unsigned int *vdistance;
unsigned int *vcpu_to_vnode;
unsigned int *vnode_to_pnode;
- struct vmemrange *vmemrange;
+ struct xen_vmemrange *vmemrange;
};
void vnuma_destroy(struct vnuma_info *vnuma);
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] vNUMA: rename interface structures
2014-11-25 12:36 [PATCH] vNUMA: rename interface structures Jan Beulich
@ 2014-11-25 12:45 ` Andrew Cooper
2014-11-25 12:54 ` Ian Campbell
2014-11-25 14:11 ` Jan Beulich
2 siblings, 0 replies; 5+ messages in thread
From: Andrew Cooper @ 2014-11-25 12:45 UTC (permalink / raw)
To: Jan Beulich, xen-devel
Cc: Wei Liu, Stefano Stabellini, Ian Jackson, Tim Deegan,
Ian Campbell, Keir Fraser
[-- Attachment #1.1: Type: text/plain, Size: 5380 bytes --]
On 25/11/14 12:36, Jan Beulich wrote:
> No-one (including me) paid attention during review that these
> structures don't adhere to the naming requirements of the public
> interface: Consistently use xen_ prefixes at least for all new
> additions.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Good to catch this before 4.5 gets released and it is harder to justify
the change.
>
> --- a/tools/libxc/include/xenctrl.h
> +++ b/tools/libxc/include/xenctrl.h
> @@ -1264,7 +1264,7 @@ int xc_domain_setvnuma(xc_interface *xch
> uint32_t nr_vnodes,
> uint32_t nr_regions,
> uint32_t nr_vcpus,
> - vmemrange_t *vmemrange,
> + xen_vmemrange_t *vmemrange,
> unsigned int *vdistance,
> unsigned int *vcpu_to_vnode,
> unsigned int *vnode_to_pnode);
> --- a/tools/libxc/xc_domain.c
> +++ b/tools/libxc/xc_domain.c
> @@ -2171,7 +2171,7 @@ int xc_domain_setvnuma(xc_interface *xch
> uint32_t nr_vnodes,
> uint32_t nr_vmemranges,
> uint32_t nr_vcpus,
> - vmemrange_t *vmemrange,
> + xen_vmemrange_t *vmemrange,
> unsigned int *vdistance,
> unsigned int *vcpu_to_vnode,
> unsigned int *vnode_to_pnode)
> --- a/xen/common/domctl.c
> +++ b/xen/common/domctl.c
> @@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(un
> vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes);
> vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus);
> vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes);
> - vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges);
> + vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges);
>
> if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL ||
> vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL )
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd, XEN
>
> case XENMEM_get_vnumainfo:
> {
> - struct vnuma_topology_info topology;
> + struct xen_vnuma_topology_info topology;
> struct domain *d;
> unsigned int dom_vnodes, dom_vranges, dom_vcpus;
> struct vnuma_info tmp;
> @@ -1033,7 +1033,7 @@ long do_memory_op(unsigned long cmd, XEN
> read_unlock(&d->vnuma_rwlock);
>
> tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes * dom_vnodes);
> - tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges);
> + tmp.vmemrange = xmalloc_array(xen_vmemrange_t, dom_vranges);
> tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus);
>
> if ( tmp.vdistance == NULL ||
> --- a/xen/include/public/domctl.h
> +++ b/xen/include/public/domctl.h
> @@ -980,7 +980,7 @@ struct xen_domctl_vnuma {
> /*
> * memory rages for each vNUMA node
> */
> - XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange;
> + XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange;
> };
> typedef struct xen_domctl_vnuma xen_domctl_vnuma_t;
> DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t);
> --- a/xen/include/public/memory.h
> +++ b/xen/include/public/memory.h
> @@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_
> #define XENMEM_get_vnumainfo 26
>
> /* vNUMA node memory ranges */
> -struct vmemrange {
> +struct xen_vmemrange {
> uint64_t start, end;
> unsigned int flags;
> unsigned int nid;
> };
> -
> -typedef struct vmemrange vmemrange_t;
> -DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
> +typedef struct xen_vmemrange xen_vmemrange_t;
> +DEFINE_XEN_GUEST_HANDLE(xen_vmemrange_t);
>
> /*
> * vNUMA topology specifies vNUMA node number, distance table,
> @@ -548,7 +547,7 @@ DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
> * copied back to guest. Domain returns expected values of nr_vnodes,
> * nr_vmemranges and nr_vcpus to guest if the values where incorrect.
> */
> -struct vnuma_topology_info {
> +struct xen_vnuma_topology_info {
> /* IN */
> domid_t domid;
> uint16_t pad;
> @@ -566,12 +565,12 @@ struct vnuma_topology_info {
> uint64_t pad;
> } vcpu_to_vnode;
> union {
> - XEN_GUEST_HANDLE(vmemrange_t) h;
> + XEN_GUEST_HANDLE(xen_vmemrange_t) h;
> uint64_t pad;
> } vmemrange;
> };
> -typedef struct vnuma_topology_info vnuma_topology_info_t;
> -DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t);
> +typedef struct xen_vnuma_topology_info xen_vnuma_topology_info_t;
> +DEFINE_XEN_GUEST_HANDLE(xen_vnuma_topology_info_t);
>
> /* Next available subop number is 27 */
>
> --- a/xen/include/xen/domain.h
> +++ b/xen/include/xen/domain.h
> @@ -100,7 +100,7 @@ struct vnuma_info {
> unsigned int *vdistance;
> unsigned int *vcpu_to_vnode;
> unsigned int *vnode_to_pnode;
> - struct vmemrange *vmemrange;
> + struct xen_vmemrange *vmemrange;
> };
>
> void vnuma_destroy(struct vnuma_info *vnuma);
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
[-- Attachment #1.2: Type: text/html, Size: 6107 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] vNUMA: rename interface structures
2014-11-25 12:36 [PATCH] vNUMA: rename interface structures Jan Beulich
2014-11-25 12:45 ` Andrew Cooper
@ 2014-11-25 12:54 ` Ian Campbell
2014-11-25 14:11 ` Jan Beulich
2 siblings, 0 replies; 5+ messages in thread
From: Ian Campbell @ 2014-11-25 12:54 UTC (permalink / raw)
To: Jan Beulich
Cc: Wei Liu, Keir Fraser, Stefano Stabellini, Ian Jackson, Tim Deegan,
xen-devel
On Tue, 2014-11-25 at 12:36 +0000, Jan Beulich wrote:
> No-one (including me) paid attention during review that these
> structures don't adhere to the naming requirements of the public
> interface: Consistently use xen_ prefixes at least for all new
> additions.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] vNUMA: rename interface structures
2014-11-25 12:36 [PATCH] vNUMA: rename interface structures Jan Beulich
2014-11-25 12:45 ` Andrew Cooper
2014-11-25 12:54 ` Ian Campbell
@ 2014-11-25 14:11 ` Jan Beulich
2014-11-25 15:49 ` Konrad Rzeszutek Wilk
2 siblings, 1 reply; 5+ messages in thread
From: Jan Beulich @ 2014-11-25 14:11 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: xen-devel
>>> On 25.11.14 at 13:36, <JBeulich@suse.com> wrote:
> No-one (including me) paid attention during review that these
> structures don't adhere to the naming requirements of the public
> interface: Consistently use xen_ prefixes at least for all new
> additions.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Sorry, again forgot to Cc you (for 4.5): No functional change, but
avoiding a later (incompatible) interface change.
Jan
> --- a/tools/libxc/include/xenctrl.h
> +++ b/tools/libxc/include/xenctrl.h
> @@ -1264,7 +1264,7 @@ int xc_domain_setvnuma(xc_interface *xch
> uint32_t nr_vnodes,
> uint32_t nr_regions,
> uint32_t nr_vcpus,
> - vmemrange_t *vmemrange,
> + xen_vmemrange_t *vmemrange,
> unsigned int *vdistance,
> unsigned int *vcpu_to_vnode,
> unsigned int *vnode_to_pnode);
> --- a/tools/libxc/xc_domain.c
> +++ b/tools/libxc/xc_domain.c
> @@ -2171,7 +2171,7 @@ int xc_domain_setvnuma(xc_interface *xch
> uint32_t nr_vnodes,
> uint32_t nr_vmemranges,
> uint32_t nr_vcpus,
> - vmemrange_t *vmemrange,
> + xen_vmemrange_t *vmemrange,
> unsigned int *vdistance,
> unsigned int *vcpu_to_vnode,
> unsigned int *vnode_to_pnode)
> --- a/xen/common/domctl.c
> +++ b/xen/common/domctl.c
> @@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(un
> vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes);
> vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus);
> vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes);
> - vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges);
> + vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges);
>
> if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL ||
> vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL )
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd, XEN
>
> case XENMEM_get_vnumainfo:
> {
> - struct vnuma_topology_info topology;
> + struct xen_vnuma_topology_info topology;
> struct domain *d;
> unsigned int dom_vnodes, dom_vranges, dom_vcpus;
> struct vnuma_info tmp;
> @@ -1033,7 +1033,7 @@ long do_memory_op(unsigned long cmd, XEN
> read_unlock(&d->vnuma_rwlock);
>
> tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes *
> dom_vnodes);
> - tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges);
> + tmp.vmemrange = xmalloc_array(xen_vmemrange_t, dom_vranges);
> tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus);
>
> if ( tmp.vdistance == NULL ||
> --- a/xen/include/public/domctl.h
> +++ b/xen/include/public/domctl.h
> @@ -980,7 +980,7 @@ struct xen_domctl_vnuma {
> /*
> * memory rages for each vNUMA node
> */
> - XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange;
> + XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange;
> };
> typedef struct xen_domctl_vnuma xen_domctl_vnuma_t;
> DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t);
> --- a/xen/include/public/memory.h
> +++ b/xen/include/public/memory.h
> @@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_
> #define XENMEM_get_vnumainfo 26
>
> /* vNUMA node memory ranges */
> -struct vmemrange {
> +struct xen_vmemrange {
> uint64_t start, end;
> unsigned int flags;
> unsigned int nid;
> };
> -
> -typedef struct vmemrange vmemrange_t;
> -DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
> +typedef struct xen_vmemrange xen_vmemrange_t;
> +DEFINE_XEN_GUEST_HANDLE(xen_vmemrange_t);
>
> /*
> * vNUMA topology specifies vNUMA node number, distance table,
> @@ -548,7 +547,7 @@ DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
> * copied back to guest. Domain returns expected values of nr_vnodes,
> * nr_vmemranges and nr_vcpus to guest if the values where incorrect.
> */
> -struct vnuma_topology_info {
> +struct xen_vnuma_topology_info {
> /* IN */
> domid_t domid;
> uint16_t pad;
> @@ -566,12 +565,12 @@ struct vnuma_topology_info {
> uint64_t pad;
> } vcpu_to_vnode;
> union {
> - XEN_GUEST_HANDLE(vmemrange_t) h;
> + XEN_GUEST_HANDLE(xen_vmemrange_t) h;
> uint64_t pad;
> } vmemrange;
> };
> -typedef struct vnuma_topology_info vnuma_topology_info_t;
> -DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t);
> +typedef struct xen_vnuma_topology_info xen_vnuma_topology_info_t;
> +DEFINE_XEN_GUEST_HANDLE(xen_vnuma_topology_info_t);
>
> /* Next available subop number is 27 */
>
> --- a/xen/include/xen/domain.h
> +++ b/xen/include/xen/domain.h
> @@ -100,7 +100,7 @@ struct vnuma_info {
> unsigned int *vdistance;
> unsigned int *vcpu_to_vnode;
> unsigned int *vnode_to_pnode;
> - struct vmemrange *vmemrange;
> + struct xen_vmemrange *vmemrange;
> };
>
> void vnuma_destroy(struct vnuma_info *vnuma);
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] vNUMA: rename interface structures
2014-11-25 14:11 ` Jan Beulich
@ 2014-11-25 15:49 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 5+ messages in thread
From: Konrad Rzeszutek Wilk @ 2014-11-25 15:49 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel
On Tue, Nov 25, 2014 at 02:11:39PM +0000, Jan Beulich wrote:
> >>> On 25.11.14 at 13:36, <JBeulich@suse.com> wrote:
> > No-one (including me) paid attention during review that these
> > structures don't adhere to the naming requirements of the public
> > interface: Consistently use xen_ prefixes at least for all new
> > additions.
> >
> > Signed-off-by: Jan Beulich <jbeulich@suse.com>
>
> Sorry, again forgot to Cc you (for 4.5): No functional change, but
> avoiding a later (incompatible) interface change.
Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>
> Jan
>
> > --- a/tools/libxc/include/xenctrl.h
> > +++ b/tools/libxc/include/xenctrl.h
> > @@ -1264,7 +1264,7 @@ int xc_domain_setvnuma(xc_interface *xch
> > uint32_t nr_vnodes,
> > uint32_t nr_regions,
> > uint32_t nr_vcpus,
> > - vmemrange_t *vmemrange,
> > + xen_vmemrange_t *vmemrange,
> > unsigned int *vdistance,
> > unsigned int *vcpu_to_vnode,
> > unsigned int *vnode_to_pnode);
> > --- a/tools/libxc/xc_domain.c
> > +++ b/tools/libxc/xc_domain.c
> > @@ -2171,7 +2171,7 @@ int xc_domain_setvnuma(xc_interface *xch
> > uint32_t nr_vnodes,
> > uint32_t nr_vmemranges,
> > uint32_t nr_vcpus,
> > - vmemrange_t *vmemrange,
> > + xen_vmemrange_t *vmemrange,
> > unsigned int *vdistance,
> > unsigned int *vcpu_to_vnode,
> > unsigned int *vnode_to_pnode)
> > --- a/xen/common/domctl.c
> > +++ b/xen/common/domctl.c
> > @@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(un
> > vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes);
> > vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus);
> > vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes);
> > - vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges);
> > + vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges);
> >
> > if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL ||
> > vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL )
> > --- a/xen/common/memory.c
> > +++ b/xen/common/memory.c
> > @@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd, XEN
> >
> > case XENMEM_get_vnumainfo:
> > {
> > - struct vnuma_topology_info topology;
> > + struct xen_vnuma_topology_info topology;
> > struct domain *d;
> > unsigned int dom_vnodes, dom_vranges, dom_vcpus;
> > struct vnuma_info tmp;
> > @@ -1033,7 +1033,7 @@ long do_memory_op(unsigned long cmd, XEN
> > read_unlock(&d->vnuma_rwlock);
> >
> > tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes *
> > dom_vnodes);
> > - tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges);
> > + tmp.vmemrange = xmalloc_array(xen_vmemrange_t, dom_vranges);
> > tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus);
> >
> > if ( tmp.vdistance == NULL ||
> > --- a/xen/include/public/domctl.h
> > +++ b/xen/include/public/domctl.h
> > @@ -980,7 +980,7 @@ struct xen_domctl_vnuma {
> > /*
> > * memory rages for each vNUMA node
> > */
> > - XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange;
> > + XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange;
> > };
> > typedef struct xen_domctl_vnuma xen_domctl_vnuma_t;
> > DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t);
> > --- a/xen/include/public/memory.h
> > +++ b/xen/include/public/memory.h
> > @@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_
> > #define XENMEM_get_vnumainfo 26
> >
> > /* vNUMA node memory ranges */
> > -struct vmemrange {
> > +struct xen_vmemrange {
> > uint64_t start, end;
> > unsigned int flags;
> > unsigned int nid;
> > };
> > -
> > -typedef struct vmemrange vmemrange_t;
> > -DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
> > +typedef struct xen_vmemrange xen_vmemrange_t;
> > +DEFINE_XEN_GUEST_HANDLE(xen_vmemrange_t);
> >
> > /*
> > * vNUMA topology specifies vNUMA node number, distance table,
> > @@ -548,7 +547,7 @@ DEFINE_XEN_GUEST_HANDLE(vmemrange_t);
> > * copied back to guest. Domain returns expected values of nr_vnodes,
> > * nr_vmemranges and nr_vcpus to guest if the values where incorrect.
> > */
> > -struct vnuma_topology_info {
> > +struct xen_vnuma_topology_info {
> > /* IN */
> > domid_t domid;
> > uint16_t pad;
> > @@ -566,12 +565,12 @@ struct vnuma_topology_info {
> > uint64_t pad;
> > } vcpu_to_vnode;
> > union {
> > - XEN_GUEST_HANDLE(vmemrange_t) h;
> > + XEN_GUEST_HANDLE(xen_vmemrange_t) h;
> > uint64_t pad;
> > } vmemrange;
> > };
> > -typedef struct vnuma_topology_info vnuma_topology_info_t;
> > -DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t);
> > +typedef struct xen_vnuma_topology_info xen_vnuma_topology_info_t;
> > +DEFINE_XEN_GUEST_HANDLE(xen_vnuma_topology_info_t);
> >
> > /* Next available subop number is 27 */
> >
> > --- a/xen/include/xen/domain.h
> > +++ b/xen/include/xen/domain.h
> > @@ -100,7 +100,7 @@ struct vnuma_info {
> > unsigned int *vdistance;
> > unsigned int *vcpu_to_vnode;
> > unsigned int *vnode_to_pnode;
> > - struct vmemrange *vmemrange;
> > + struct xen_vmemrange *vmemrange;
> > };
> >
> > void vnuma_destroy(struct vnuma_info *vnuma);
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-25 15:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-25 12:36 [PATCH] vNUMA: rename interface structures Jan Beulich
2014-11-25 12:45 ` Andrew Cooper
2014-11-25 12:54 ` Ian Campbell
2014-11-25 14:11 ` Jan Beulich
2014-11-25 15:49 ` Konrad Rzeszutek Wilk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.