ia64/xen-unstable

changeset 1605:75dec051cc70

bitkeeper revision 1.1023.1.4 (40e0456eh9GQjlKMip9VLoUGxtn2SA)

More merge fixes.
author mjw@wray-m-3.hpl.hp.com
date Mon Jun 28 16:21:02 2004 +0000 (2004-06-28)
parents 6ad69c5289fb
children be911ab15381
files tools/xc/lib/xc_linux_save.c tools/xc/lib/xc_private.h tools/xen/lib/xend/sxp.py
line diff
     1.1 --- a/tools/xc/lib/xc_linux_save.c	Mon Jun 28 16:15:27 2004 +0000
     1.2 +++ b/tools/xc/lib/xc_linux_save.c	Mon Jun 28 16:21:02 2004 +0000
     1.3 @@ -399,7 +399,7 @@ int xc_linux_save(int xc_handle, XcIOCon
     1.4      if( live ){ 
     1.5          if ( xc_shadow_control( xc_handle, domid, 
     1.6                                  DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY,
     1.7 -                                NULL, 0, NULL ) < 0 )
     1.8 +                                NULL, 0, NULL ) < 0 ) {
     1.9              xcio_error(ioctxt, "Couldn't enable shadow mode");
    1.10              goto out;
    1.11          }
    1.12 @@ -544,23 +544,24 @@ int xc_linux_save(int xc_handle, XcIOCon
    1.13              {
    1.14                  int n = permute(N, nr_pfns, order_nr );
    1.15  
    1.16 -                if ( 0 && debug )
    1.17 +                if ( 0 && debug ) {
    1.18                      fprintf(stderr,"%d pfn= %08lx mfn= %08lx %d  "
    1.19                              " [mfn]= %08lx\n",
    1.20 -                            iter, n, live_pfn_to_mfn_table[n],
    1.21 +                            iter, (unsigned long)n, live_pfn_to_mfn_table[n],
    1.22                              test_bit(n,to_send),
    1.23                              live_mfn_to_pfn_table[live_pfn_to_mfn_table[n]&
    1.24                                                   0xFFFFF]);
    1.25 +                }
    1.26  
    1.27                  if ( !last_iter && 
    1.28                       test_bit(n, to_send) && 
    1.29 -                     test_bit(n, to_skip) )
    1.30 +                     test_bit(n, to_skip) ) {
    1.31                      skip_this_iter++; /* stats keeping */
    1.32                  }
    1.33  
    1.34                  if ( !((test_bit(n, to_send) && !test_bit(n, to_skip)) ||
    1.35                         (test_bit(n, to_send) && last_iter) ||
    1.36 -                       (test_bit(n, to_fix)  && last_iter)) )
    1.37 +                       (test_bit(n, to_fix)  && last_iter)) ) {
    1.38                      continue;
    1.39                  }
    1.40  
     2.1 --- a/tools/xc/lib/xc_private.h	Mon Jun 28 16:15:27 2004 +0000
     2.2 +++ b/tools/xc/lib/xc_private.h	Mon Jun 28 16:21:02 2004 +0000
     2.3 @@ -205,4 +205,9 @@ void * mfn_mapper_queue_entry(mfn_mapper
     2.4  long long  xc_domain_get_cpu_usage( int xc_handle, domid_t domid );
     2.5  
     2.6  #include "xc_io.h"
     2.7 +
     2.8 +int xc_domain_getfullinfo(int xc_handle,
     2.9 +                          u32 domid,
    2.10 +                          dom0_op_t *op,
    2.11 +                          full_execution_context_t *ctxt );
    2.12  #endif /* __XC_PRIVATE_H__ */
     3.1 --- a/tools/xen/lib/xend/sxp.py	Mon Jun 28 16:15:27 2004 +0000
     3.2 +++ b/tools/xen/lib/xend/sxp.py	Mon Jun 28 16:21:02 2004 +0000
     3.3 @@ -529,7 +529,7 @@ def to_string(sxpr):
     3.4      returns string
     3.5      """
     3.6      io = StringIO()
     3.7 -    sxp.show(sxpr, io)
     3.8 +    show(sxpr, io)
     3.9      io.seek(0)
    3.10      val = io.getvalue()
    3.11      io.close()