|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] vNUMA: rename interface structures
commit 13f72e92a32380e94cb0c86725a1b38a6d191461
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Nov 25 17:21:52 2014 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Nov 25 17:21:52 2014 +0100
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@xxxxxxxx>
Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
tools/libxc/include/xenctrl.h | 2 +-
tools/libxc/xc_domain.c | 2 +-
xen/common/domctl.c | 2 +-
xen/common/memory.c | 4 ++--
xen/include/public/domctl.h | 2 +-
xen/include/public/memory.h | 15 +++++++--------
xen/include/xen/domain.h | 2 +-
7 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h
index 45e282c..0ad8b8d 100644
--- 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);
diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index b071dea..b864872 100644
--- 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)
diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index d9c2635..f15dcfe 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(unsigned int
nr_vnodes,
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 )
diff --git a/xen/common/memory.c b/xen/common/memory.c
index cc36e39..9f21bd3 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd,
XEN_GUEST_HANDLE_PARAM(void) arg)
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_GUEST_HANDLE_PARAM(void) arg)
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 ||
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index 8da204e..57e2ed7 100644
--- 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);
diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
index f021958..595f953 100644
--- a/xen/include/public/memory.h
+++ b/xen/include/public/memory.h
@@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t);
#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 */
diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h
index 9215b0e..72667da 100644
--- 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);
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |