From 5b6bb24c36884a6f5b1a5dab87026ab4ffb92df2 Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@citrix.com>
Date: Sun, 12 Jul 2015 12:29:02 +0100
Subject: [PATCH] TestSupport: don't put kernel= in HVM config when using xl
 and libvirt

Setting kernel to hvmloader is ignored in xl but not in libvirt. Libvirt
config converter will translate that then pass it to QEMU. QEMU
complains there is no kernel called hvmloader and exits.

Remove this option for xl and libvirt.  Xl is not affected and libvirt
will be able to create HVM guest. Xend might still need it.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
 Osstest/TestSupport.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 4696d68..a6d42bd 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1733,8 +1733,11 @@ sub more_prepareguest_hvm ($$$$;@) {
     }
     my $disks = join ",\t\t\n", map { "'$_'" } @disks;
 
+    my $kernel = $ho->{Toolstack}->{Name} =~ m/xend/ ?
+	"kernel      = 'hvmloader'" : '';
+
     my $cfg = <<END;
-kernel      = 'hvmloader'
+$kernel
 builder     = 'hvm'
 #
 disk        = [
-- 
2.39.5