ia64/xen-unstable

changeset 19649:fcc71d023408

tmem: build fix

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed May 27 08:19:30 2009 +0100 (2009-05-27)
parents f0e2df69a8eb
children 6705898f768d
files xen/common/tmem.c
line diff
     1.1 --- a/xen/common/tmem.c	Tue May 26 15:01:36 2009 +0100
     1.2 +++ b/xen/common/tmem.c	Wed May 27 08:19:30 2009 +0100
     1.3 @@ -1564,9 +1564,9 @@ static int tmemc_list_client(client_t *c
     1.4          c->frozen, use_long ? ',' : '\n');
     1.5      if (use_long)
     1.6          n += scnprintf(info+n,BSIZE-n,
     1.7 -             "Ec:%ld,Em:%ld,cp:%ld,cb:%lld,cn:%ld,cm:%ld\n",
     1.8 +             "Ec:%ld,Em:%ld,cp:%ld,cb:%"PRId64",cn:%ld,cm:%ld\n",
     1.9               c->eph_count, c->eph_count_max,
    1.10 -             c->compressed_pages, (long long)c->compressed_sum_size,
    1.11 +             c->compressed_pages, c->compressed_sum_size,
    1.12               c->compress_poor, c->compress_nomem);
    1.13      tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1);
    1.14      sum += n;
    1.15 @@ -1575,11 +1575,13 @@ static int tmemc_list_client(client_t *c
    1.16          if ( (p = c->pools[i]) == NULL )
    1.17              continue;
    1.18          s = is_shared(p);
    1.19 -        n = scnprintf(info,BSIZE,"P=CI:%d,PI:%d,PT:%c%c,U0:%llx,U1:%llx%c",
    1.20 -             c->cli_id, p->pool_id,
    1.21 -             is_persistent(p) ? 'P' : 'E', s ? 'S' : 'P',
    1.22 -             s ? p->uuid[0] : 0LL, s ? p->uuid[1] : 0LL,
    1.23 -             use_long ? ',' : '\n');
    1.24 +        n = scnprintf(info,BSIZE,"P=CI:%d,PI:%d,"
    1.25 +                      "PT:%c%c,U0:%"PRIx64",U1:%"PRIx64"%c",
    1.26 +                      c->cli_id, p->pool_id,
    1.27 +                      is_persistent(p) ? 'P' : 'E', s ? 'S' : 'P',
    1.28 +                      (uint64_t)(s ? p->uuid[0] : 0),
    1.29 +                      (uint64_t)(s ? p->uuid[1] : 0LL),
    1.30 +                      use_long ? ',' : '\n');
    1.31          if (use_long)
    1.32              n += scnprintf(info+n,BSIZE-n,
    1.33               "Pc:%d,Pm:%d,Oc:%ld,Om:%ld,Nc:%lu,Nm:%lu,"
    1.34 @@ -1612,9 +1614,10 @@ static int tmemc_list_shared(tmem_cli_va
    1.35      {
    1.36          if ( (p = global_shared_pools[i]) == NULL )
    1.37              continue;
    1.38 -        n = scnprintf(info+n,BSIZE-n,"S=SI:%d,PT:%c%c,U0:%llx,U1:%llx",
    1.39 -            i, is_persistent(p) ? 'P' : 'E', is_shared(p) ? 'S' : 'P',
    1.40 -             (unsigned long long)p->uuid[0], (unsigned long long)p->uuid[1]);
    1.41 +        n = scnprintf(info+n,BSIZE-n,"S=SI:%d,PT:%c%c,U0:%"PRIx64",U1:%"PRIx64,
    1.42 +                      i, is_persistent(p) ? 'P' : 'E',
    1.43 +                      is_shared(p) ? 'S' : 'P',
    1.44 +                      p->uuid[0], p->uuid[1]);
    1.45          list_for_each_entry(sl,&p->share_list, share_list)
    1.46              n += scnprintf(info+n,BSIZE-n,",SC:%d",sl->client->cli_id);
    1.47          n += scnprintf(info+n,BSIZE-n,"%c", use_long ? ',' : '\n');