From: Wei Liu Subject: Re: [PATCH OSSTEST RFC 5/5] ts-debian-fixup: workaround Debian bug #691320 Date: Fri, 20 Sep 2013 09:52:21 +0100 Message-ID: <20130920085221.GE15251@zion.uk.xensource.com> References: <1379606541-12364-1-git-send-email-wei.liu2@citrix.com> <1379606541-12364-6-git-send-email-wei.liu2@citrix.com> <1379610746.11304.337.camel@hastur.hellion.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1379610746.11304.337.camel@hastur.hellion.org.uk> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: ian.jackson@eu.citrix.com, Wei Liu , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Thu, Sep 19, 2013 at 06:12:26PM +0100, Ian Campbell wrote: > On Thu, 2013-09-19 at 17:02 +0100, Wei Liu wrote: > > 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. > > Wouldn't it be better to fix the invocation of xne-create-image to use a > Mb suffix instead of M, AFAICT that would work on both Squeeze and > Wheezy. > OK. I tested passing 'Mb', it did work in Wheezy. I will drop this one. Wei. > I think the fact that Squeeze's accepted just M was unintentional, > although it's good that they are willing to fix it to be acceptable > again... > > > + 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. >