ia64/xen-unstable

changeset 3267:c00fbb136368

bitkeeper revision 1.1159.183.50 (41bade11ZSz_tRmhJ1YXNhP6oQWRzg)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Sat Dec 11 11:46:25 2004 +0000 (2004-12-11)
parents bf681d2cb7c8 5195a9576f40
children f21030c169e2
files tools/libxc/xc.h tools/libxc/xc_linux_save.c
line diff
     1.1 --- a/tools/libxc/xc.h	Thu Dec 09 18:30:32 2004 +0000
     1.2 +++ b/tools/libxc/xc.h	Sat Dec 11 11:46:25 2004 +0000
     1.3 @@ -9,14 +9,15 @@
     1.4  #ifndef __XC_H__
     1.5  #define __XC_H__
     1.6  
     1.7 -typedef unsigned char      u8;
     1.8 -typedef unsigned short     u16;
     1.9 -typedef unsigned long      u32;
    1.10 -typedef unsigned long long u64;
    1.11 -typedef signed char        s8;
    1.12 -typedef signed short       s16;
    1.13 -typedef signed long        s32;
    1.14 -typedef signed long long   s64;
    1.15 +#include <stdint.h>
    1.16 +typedef uint8_t            u8;
    1.17 +typedef uint16_t           u16;
    1.18 +typedef uint32_t           u32;
    1.19 +typedef uint64_t           u64;
    1.20 +typedef int8_t             s8;
    1.21 +typedef int16_t            s16;
    1.22 +typedef int32_t            s32;
    1.23 +typedef int64_t            s64;
    1.24  
    1.25  #include <xen/xen.h>
    1.26  #include <xen/dom0_ops.h>
     2.1 --- a/tools/libxc/xc_linux_save.c	Thu Dec 09 18:30:32 2004 +0000
     2.2 +++ b/tools/libxc/xc_linux_save.c	Sat Dec 11 11:46:25 2004 +0000
     2.3 @@ -6,6 +6,7 @@
     2.4   * Copyright (c) 2003, K A Fraser.
     2.5   */
     2.6  
     2.7 +#include <inttypes.h>
     2.8  #include <sys/time.h>
     2.9  #include "xc_private.h"
    2.10  #include <xen/linux/suspend.h>
    2.11 @@ -245,7 +246,7 @@ static int print_stats( int xc_handle, u
    2.12  
    2.13      if ( print )
    2.14          printf("delta %lldms, dom0 %d%%, target %d%%, sent %dMb/s, "
    2.15 -               "dirtied %dMb/s %ld pages\n",
    2.16 +               "dirtied %dMb/s %" PRId32 " pages\n",
    2.17                 wall_delta, 
    2.18                 (int)((d0_cpu_delta*100)/wall_delta),
    2.19                 (int)((d1_cpu_delta*100)/wall_delta),
    2.20 @@ -307,8 +308,8 @@ static int analysis_phase( int xc_handle
    2.21                                 DOM0_SHADOW_CONTROL_OP_PEEK,
    2.22                                 NULL, 0, &stats);
    2.23  
    2.24 -            printf("now= %lld faults= %ld dirty= %ld dirty_net= %ld "
    2.25 -                   "dirty_block= %ld\n", 
    2.26 +            printf("now= %lld faults= %" PRId32 " dirty= %" PRId32
    2.27 +                   " dirty_net= %" PRId32 " dirty_block= %" PRId32"\n", 
    2.28                     ((now-start)+500)/1000, 
    2.29                     stats.fault_count, stats.dirty_count,
    2.30                     stats.dirty_net_count, stats.dirty_block_count);