From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH for-4.6 v3] libxl: set stub domain size based on VRAM size Date: Mon, 13 Jul 2015 11:24:19 +0100 Message-ID: <1436783059-5798-1-git-send-email-ian.jackson@eu.citrix.com> References: <21923.37235.852479.985765@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <21923.37235.852479.985765@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, Ian Jackson , samuel.thibault@ens-lyon.org, Eric Shelton List-Id: xen-devel@lists.xenproject.org From: Eric Shelton Allocate additional memory to the stub domain for qemu-traditional if more than 4 MB is assigned to the video adapter to avoid out of memory condition for QEMU. Signed-off-by: Eric Shelton Signed-off-by: Ian Jackson --- v3: Use max_t() instead v2: Use max() --- tools/libxl/libxl_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index ad434f0..f700f9a 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1095,7 +1095,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) libxl_domain_build_info_init_type(&dm_config->b_info, LIBXL_DOMAIN_TYPE_PV); dm_config->b_info.max_vcpus = 1; - dm_config->b_info.max_memkb = 32 * 1024; + dm_config->b_info.max_memkb = 28 * 1024 + + max_t(uint64_t, guest_config->b_info.video_memkb, 4096); dm_config->b_info.target_memkb = dm_config->b_info.max_memkb; dm_config->b_info.u.pv.features = ""; -- 1.7.10.4