xl: add vif.default.bridge

This is a replacement for defaultbridge xl.conf option. The now
deprecated defaultbridge is still supported.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5
index f8f7e7fc79c17411617824b1c23d7496b199a3a2..31aebcaa9093b96f4ffc764867eadf2fc591537f 100644 (file)
--- a/docs/man/xl.conf.pod.5
+++ b/docs/man/xl.conf.pod.5
@@ -76,10 +76,12 @@ Configures the default hotplug script used by virtual network devices.
 
 Default: C</etc/xen/scripts/vif-bridge>
 
-=item B<defaultbridge="NAME">
+=item B<vif.default.bridge="NAME">
 
 Configures the default bridge to set for virtual network devices.
 
+The old B<defaultbridge> option is deprecated and should not be used.
+
 Default: C<xenbr0>
 
 =item B<vif.default.gatewaydev="NAME">

diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf
index 9a03ffffe3903897ae56cd59750610aa091ea0db..b0caa3295bd39feb36f3cae37c9c714a488caa1c 100644 (file)
--- a/tools/examples/xl.conf
+++ b/tools/examples/xl.conf
@@ -23,3 +23,6 @@
 
 # default gateway device to use with vif-route hotplug script
 #vif.default.gatewaydev="eth0"
+
+# default bridge device to use with vif-bridge hotplug scripts
+#vif.default.bridge="xenbr0"

diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index 71561a49efb8892c43d656e66b6cae86ef36dfc9..9f45e4559f851b900384b433a76b2f6d508f3cb2 100644 (file)
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -99,8 +99,17 @@ static void parse_global_config(const char *configfile,
     if (!xlu_cfg_get_string (config, "vifscript", &buf, 0))
         default_vifscript = strdup(buf);
 
-    if (!xlu_cfg_get_string (config, "defaultbridge", &buf, 0))
-       default_bridge = strdup(buf);
+    if (!xlu_cfg_get_string (config, "defaultbridge", &buf, 0)) {
+        fprintf(stderr, "the global config option defaultbridge is deprecated, "
+                        "please switch to vif.default.bridge\n");
+        free(default_bridge);
+        default_bridge = strdup(buf);
+    }
+
+    if (!xlu_cfg_get_string (config, "vif.default.bridge", &buf, 0)) {
+        free(default_bridge);
+        default_bridge = strdup(buf);
+    }
 
     if (!xlu_cfg_get_string (config, "vif.default.gatewaydev", &buf, 0))
         default_gatewaydev = strdup(buf);