ia64/xen-unstable

changeset 7201:e6303281ca6c

Merge to restore reverted changes.
author jrb44@swoop.cl.cam.ac.uk
date Tue Oct 04 14:38:56 2005 +0100 (2005-10-04)
parents b27d526d4033 4c4dbbda367e
children 34d251183985
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Tue Oct 04 14:37:59 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Tue Oct 04 14:38:56 2005 +0100
     1.3 @@ -553,9 +553,9 @@ static void net_tx_action(unsigned long 
     1.4  
     1.5  		/* No crossing a page as the payload mustn't fragment. */
     1.6  		if (unlikely((txreq.offset + txreq.size) >= PAGE_SIZE)) {
     1.7 -			DPRINTK("txreq.addr: %lx, size: %u, end: %lu\n", 
     1.8 -				txreq.addr, txreq.size, 
     1.9 -				(txreq.addr &~PAGE_MASK) + txreq.size);
    1.10 +			DPRINTK("txreq.offset: %x, size: %u, end: %lu\n", 
    1.11 +				txreq.offset, txreq.size, 
    1.12 +				(txreq.offset &~PAGE_MASK) + txreq.size);
    1.13  			make_tx_response(netif, txreq.id, NETIF_RSP_ERROR);
    1.14  			netif_put(netif);
    1.15  			continue;
     2.1 --- a/tools/python/xen/xm/main.py	Tue Oct 04 14:37:59 2005 +0100
     2.2 +++ b/tools/python/xen/xm/main.py	Tue Oct 04 14:38:56 2005 +0100
     2.3 @@ -32,6 +32,7 @@ import warnings
     2.4  warnings.filterwarnings('ignore', category=FutureWarning)
     2.5  
     2.6  import xen.xend.XendError
     2.7 +import xen.xend.XendProtocol
     2.8  
     2.9  from xen.xend import PrettyPrint
    2.10  from xen.xend import sxp
    2.11 @@ -710,6 +711,14 @@ def main(argv=sys.argv):
    2.12                  print
    2.13                  print "Please report to xen-devel@lists.xensource.com"
    2.14                  raise
    2.15 +        except xen.xend.XendProtocol.XendError, ex:
    2.16 +            if len(args) > 0:
    2.17 +                handle_xend_error(argv[1], args[0], ex)
    2.18 +            else:
    2.19 +                print "Unexpected error:", sys.exc_info()[0]
    2.20 +                print
    2.21 +                print "Please report to xen-devel@lists.xensource.com"
    2.22 +                raise
    2.23          except SystemExit:
    2.24              sys.exit(1)
    2.25          except: