# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1243408770 -3600
# Node ID fcc71d02340809901b656eb4134383f36a7c7875
# Parent f0e2df69a8eb2f560af5626807b81ca4f41afd39
tmem: build fix
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/common/tmem.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff -r f0e2df69a8eb -r fcc71d023408 xen/common/tmem.c
--- a/xen/common/tmem.c Tue May 26 15:01:36 2009 +0100
+++ b/xen/common/tmem.c Wed May 27 08:19:30 2009 +0100
@@ -1564,9 +1564,9 @@ static int tmemc_list_client(client_t *c
c->frozen, use_long ? ',' : '\n');
if (use_long)
n += scnprintf(info+n,BSIZE-n,
- "Ec:%ld,Em:%ld,cp:%ld,cb:%lld,cn:%ld,cm:%ld\n",
+ "Ec:%ld,Em:%ld,cp:%ld,cb:%"PRId64",cn:%ld,cm:%ld\n",
c->eph_count, c->eph_count_max,
- c->compressed_pages, (long long)c->compressed_sum_size,
+ c->compressed_pages, c->compressed_sum_size,
c->compress_poor, c->compress_nomem);
tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1);
sum += n;
@@ -1575,11 +1575,13 @@ static int tmemc_list_client(client_t *c
if ( (p = c->pools[i]) == NULL )
continue;
s = is_shared(p);
- n = scnprintf(info,BSIZE,"P=CI:%d,PI:%d,PT:%c%c,U0:%llx,U1:%llx%c",
- c->cli_id, p->pool_id,
- is_persistent(p) ? 'P' : 'E', s ? 'S' : 'P',
- s ? p->uuid[0] : 0LL, s ? p->uuid[1] : 0LL,
- use_long ? ',' : '\n');
+ n = scnprintf(info,BSIZE,"P=CI:%d,PI:%d,"
+ "PT:%c%c,U0:%"PRIx64",U1:%"PRIx64"%c",
+ c->cli_id, p->pool_id,
+ is_persistent(p) ? 'P' : 'E', s ? 'S' : 'P',
+ (uint64_t)(s ? p->uuid[0] : 0),
+ (uint64_t)(s ? p->uuid[1] : 0LL),
+ use_long ? ',' : '\n');
if (use_long)
n += scnprintf(info+n,BSIZE-n,
"Pc:%d,Pm:%d,Oc:%ld,Om:%ld,Nc:%lu,Nm:%lu,"
@@ -1612,9 +1614,10 @@ static int tmemc_list_shared(tmem_cli_va
{
if ( (p = global_shared_pools[i]) == NULL )
continue;
- n = scnprintf(info+n,BSIZE-n,"S=SI:%d,PT:%c%c,U0:%llx,U1:%llx",
- i, is_persistent(p) ? 'P' : 'E', is_shared(p) ? 'S' : 'P',
- (unsigned long long)p->uuid[0], (unsigned long long)p->uuid[1]);
+ n = scnprintf(info+n,BSIZE-n,"S=SI:%d,PT:%c%c,U0:%"PRIx64",U1:%"PRIx64,
+ i, is_persistent(p) ? 'P' : 'E',
+ is_shared(p) ? 'S' : 'P',
+ p->uuid[0], p->uuid[1]);
list_for_each_entry(sl,&p->share_list, share_list)
n += scnprintf(info+n,BSIZE-n,",SC:%d",sl->client->cli_id);
n += scnprintf(info+n,BSIZE-n,"%c", use_long ? ',' : '\n');
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home