ia64/xen-unstable

changeset 2334:7c3a3f3cf69b

bitkeeper revision 1.1159.1.96 (412a083dAhGUZb_6ytHtPU56pIh13g)

cleanup
author iap10@labyrinth.cl.cam.ac.uk
date Mon Aug 23 15:07:41 2004 +0000 (2004-08-23)
parents 42cb70ed79f0
children ccc97f55e26d
files tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c
line diff
     1.1 --- a/tools/libxc/xc_linux_restore.c	Sat Aug 21 16:36:12 2004 +0000
     1.2 +++ b/tools/libxc/xc_linux_restore.c	Mon Aug 23 15:07:41 2004 +0000
     1.3 @@ -11,7 +11,7 @@
     1.4  
     1.5  #define MAX_BATCH_SIZE 1024
     1.6  
     1.7 -#define DEBUG 1
     1.8 +#define DEBUG 0
     1.9  
    1.10  #if DEBUG
    1.11  #define DPRINTF(_f, _a...) printf ( _f , ## _a )
    1.12 @@ -475,7 +475,6 @@ int xc_linux_restore(int xc_handle, XcIO
    1.13      {
    1.14          if ( pfn_type[i] == (L1TAB|LPINTAB) )
    1.15          {
    1.16 -printf("XXXXXXXXXXXXXXX pin L1\n");
    1.17              if ( add_mmu_update(xc_handle, mmu,
    1.18                                  (pfn_to_mfn_table[i]<<PAGE_SHIFT) | 
    1.19                                  MMU_EXTENDED_COMMAND,
    1.20 @@ -487,7 +486,6 @@ printf("XXXXXXXXXXXXXXX pin L1\n");
    1.21          }
    1.22          else if ( pfn_type[i] == (L2TAB|LPINTAB) )
    1.23          {
    1.24 -printf("XXXXXXXXXXXXXXX pin L2\n");
    1.25              if ( add_mmu_update(xc_handle, mmu,
    1.26                                  (pfn_to_mfn_table[i]<<PAGE_SHIFT) | 
    1.27                                  MMU_EXTENDED_COMMAND,
     2.1 --- a/tools/libxc/xc_linux_save.c	Sat Aug 21 16:36:12 2004 +0000
     2.2 +++ b/tools/libxc/xc_linux_save.c	Mon Aug 23 15:07:41 2004 +0000
     2.3 @@ -12,8 +12,8 @@
     2.4  
     2.5  #define BATCH_SIZE 1024   /* 1024 pages (4MB) at a time */
     2.6  
     2.7 -#define DEBUG 1
     2.8 -#define DDEBUG 1
     2.9 +#define DEBUG  0
    2.10 +#define DDEBUG 0
    2.11  
    2.12  #if DEBUG
    2.13  #define DPRINTF(_f, _a...) printf ( _f , ## _a )
    2.14 @@ -413,12 +413,12 @@ int xc_linux_save(int xc_handle, XcIOCon
    2.15  
    2.16      /* Setup the mfn_to_pfn table mapping */
    2.17      mfn_to_pfn_table_start_mfn = xc_get_m2p_start_mfn( xc_handle );
    2.18 -printf("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n");
    2.19 +
    2.20      live_mfn_to_pfn_table = 
    2.21  	xc_map_foreign_range(xc_handle, DOMID_XEN, 
    2.22  			      PAGE_SIZE*1024, PROT_READ, 
    2.23  			      mfn_to_pfn_table_start_mfn );
    2.24 -printf("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n");
    2.25 +
    2.26      /* Canonicalise the pfn-to-mfn table frame-number list. */
    2.27      memcpy( pfn_to_mfn_frame_list, live_pfn_to_mfn_frame_list, PAGE_SIZE );
    2.28  
    2.29 @@ -432,8 +432,8 @@ printf("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
    2.30  
    2.31      /* Domain is still running at this point */
    2.32  
    2.33 -    if( live ){
    2.34 -printf("GO LIVE!!\n");
    2.35 +    if( live )
    2.36 +    {
    2.37          if ( xc_shadow_control( xc_handle, domid, 
    2.38                                  DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY,
    2.39                                  NULL, 0, NULL ) < 0 ) {
    2.40 @@ -669,7 +669,6 @@ printf("GO LIVE!!\n");
    2.41              for ( j = 0; j < batch; j++ ){
    2.42                  if ( (pfn_type[j] & LTAB_MASK) == XTAB ){
    2.43                      DDPRINTF("type fail: page %i mfn %08lx\n",j,pfn_type[j]);
    2.44 -printf("type fail: page %i mfn %08lx\n",j,pfn_type[j]);
    2.45                      continue;
    2.46                  }
    2.47    
    2.48 @@ -902,9 +901,6 @@ printf("type fail: page %i mfn %08lx\n",
    2.49          goto out;
    2.50      }
    2.51  
    2.52 -
    2.53 -printf("nrpfns according to suspend record is %ld\n", p_srec->nr_pfns );
    2.54 -
    2.55      if (nr_pfns != p_srec->nr_pfns )
    2.56      {
    2.57  	xcio_error(ioctxt, "Suspend record nr_pfns unexpected (%ld != %ld)",
    2.58 @@ -940,7 +936,6 @@ printf("nrpfns according to suspend reco
    2.59          goto out;
    2.60      }
    2.61  
    2.62 -printf("Everything saved OK!\n");
    2.63   out:
    2.64  
    2.65      if ( live_shinfo )          munmap(live_shinfo, PAGE_SIZE);