From: Konrad Rzeszutek Wilk <konrad@kernel.org>
Date: Fri, 19 Jul 2013 15:31:10 +0000 (-0400)
Subject: xl: Enable by default claim mode.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6608
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f3e5942b1f15ce238aa53a5e176467ac2d15e3ca;p=xen.git

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 1229c8aedb..125f786e6b 100644
--- 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 9c037a6a58..12ea737bd7 100644
--- 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 1ce820c533..0750f60b8d 100644
--- 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;