WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Don't use XendRoot.get_vif_bridge to provide a default b

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Don't use XendRoot.get_vif_bridge to provide a default bridge -- instead, pass
From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Sun, 30 Oct 2005 22:34:08 +0000
Delivery-date: Sun, 30 Oct 2005 22:32:08 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 03612b7f69d50b18e24e58b61dce45ffa467fab3
# Parent  601ae1c4fe61af96c99193fcf113e94c792bc1b6
Don't use XendRoot.get_vif_bridge to provide a default bridge -- instead, pass
no bridge parameter and let the vif-bridge script find one for itself.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>

diff -r 601ae1c4fe61 -r 03612b7f69d5 tools/python/xen/xend/server/netif.py
--- a/tools/python/xen/xend/server/netif.py     Sun Oct 30 12:42:30 2005
+++ b/tools/python/xen/xend/server/netif.py     Sun Oct 30 12:45:06 2005
@@ -51,22 +51,22 @@
         script = os.path.join(xroot.network_script_dir,
                               sxp.child_value(config, 'script',
                                               xroot.get_vif_script()))
-        bridge = sxp.child_value(config, 'bridge',
-                                 xroot.get_vif_bridge())
-        mac = sxp.child_value(config, 'mac')
+        bridge = sxp.child_value(config, 'bridge')
+        mac    = sxp.child_value(config, 'mac')
         ipaddr = _get_config_ipaddr(config)
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac' : mac,
-                 'bridge' : bridge,
+                 'mac'    : mac,
                  'handle' : "%i" % devid }
         if ipaddr:
             back['ip'] = ' '.join(ipaddr)
+        if bridge:
+            back['bridge'] = bridge
 
         front = { 'handle' : "%i" % devid,
-                  'mac' : mac }
+                  'mac'    : mac }
 
         return (devid, back, front)
 

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Don't use XendRoot.get_vif_bridge to provide a default bridge -- instead, pass, Xen patchbot -unstable <=