# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1291981141 0
# Node ID 13c7c6fade3667279b5ff197ebed90874e328bee
# Parent 463ff2d3ed9349a06e08b282fc07f1769b38f444
tmem: Use of 'new' clashes with C++ reserved namespace.
Rename to 'creat', which does not conflict.
Signed-off-by: Keir Fraser <keir@xxxxxxx>
xen-unstable changeset: 22481:0353037c6b95
xen-unstable date: Fri Dec 10 11:01:19 2010 +0000
---
tools/libxc/xc_tmem.c | 16 ++++++++--------
xen/common/tmem.c | 12 ++++++------
xen/include/public/tmem.h | 2 +-
xen/include/xen/tmem_xen.h | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff -r 463ff2d3ed93 -r 13c7c6fade36 tools/libxc/xc_tmem.c
--- a/tools/libxc/xc_tmem.c Fri Dec 10 11:36:57 2010 +0000
+++ b/tools/libxc/xc_tmem.c Fri Dec 10 11:39:01 2010 +0000
@@ -164,10 +164,10 @@ int xc_tmem_auth(int xc,
op.cmd = TMEM_AUTH;
op.pool_id = 0;
- op.u.new.arg1 = cli_id;
- op.u.new.flags = arg1;
- if ( xc_tmem_uuid_parse(uuid_str, &op.u.new.uuid[0],
- &op.u.new.uuid[1]) < 0 )
+ op.u.creat.arg1 = cli_id;
+ op.u.creat.flags = arg1;
+ if ( xc_tmem_uuid_parse(uuid_str, &op.u.creat.uuid[0],
+ &op.u.creat.uuid[1]) < 0 )
{
PERROR("Can't parse uuid, use xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
return -1;
@@ -356,10 +356,10 @@ static int xc_tmem_restore_new_pool(
op.cmd = TMEM_RESTORE_NEW;
op.pool_id = pool_id;
- op.u.new.arg1 = cli_id;
- op.u.new.flags = flags;
- op.u.new.uuid[0] = uuid_lo;
- op.u.new.uuid[1] = uuid_hi;
+ op.u.creat.arg1 = cli_id;
+ op.u.creat.flags = flags;
+ op.u.creat.uuid[0] = uuid_lo;
+ op.u.creat.uuid[1] = uuid_hi;
return do_tmem_op(xc, &op);
}
diff -r 463ff2d3ed93 -r 13c7c6fade36 xen/common/tmem.c
--- a/xen/common/tmem.c Fri Dec 10 11:36:57 2010 +0000
+++ b/xen/common/tmem.c Fri Dec 10 11:39:01 2010 +0000
@@ -2669,14 +2669,14 @@ EXPORT long do_tmem_op(tmem_cli_op_t uop
} else if ( op.cmd == TMEM_AUTH ) {
tmem_write_lock(&tmem_rwlock);
tmem_write_lock_set = 1;
- rc = tmemc_shared_pool_auth(op.u.new.arg1,op.u.new.uuid[0],
- op.u.new.uuid[1],op.u.new.flags);
+ rc = tmemc_shared_pool_auth(op.u.creat.arg1,op.u.creat.uuid[0],
+ op.u.creat.uuid[1],op.u.creat.flags);
goto out;
} else if ( op.cmd == TMEM_RESTORE_NEW ) {
tmem_write_lock(&tmem_rwlock);
tmem_write_lock_set = 1;
- rc = do_tmem_new_pool(op.u.new.arg1, op.pool_id, op.u.new.flags,
- op.u.new.uuid[0], op.u.new.uuid[1]);
+ rc = do_tmem_new_pool(op.u.creat.arg1, op.pool_id, op.u.creat.flags,
+ op.u.creat.uuid[0], op.u.creat.uuid[1]);
goto out;
}
@@ -2722,8 +2722,8 @@ EXPORT long do_tmem_op(tmem_cli_op_t uop
switch ( op.cmd )
{
case TMEM_NEW_POOL:
- rc = do_tmem_new_pool(CLI_ID_NULL, 0, op.u.new.flags,
- op.u.new.uuid[0], op.u.new.uuid[1]);
+ rc = do_tmem_new_pool(CLI_ID_NULL, 0, op.u.creat.flags,
+ op.u.creat.uuid[0], op.u.creat.uuid[1]);
break;
case TMEM_NEW_PAGE:
tmem_ensure_avail_pages();
diff -r 463ff2d3ed93 -r 13c7c6fade36 xen/include/public/tmem.h
--- a/xen/include/public/tmem.h Fri Dec 10 11:36:57 2010 +0000
+++ b/xen/include/public/tmem.h Fri Dec 10 11:39:01 2010 +0000
@@ -105,7 +105,7 @@ struct tmem_op {
uint64_t uuid[2];
uint32_t flags;
uint32_t arg1;
- } new; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */
+ } creat; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */
struct {
uint32_t subop;
uint32_t cli_id;
diff -r 463ff2d3ed93 -r 13c7c6fade36 xen/include/xen/tmem_xen.h
--- a/xen/include/xen/tmem_xen.h Fri Dec 10 11:36:57 2010 +0000
+++ b/xen/include/xen/tmem_xen.h Fri Dec 10 11:39:01 2010 +0000
@@ -469,10 +469,10 @@ static inline int tmh_get_tmemop_from_cl
return rc;
switch ( cop.cmd )
{
- case TMEM_NEW_POOL: u = XLAT_tmem_op_u_new; break;
+ case TMEM_NEW_POOL: u = XLAT_tmem_op_u_creat; break;
case TMEM_CONTROL: u = XLAT_tmem_op_u_ctrl; break;
- case TMEM_AUTH: u = XLAT_tmem_op_u_new; break;
- case TMEM_RESTORE_NEW:u = XLAT_tmem_op_u_new; break;
+ case TMEM_AUTH: u = XLAT_tmem_op_u_creat; break;
+ case TMEM_RESTORE_NEW:u = XLAT_tmem_op_u_creat; break;
default: u = XLAT_tmem_op_u_gen ; break;
}
#define XLAT_tmem_op_HNDL_u_ctrl_buf(_d_, _s_) \
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home