On Wed, Dec 10, 2014 at 07:09:18PM +0100, Dario Faggioli wrote:
> From: Dario Faggioli <raist...@linux.it>
>
> the value of which can be retrieved via guest_var('memory');.
>
> This works for both PV and HVM Debian guests.
>
> Signed-off-by: Dario Faggioli <dario.faggi...@citrix.com>
> Cc: Wei Liu <wei.l...@citrix.com>
> Cc: Ian Campbell <ian.campb...@citrix.com>
> Cc: Ian Jackson <ian.jack...@eu.citrix.com>
> ---
> Osstest/TestSupport.pm | 3 ++-
> ts-debian-fixup | 3 +++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
> index a3b6936..cdff8d5 100644
> --- a/Osstest/TestSupport.pm
> +++ b/Osstest/TestSupport.pm
> @@ -1460,11 +1460,12 @@ sub prepareguest_part_xencfg ($$$$$) {
> my ($ho, $gho, $ram_mb, $xopts, $cfgrest) = @_;
> my $onreboot= $xopts->{OnReboot} || 'restart';
> my $vcpus= guest_var($gho, 'vcpus', $xopts->{DefVcpus} || 2);
> + my $memory= guest_var($gho, 'memory', $xopts->{DefMem} || $ram_mb);
> my $xoptcfg= $xopts->{ExtraConfig};
> $xoptcfg='' unless defined $xoptcfg;
> my $xencfg= <<END;
> name = '$gho->{Name}'
> -memory = ${ram_mb}
> +memory = ${memory}
You made ram_mb redundant. And this seems to be deep in the call chain
which has subtle knock on effect.
Wei.
> vif = [ 'type=ioemu,mac=$gho->{Ether}' ]
> #
> on_poweroff = 'destroy'
> diff --git a/ts-debian-fixup b/ts-debian-fixup
> index f001418..f85b06d 100755
> --- a/ts-debian-fixup
> +++ b/ts-debian-fixup
> @@ -113,10 +113,13 @@ sub setcfg ($$) {
>
> sub otherfixupcfg () {
> my $vcpus= guest_var($gho,'vcpus',1);
> + my $ram_mb= guest_var($gho,'memory',512);
> $cfg =~ s/^dhcp/#$&/mg;
> $cfg =~ s/^on_crash.*/on_crash='preserve'/mg;
> $cfg =~ s/^vcpus.*//mg;
> $cfg .= "\nvcpus = $vcpus\n";
> + $cfg =~ s/^memory.*//mg;
> + $cfg .= "\nmemory = $ram_mb\n";
>
> # PCI passthrough
> # Look for runvars <gn>_pcipassthrough_<devtype>=<hostident>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
