Re: [Xen-devel] [PATCH OSSTEST RFC 5/5] ts-debian-fixup: workaround Debian bug #691320

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Thu, 2013-09-19 at 17:02 +0100, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
>  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.

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   <gn>_pcipassthrough_<devtype>=<hostident>
>      # and pass through all matching devices from the specified host.



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel