[Xen-changelog] Merge to restore reverted changes.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User jrb44@xxxxxxxxxxxxxxxxxx
# Node ID e6303281ca6cc8d5d58ff50b6841e3a181fec55a
# Parent  b27d526d4033f25c81dc82b131b3508e46e39480
# Parent  4c4dbbda367ed9eb6004a40baa6cb27ba551c963
Merge to restore reverted changes.

diff -r b27d526d4033 -r e6303281ca6c 
linux-2.6-xen-sparse/drivers/xen/netback/netback.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Tue Oct  4 
13:37:59 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Tue Oct  4 
13:38:56 2005
@@ -553,9 +553,9 @@
 
                /* No crossing a page as the payload mustn't fragment. */
                if (unlikely((txreq.offset + txreq.size) >= PAGE_SIZE)) {
-                       DPRINTK("txreq.addr: %lx, size: %u, end: %lu\n", 
-                               txreq.addr, txreq.size, 
-                               (txreq.addr &~PAGE_MASK) + txreq.size);
+                       DPRINTK("txreq.offset: %x, size: %u, end: %lu\n", 
+                               txreq.offset, txreq.size, 
+                               (txreq.offset &~PAGE_MASK) + txreq.size);
                        make_tx_response(netif, txreq.id, NETIF_RSP_ERROR);
                        netif_put(netif);
                        continue;
diff -r b27d526d4033 -r e6303281ca6c tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Tue Oct  4 13:37:59 2005
+++ b/tools/python/xen/xm/main.py       Tue Oct  4 13:38:56 2005
@@ -32,6 +32,7 @@
 warnings.filterwarnings('ignore', category=FutureWarning)
 
 import xen.xend.XendError
+import xen.xend.XendProtocol
 
 from xen.xend import PrettyPrint
 from xen.xend import sxp
@@ -710,6 +711,14 @@
                 print
                 print "Please report to xen-devel@xxxxxxxxxxxxxxxxxxx"
                 raise
+        except xen.xend.XendProtocol.XendError, ex:
+            if len(args) > 0:
+                handle_xend_error(argv[1], args[0], ex)
+            else:
+                print "Unexpected error:", sys.exc_info()[0]
+                print
+                print "Please report to xen-devel@xxxxxxxxxxxxxxxxxxx"
+                raise
         except SystemExit:
             sys.exit(1)
         except:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog