From 57bf097e5a10e16b7d0cf5bf6c48bc86d78a1553 Mon Sep 17 00:00:00 2001
From: Bob Ball <bob.ball@citrix.com>
Date: Tue, 3 Dec 2013 17:35:02 +0000
Subject: [PATCH] XenAPI:  Increase DomU's memory

Devstack has been increasing in complexity, and if we use too
much of our memory it can lead to fragmentation which in turn
causes a DomU error and a failure of random tests.

Change-Id: Ide9cc84625caed4e35a64a47ee1e92a6cd567651
---
 tools/xen/xenrc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index bdcaf992b2..c0ea3bc85e 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -13,7 +13,13 @@ CLEAN_TEMPLATES=${CLEAN_TEMPLATES:-false}
 
 # Size of image
 VDI_MB=${VDI_MB:-5000}
-OSDOMU_MEM_MB=3072
+
+# Devstack now contains many components.  3GB ram is not enough to prevent
+# swapping and memory fragmentation - the latter of which can cause failures
+# such as blkfront failing to plug a VBD and lead to random test fails.
+#
+# Set to 4GB so an 8GB XenServer VM can have a 1GB Dom0 and leave 3GB for VMs
+OSDOMU_MEM_MB=4096
 OSDOMU_VDI_GB=8
 
 # Network mapping. Specify bridge names or network names. Network names may