xl: Enable by default claim mode.

During the Xen 4.3 release we discussed that this feature could be
turned on by default - as it benefits all of the guests - not just
tmem related.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5
index 1229c8aedbbdde39467dfd0dbe62991a6bb81ba7..125f786e6bb16a12e6fb8420ed27b8d2d259daed 100644 (file)
--- a/docs/man/xl.conf.pod.5
+++ b/docs/man/xl.conf.pod.5
@@ -139,7 +139,7 @@ Xen hypervisor argument and as well on the Linux kernel command line.
 Note that the claim call is not attempted if C<superpages> option is
 used in the guest config (see xl.cfg(5)).
 
-Default: C<0>
+Default: C<1>
 
 =over 4
 

diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf
index 9c037a6a58637c4b63100a802492dc7b577e58b0..12ea737bd739f108ef1dfc206948548c7c92538a 100644 (file)
--- a/tools/examples/xl.conf
+++ b/tools/examples/xl.conf
@@ -32,4 +32,4 @@
 # feedback whether the guest can be launched due to memory exhaustion
 # (which can take a long time to find out if launching huge guests).
 # see xl.conf(5) for details.
-#claim_mode=0
+#claim_mode=1

diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index 1ce820c5335e09230cec2af905a77e03863f4e66..0750f60b8dc322ba08eee3c4acc71cb5bf6f7794 100644 (file)
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -46,7 +46,7 @@ char *default_vifscript = NULL;
 char *default_bridge = NULL;
 char *default_gatewaydev = NULL;
 enum output_format default_output_format = OUTPUT_FORMAT_JSON;
-int claim_mode = 0;
+int claim_mode = 1;
 
 static xentoollog_level minmsglevel = XTL_PROGRESS;