aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@citrix.com>2013-03-13 17:42:17 +0000
committerIan Jackson <Ian.Jackson@eu.citrix.com>2013-03-15 12:40:47 +0000
commit733b9c524dbc2bec318bfc3588ed1652455d30ec (patch)
treebd928fc3b5cf2ebf6c93ebe8938880b273e6e20a /tools/libxl
parente66be7e48421f0a67f29dd7d572d42c7627807c7 (diff)
downloadxen-733b9c524dbc2bec318bfc3588ed1652455d30ec.tar.gz
xen-733b9c524dbc2bec318bfc3588ed1652455d30ec.tar.bz2
xen-733b9c524dbc2bec318bfc3588ed1652455d30ec.zip
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>
Diffstat (limited to 'tools/libxl')
-rw-r--r--tools/libxl/xl.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index 9f45e4559f..4c598dbbad 100644
--- 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, "