xl: add vif.default.script

Replace vifscript with vif.default.script. The old config option is
kept for backwards compatibility.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: George Dunlap <george.dunlap@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 31aebcaa9093b96f4ffc764867eadf2fc591537f..7b9fcac2fa16e4d6a540c79b7fc28f21ba65afef 100644 (file)
--- a/docs/man/xl.conf.pod.5
+++ b/docs/man/xl.conf.pod.5
@@ -70,10 +70,12 @@ operations (primarily domain creation).
 
 Default: C</var/lock/xl>
 
-=item B<vifscript="PATH">
+=item B<vif.default.script="PATH">
 
 Configures the default hotplug script used by virtual network devices.
 
+The old B<vifscript> option is deprecated and should not be used.
+
 Default: C</etc/xen/scripts/vif-bridge>
 
 =item B<vif.default.bridge="NAME">

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