From: Robert Ho <robert.hu@intel.com>
Date: Mon, 17 Aug 2015 05:55:15 +0000 (+0800)
Subject: Debian HVM guests: Honour enable_nestedhvm guest runvar
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a09a2d5531a1bec9a209b9ce9f4cbbcc07ec031d;p=osstest.git

Debian HVM guests: Honour enable_nestedhvm guest runvar

There are not yet any jobs which set this.

Signed-off-by: Robert Ho <robert.hu@intel.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v14: Use guest_var_boolean
---

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index f2fc31b..2c7580c 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -215,6 +215,10 @@ sub prep () {
 
     iso_create_empty($ho, $emptyiso, $emptydir);
 
+    my $extra_config = '';
+    $extra_config .= "nestedhvm=1\n"
+	if guest_var_boolean($gho,"enable_nestedhvm");
+
     # If host has >8G free memory, create a guest with 4G memory to catch
     # any error that triggers cross 4G boundary
     my $host_freemem_mb = host_get_free_memory($ho);
@@ -236,6 +240,7 @@ sub prep () {
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
                           Bios => $r{bios},
+                          ExtraConfig => $extra_config,
                           PostImageHook => sub {
         my $cmds = iso_copy_content_from_image($gho, $newiso);
         target_cmd_root($ho, $cmds, $isotimeout);