xl: set default maptrack frames to 1024

This is in line with the previous behavior, setting the number of
maptrack frames to 0 will prevent driver domains from working
correctly.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-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 fe2cf27ea4ced09a38426676bda42bbe6c334417..da91b8626c5334cda344fd9ee707a8b7de907520 100644 (file)
--- a/docs/man/xl.conf.pod.5
+++ b/docs/man/xl.conf.pod.5
@@ -87,7 +87,7 @@ Default: C<32> on hosts up to 16TB of memory, C<64> on hosts larger than 16TB
 
 Sets the default value for the C<max_maptrack_frames> domain config value.
 
-Default: C<0>
+Default: C<1024>
 
 =item B<vif.default.script="PATH">
 

diff --git a/tools/xl/xl.c b/tools/xl/xl.c
index c1bbb4b9397c19c74fe7d462a93f39ae5ce0e1be..179908b4f65b1665ca6008f93743acbe5a5a9970 100644 (file)
--- a/tools/xl/xl.c
+++ b/tools/xl/xl.c
@@ -46,7 +46,7 @@ enum output_format default_output_format = OUTPUT_FORMAT_JSON;
 int claim_mode = 1;
 bool progress_use_cr = 0;
 int max_grant_frames = -1;
-int max_maptrack_frames = 0;
+int max_maptrack_frames = -1;
 
 xentoollog_level minmsglevel = minmsglevel_default;
 

diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index d0106f4830dad09198619e8ff322eadf62c8c7a4..084e49adee2edf40f534153c4fe7b6e9f94af8c3 100644 (file)
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -1041,7 +1041,7 @@ void parse_config_data(const char *config_source,
         b_info->max_grant_frames = max_grant_frames;
     if (!xlu_cfg_get_long (config, "max_maptrack_frames", &l, 0))
         b_info->max_maptrack_frames = l;
-    else
+    else if (max_maptrack_frames != -1)
         b_info->max_maptrack_frames = max_maptrack_frames;
 
     libxl_defbool_set(&b_info->claim_mode, claim_mode);