osstest: fix PVH DomU tests

The pvh=1 xl option was removed, so switch the PVH tests to use
type='pvh' instead.

On older branches still supporting PVHv1 (and the 'pvh' xl option),
this change would turn the PVH tests into PV tests), except that the
previous change removed the PVH tests from those branches.
PVHv1 has already been removed from upstream Linux and Xen.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ts-debian-fixup b/ts-debian-fixup
index f1976e7d5712ddd3d6aea9c93e1ae74f979ee105..f29971dc835e975052be7bc073822d86013a719f 100755 (executable)
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -136,8 +136,8 @@ sub otherfixupcfg () {
 
     my $pvh = guest_var($gho,'pvh',undef);
     if ($pvh) {
-       $cfg =~ s/^pvh\b.*//mg;
-       $cfg .= "\npvh=$pvh\n";
+       $cfg =~ s/^type=\b.*//mg;
+       $cfg .= "\ntype='pvh'\n";
     }
 
     # PCI passthrough