[xen master] xl: set default maptrack frames to 1024

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] xl: set default maptrack frames to 1024

patchbot
commit 31609d70bacafbe98f143cb61a86966e1957df87
Author:     Roger Pau Monne <[hidden email]>
AuthorDate: Mon Oct 9 14:30:07 2017 +0100
Commit:     Ian Jackson <[hidden email]>
CommitDate: Mon Oct 9 15:19:55 2017 +0100

    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é <[hidden email]>
    Acked-by: Ian Jackson <[hidden email]>
---
 docs/man/xl.conf.pod.5 | 2 +-
 tools/xl/xl.c          | 2 +-
 tools/xl/xl_parse.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5
index fe2cf27..da91b86 100644
--- 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 c1bbb4b..179908b 100644
--- 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 d0106f4..084e49a 100644
--- 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);
--
generated by git-patchbot for /home/xen/git/xen.git#master


_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog