[Xen-changelog] merge?

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 9c9a3bb878c2c1c9cc932cbc90335ad701b0e009
# Parent  541a3239f352581299cbb9cdd476fcdd86b9755c
# Parent  810039218827f6641f657ee87ed2806ff93a233c
merge?

diff -r 541a3239f352 -r 9c9a3bb878c2 tools/examples/network-bridge
--- a/tools/examples/network-bridge     Wed Sep 14 17:06:25 2005
+++ b/tools/examples/network-bridge     Wed Sep 14 17:06:37 2005
@@ -222,27 +222,31 @@
         return
     fi
 
-    brctl delif ${bridge} ${netdev}
-
-    if ifconfig veth0 2>/dev/null | grep -q veth0 ; then
-        brctl delif ${bridge} vif0.0
+    if ifconfig peth0 2>/dev/null | grep -q peth0 ; then
+
         ifconfig vif0.0 down
-        mac=`ifconfig veth0 | grep HWadd | sed -e 
's/.*\(..:..:..:..:..:..\).*/\1/'`
-        ifconfig ${netdev} down
-        ifconfig ${netdev} hw ether ${mac}
-        ifconfig ${netdev} arp up
-        transfer_addrs veth0 ${netdev}
-        transfer_routes veth0 ${netdev}
-        del_addrs veth0
-        ifconfig veth0 -arp down
-        ifconfig veth0 hw ether 00:00:00:00:00:00
+        mac=`ifconfig eth0 | grep HWadd | \
+            sed -e 's/.*\(..:..:..:..:..:..\).*/\1/'`
+        ifconfig ${netdev} 0.0.0.0 down
+        ifconfig ${netdev} hw ether fe:ff:ff:ff:ff:ff
+
+        ifconfig p${netdev} down
+        ifconfig p${netdev} hw ether ${mac} arp 
+        brctl delif ${bridge} p${netdev}
+
+        ip link set eth0 name veth0
+        ip link set peth0 name eth0
+        ifconfig ${bridge} down
+        brctl delbr ${bridge}
+        ifup eth0
+
     else
         transfer_routes ${bridge} ${netdev}
     fi
 }
 
 case ${OP} in
-  start)
+    start)
         op_start
         ;;
     
diff -r 541a3239f352 -r 9c9a3bb878c2 tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c  Wed Sep 14 17:06:25 2005
+++ b/tools/libxc/xc_private.c  Wed Sep 14 17:06:37 2005
@@ -456,14 +456,14 @@
     unsigned long new_mfn;
 
     if ( xc_domain_memory_decrease_reservation( 
-       xc_handle, domid, 1, 0, &mfn) != 1 )
+       xc_handle, domid, 1, 0, &mfn) != 0 )
     {
        fprintf(stderr,"xc_make_page_below_4G decrease failed. mfn=%lx\n",mfn);
        return 0;
     }
 
     if ( xc_domain_memory_increase_reservation(
-        xc_handle, domid, 1, 0, 32, &new_mfn) != 1 )
+        xc_handle, domid, 1, 0, 32, &new_mfn) != 0 )
     {
        fprintf(stderr,"xc_make_page_below_4G increase failed. mfn=%lx\n",mfn);
        return 0;

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