From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [OSSTEST Nested PATCH v7 3/6] Changes on test step
 of debain hvm guest install
Date: Tue, 31 Mar 2015 14:55:41 +0100
Message-ID: <1427810141.2115.140.camel@citrix.com>
References: <1427497587-22884-1-git-send-email-longtaox.pang@intel.com>
	<1427497587-22884-4-git-send-email-longtaox.pang@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1427497587-22884-4-git-send-email-longtaox.pang@intel.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: "longtao.pang" <longtaox.pang@intel.com>
Cc: wei.liu2@citrix.com, robert.hu@intel.com, Ian.Jackson@eu.citrix.com, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

On Fri, 2015-03-27 at 19:06 -0400, longtao.pang wrote:
> 1. Increase disk size to accomodate to nested test requirment.

"accommodate" and "requirement"

Ian, are you OK with this generic change or would you prefer a runvar? I
suspect the answer is going to be runvar.

> 2. Since 'Debain-xxx-.iso' image will be stored there, therefore needs
> more disk capacity, increase root partition size in preseed generation.

"Debian".

I'm not sure I follow what this one is saying though, does "there" refer
to the rootfs of the VM which is being built here?

> @@ -75,6 +75,7 @@ d-i preseed/late_command string \\
>          in-target mkdir -p /boot/efi/EFI/boot; \\
>          in-target cp /boot/efi/EFI/debian/grubx64.efi /boot/efi/EFI/boot/bootx64.efi ;\\
>          in-target mkdir -p /root/.ssh; \\
> +        in-target sed -i '/^deb *cdrom/s/^/#/' /etc/apt/sources.list; \\

I think a more conventional way to do this would be to use:
        s/^deb *cdrom/#&/g

>          in-target sh -c "echo -e '$authkeys'> /root/.ssh/authorized_keys";
>  END
>      return $preseed_file;
> @@ -152,6 +153,7 @@ sub prep () {
>      more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
>                            OnReboot => 'preserve',
>                            Bios => $r{bios},
> +                          ExtraConfig => 'nestedhvm=1',

Please do only for the nested job i.e. using a runvar.

>                            PostImageHook => sub {
>          my $cmds = iso_copy_content_from_image($gho, $newiso);
>          $cmds .= prepare_initrd($initrddir,$newiso,$preseed_file_path);
> @@ -173,6 +175,8 @@ my $ram_minslop = 100;
>  my $ram_lots = 5000;
>  if ($host_freemem_mb > $ram_lots * 2 + $ram_minslop) {
>      $ram_mb = $ram_lots;
> +} elsif ($gn eq 'nested') {
> +    $ram_mb = 3072;

I think this ought to be driven from a runvar as well, e.g. <gn>_minram.

>  } else {
>      $ram_mb = 768;
>  }