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 /tools/libxc/xc_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 'tools/libxc/xc_tmem.c')
-rw-r--r-- | tools/libxc/xc_tmem.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 019050cb97..d24917a084 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -187,10 +187,10 @@ int xc_tmem_auth(xc_interface *xch, 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; @@ -380,10 +380,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(xch, &op); } |