[Xen-devel] [PATCH] osstest: add a pvinpvh test

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

The new shim tests uses the same approach as the PVH one, but doesn't
differentiate between AMD and Intel.

This is the (trimmed) diff of the output from mg-show-flight-runvars:

+test-amd64-amd64-xl-pvshim    all_host_di_version    2017-12-14
+test-amd64-i386-xl-pvshim     all_host_di_version    2017-12-14
+test-amd64-amd64-xl-pvshim    all_host_suite         jessie
+test-amd64-i386-xl-pvshim     all_host_suite         jessie
+test-amd64-amd64-xl-pvshim    all_hostflags          
arch-amd64,arch-xen-amd64,suite-jessie,purpose-test
+test-amd64-i386-xl-pvshim     all_hostflags          
arch-i386,arch-xen-amd64,suite-jessie,purpose-test
+test-amd64-amd64-xl-pvshim    arch                   amd64
+test-amd64-i386-xl-pvshim     arch                   i386
+test-amd64-amd64-xl-pvshim    buildjob               build-amd64
+test-amd64-i386-xl-pvshim     buildjob               build-i386
+test-amd64-amd64-xl-pvshim    debian_arch            amd64
+test-amd64-i386-xl-pvshim     debian_arch            i386
+test-amd64-amd64-xl-pvshim    debian_kernkind        pvops
+test-amd64-i386-xl-pvshim     debian_kernkind        pvops
+test-amd64-amd64-xl-pvshim    debian_shim            1
+test-amd64-i386-xl-pvshim     debian_shim            1
+test-amd64-amd64-xl-pvshim    debian_suite           jessie
+test-amd64-i386-xl-pvshim     debian_suite           jessie
+test-amd64-amd64-xl-pvshim    kernbuildjob           build-amd64-pvops
+test-amd64-i386-xl-pvshim     kernbuildjob           build-i386-pvops
+test-amd64-amd64-xl-pvshim    kernkind               pvops
+test-amd64-i386-xl-pvshim     kernkind               pvops
+test-amd64-amd64-xl-pvshim    toolstack              xl
+test-amd64-i386-xl-pvshim     toolstack              xl
+test-amd64-amd64-xl-pvshim    xenbuildjob            build-amd64
+test-amd64-i386-xl-pvshim     xenbuildjob            build-amd64

Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 make-flight     | 18 ++++++++++++++++++
 ts-debian-fixup |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/make-flight b/make-flight
index 7d807f9b..7cde5c2e 100755
--- a/make-flight
+++ b/make-flight
@@ -730,6 +730,14 @@ test_matrix_do_one () {
   *)               test_pvh=y ;;
   esac
 
+  # Shim tests for versions >= 4.11 only
+  case "$xenbranch" in
+  xen-3.*-testing)  test_shim=n ;;
+  xen-4.?-testing)  test_shim=n ;;
+  xen-4.10-testing) test_shim=n ;;
+  *)                test_shim=y ;;
+  esac
+
   do_rumpkernel_tests
 
   # xend PV guest test on x86 only
@@ -824,6 +832,16 @@ test_matrix_do_one () {
     done
 
   fi
+
+  if [ x$test_shim = xy -a $xenarch = amd64 ]; then
+
+    job_create_test test-$xenarch$kern-$dom0arch-xl-pvshim \
+                    test-debian xl $xenarch $dom0arch \
+                    debian_shim=1 $debian_runvars \
+                    all_hostflags=$most_hostflags
+
+  fi
+
   #do_passthrough_tests
 
   do_pygrub_tests
diff --git a/ts-debian-fixup b/ts-debian-fixup
index f29971dc..52a7c5e1 100755
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -135,10 +135,13 @@ sub otherfixupcfg () {
     $cfg .= "\nvcpus = $vcpus\n";
 
     my $pvh = guest_var($gho,'pvh',undef);
-    if ($pvh) {
+    my $shim = guest_var($gho,'shim',undef);
+    if ($pvh || $shim) {
        $cfg =~ s/^type=\b.*//mg;
        $cfg .= "\ntype='pvh'\n";
     }
+    # Run in shim mode
+    $cfg .= "\npvshim=1\n" if $shim;
 
     # PCI passthrough
     # Look for runvars   <gn>_pcipassthrough_<devtype>=<hostident>
-- 
2.16.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel