From: Wei Liu Subject: [PATCH OSSTEST RFC 5/5] ts-debian-fixup: workaround Debian bug #691320 Date: Thu, 19 Sep 2013 17:02:21 +0100 Message-ID: <1379606541-12364-6-git-send-email-wei.liu2@citrix.com> References: <1379606541-12364-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1379606541-12364-1-git-send-email-wei.liu2@citrix.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.xen.org Cc: wei.liu2@citrix.com, ian.jackson@eu.citrix.com, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Wei Liu --- ts-debian-fixup | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ts-debian-fixup b/ts-debian-fixup index f001418..f62bb37 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -118,6 +118,20 @@ sub otherfixupcfg () { $cfg =~ s/^vcpus.*//mg; $cfg .= "\nvcpus = $vcpus\n"; + # Debian bug #691320 + # Wheezy's xen-create-image writes incorrect memory= option in + # config file. This is fixed in newer version of xen-tools but it + # is not likely to go in in short term. + # On the other hand we should consider making xl support '512M', + # '2G' etc. But xend will still need this workaround until Wheezy + # is fixed. + # The default value 512 comes from ts-debian-install. + if ($ho->{Suite} =~ m/wheezy/) { + my $memory= guest_var($gho,'memory',512); + $cfg =~ s/^memory.*//mg; + $cfg .= "\nmemory = $memory\n"; + } + # PCI passthrough # Look for runvars _pcipassthrough_= # and pass through all matching devices from the specified host. -- 1.7.10.4