diff options
author | Keir Fraser <keir@xen.org> | 2010-12-10 11:01:19 +0000 |
---|---|---|
committer | Keir Fraser <keir@xen.org> | 2010-12-10 11:01:19 +0000 |
commit | ac989b123e22114c9b9860ec172284ef68fd4d9f (patch) | |
tree | b8b7054510798deba084316610ae005cd8ebd51d /xen/common/tmem.c | |
parent | c2c4d13efeed09e1568f79821515b90b3a7df6be (diff) | |
download | xen-ac989b123e22114c9b9860ec172284ef68fd4d9f.tar.gz xen-ac989b123e22114c9b9860ec172284ef68fd4d9f.tar.bz2 xen-ac989b123e22114c9b9860ec172284ef68fd4d9f.zip |
tmem: Use of 'new' clashes with C++ reserved namespace.
Rename to 'creat', which does not conflict.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/common/tmem.c')
-rw-r--r-- | xen/common/tmem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 5a7de5c523..6aed0a5908 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2669,14 +2669,14 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) } 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 uops) 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(); |