[PATCH OSSTEST 00/12] Libvirt save, restore and migration support

[PATCH OSSTEST 00/12] Libvirt save, restore and migration support

[Wei Liu]

This series implements libvirt save, restore and migration test in OSSTest.

The first 5 patches are used to
1. separate save / restore support from migration support;
2. introduce notion of local / remote migration support.

With the above changes we lay the ground to test libvirt's save / restore
functionalities in one machine and test libvirt's migration functionality
in a pair test.

At this point test-amd64-*-libvirt is able to test save / restore
functionality.

Later patches are adjustment to other test scripts to actual implement new
libvirt test cases.

After dumping standalone flights runvars, nothing is deleted and following
new runvars are added.

+xen-unstable               test-amd64-amd64-libvirt-pair                      all_hostflags               arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,equiv-1
+xen-unstable               test-amd64-amd64-libvirt-pair                      arch                        amd64
+xen-unstable               test-amd64-amd64-libvirt-pair                      buildjob                    build-amd64
+xen-unstable               test-amd64-amd64-libvirt-pair                      debian_arch                 amd64
+xen-unstable               test-amd64-amd64-libvirt-pair                      debian_kernkind             pvops
+xen-unstable               test-amd64-amd64-libvirt-pair                      kernbuildjob                build-amd64-pvops
+xen-unstable               test-amd64-amd64-libvirt-pair                      kernkind                    pvops
+xen-unstable               test-amd64-amd64-libvirt-pair                      libvirtbuildjob             build-amd64-libvirt
+xen-unstable               test-amd64-amd64-libvirt-pair                      toolstack                   libvirt
+xen-unstable               test-amd64-amd64-libvirt-pair                      xenbuildjob                 build-amd64
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     all_hostflags               arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     arch                        amd64
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     bios                        rombios
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     buildjob                    build-amd64
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     debianhvm_image             debian-7.2.0-amd64-CD-1.iso
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     device_model_version        qemu-xen-traditional
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     enable_xsm                  false
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     kernbuildjob                build-amd64-pvops
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     kernkind                    pvops
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     libvirtbuildjob             build-amd64-libvirt
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     toolstack                   libvirt
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64     xenbuildjob                 build-amd64
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm all_hostflags               arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm arch                        amd64
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm bios                        rombios
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm buildjob                    build-amd64-xsm
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm debianhvm_image             debian-7.2.0-amd64-CD-1.iso
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm device_model_version        qemu-xen-traditional
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm enable_xsm                  true
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm kernbuildjob                build-amd64-pvops
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm kernkind                    pvops
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm libvirtbuildjob             build-amd64-xsm-libvirt
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm toolstack                   libvirt
+xen-unstable               test-amd64-amd64-libvirt-qemut-debianhvm-amd64-xsm xenbuildjob                 build-amd64-xsm
+xen-unstable               test-amd64-i386-libvirt-pair                       all_hostflags               arch-i386,arch-xen-amd64,suite-wheezy,purpose-test,equiv-1
+xen-unstable               test-amd64-i386-libvirt-pair                       arch                        i386
+xen-unstable               test-amd64-i386-libvirt-pair                       buildjob                    build-i386
+xen-unstable               test-amd64-i386-libvirt-pair                       debian_arch                 i386
+xen-unstable               test-amd64-i386-libvirt-pair                       debian_kernkind             pvops
+xen-unstable               test-amd64-i386-libvirt-pair                       kernbuildjob                build-i386-pvops
+xen-unstable               test-amd64-i386-libvirt-pair                       kernkind                    pvops
+xen-unstable               test-amd64-i386-libvirt-pair                       libvirtbuildjob             build-i386-libvirt
+xen-unstable               test-amd64-i386-libvirt-pair                       toolstack                   libvirt
+xen-unstable               test-amd64-i386-libvirt-pair                       xenbuildjob                 build-amd64
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      all_hostflags               arch-i386,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      arch                        i386
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      bios                        rombios
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      buildjob                    build-i386
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      debianhvm_image             debian-7.2.0-amd64-CD-1.iso
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      device_model_version        qemu-xen-traditional
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      enable_xsm                  false
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      kernbuildjob                build-i386-pvops
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      kernkind                    pvops
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      libvirtbuildjob             build-i386-libvirt
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      toolstack                   libvirt
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64      xenbuildjob                 build-amd64
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  all_hostflags               arch-i386,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  arch                        i386
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  bios                        rombios
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  buildjob                    build-i386-xsm
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  debianhvm_image             debian-7.2.0-amd64-CD-1.iso
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  device_model_version        qemu-xen-traditional
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  enable_xsm                  true
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  kernbuildjob                build-i386-pvops
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  kernkind                    pvops
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  libvirtbuildjob             build-i386-xsm-libvirt
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  toolstack                   libvirt
+xen-unstable               test-amd64-i386-libvirt-qemut-debianhvm-amd64-xsm  xenbuildjob                 build-amd64-xsm

Wei.

Ian Jackson (1):
  osstest migrate support check catch -> variables

Wei Liu (11):
  toolstack: save / restore check
  Introduce ts-saverestore-support-check
  toolstack: distinguish local and remote migration support
  sg-run-job: remove save/restore dependency on local migration support
  toolstack/libvirt: guest migrate, save and restore support
  ts-xen-build-prep: install ebtables
  ts-libvirt-build: run libvirt test suite
  ts-debian-hvm-install: stub out libvirt + ovmf / rombios
  make-flight: debian hvm tests with libvirt
  make-flight, mfi-common: rename onetoolstack to pairtoolstack
  make-flight, mfi-common: create live migration test for libvirt

 Osstest/Toolstack/libvirt.pm | 37 ++++++++++++++++++++++++++++++++-----
 Osstest/Toolstack/xend.pm    |  5 ++++-
 Osstest/Toolstack/xl.pm      | 13 +++++++++++--
 make-flight                  | 34 +++++++++++++++++++++++++---------
 mfi-common                   | 12 ++++++++----
 sg-run-job                   | 20 +++++++++++++++-----
 ts-debian-hvm-install        |  7 +++++++
 ts-libvirt-build             | 23 +++++++++++++----------
 ts-migrate-support-check     |  5 ++++-
 ts-saverestore-support-check | 27 +++++++++++++++++++++++++++
 ts-xen-build-prep            |  2 +-
 11 files changed, 147 insertions(+), 38 deletions(-)
 create mode 100755 ts-saverestore-support-check

-- 
1.9.1

[PATCH OSSTEST 01/12] toolstack: save / restore check

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/Toolstack/libvirt.pm | 9 +++++++++
 Osstest/Toolstack/xend.pm    | 3 +++
 Osstest/Toolstack/xl.pm      | 9 +++++++++
 3 files changed, 21 insertions(+)

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index 8bd7f4f..acb801c 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -69,6 +69,15 @@ sub migrate_check ($) {
     die "Migration check is not yet supported on libvirt.";
 }
 
+sub saverestore_check ($) {
+    my ($self) = @_;
+    my $ho = $self->{Host};
+    my $help = target_cmd_output_root($ho, "virsh help");
+    my $rc = ($help =~ m/^\s*save/m) ? 0 : 1;
+    logm("rc=$rc");
+    return $rc;
+}
+
 sub migrate ($) {
     my ($self,$gho,$dst,$timeout) = @_;
     die "Migration is not yet supported on libvirt.";
diff --git a/Osstest/Toolstack/xend.pm b/Osstest/Toolstack/xend.pm
index 1d5d059..ad98e65 100644
--- a/Osstest/Toolstack/xend.pm
+++ b/Osstest/Toolstack/xend.pm
@@ -37,4 +37,7 @@ sub new {
 # xend always supported migration
 sub migrate_check ($) { return 0; }
 
+# xend always supported save / restore
+sub saverestore_check ($) { return 0; }
+
 1;
diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm
index 71aefd5..b124273 100644
--- a/Osstest/Toolstack/xl.pm
+++ b/Osstest/Toolstack/xl.pm
@@ -67,6 +67,15 @@ sub migrate_check ($) {
     return $rc;
 }
 
+sub saverestore_check ($) {
+    my ($self) = @_;
+    my $ho = $self->{Host};
+    my $help = target_cmd_output_root($ho, $self->{_Command}." help");
+    my $rc = ($help =~ m/^\s*save/m) ? 0 : 1;
+    logm("rc=$rc");
+    return $rc;
+}
+
 sub migrate ($$$$) {
     my ($self,$gho,$dho,$timeout) = @_;
     my $sho = $self->{Host};
-- 
1.9.1

[PATCH OSSTEST 02/12] Introduce ts-saverestore-support-check

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 ts-saverestore-support-check | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100755 ts-saverestore-support-check

diff --git a/ts-saverestore-support-check b/ts-saverestore-support-check
new file mode 100755
index 0000000..71514fc
--- /dev/null
+++ b/ts-saverestore-support-check
@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2015 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use strict qw(vars);
+use DBI;
+use Osstest;
+use Osstest::TestSupport;
+
+tsreadconfig();
+
+our $ho = selecthost($ARGV[0]);
+
+exit(toolstack($ho)->saverestore_check());
-- 
1.9.1

[PATCH OSSTEST 03/12] osstest migrate support check catch -> variables

[Wei Liu]

From: Ian Jackson <Ian.Jackson@eu.citrix.com>

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 sg-run-job | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sg-run-job b/sg-run-job
index 2cf810a..cc2ab3b 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -289,7 +289,9 @@ proc run-job/test-pair {} {
 }
 
 proc test-guest-migr {g} {
-    if {[catch { run-ts . = ts-migrate-support-check + host $g }]} return
+    set to_reap [spawn-ts . = ts-migrate-support-check + host $g]
+    set can_migrate [reap-ts $to_reap]
+    if {!$can_migrate} return
 
     foreach iteration {{} .2} {
         run-ts . =$iteration ts-guest-saverestore + host $g
-- 
1.9.1

[PATCH OSSTEST 04/12] toolstack: distinguish local and remote migration support

[Wei Liu]

Libvirt supports migrating a guest to remote host but not local host.
Distinguish the concept of local migration support and remote migration
support.

Toolstack's migrate_check now takes an extra argument to indicate which
mode we're interested in.

In sg-run-job we still check for local migration support because that's
the implicit target in test-guest-migr. Libvirt will still be blocked.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/Toolstack/libvirt.pm | 19 ++++++++++++++++---
 Osstest/Toolstack/xend.pm    |  2 +-
 Osstest/Toolstack/xl.pm      |  4 ++--
 sg-run-job                   |  2 +-
 ts-migrate-support-check     |  5 ++++-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index acb801c..a804ed5 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -64,9 +64,22 @@ sub shutdown_wait ($$$) {
     guest_await_destroy($gho,$timeout);
 }
 
-sub migrate_check ($) {
-    my ($self) = @_;
-    die "Migration check is not yet supported on libvirt.";
+sub migrate_check ($$) {
+    my ($self, $mode) = @_;
+    my $rc;
+
+    if ($mode eq 'local') {
+        # local migration is not supported
+        $rc = 1;
+    } else {
+	# $mode eq 'remote'
+	my $ho = $self->{Host};
+	my $caps = target_cmd_output_root($ho, "virsh capabilities");
+	$rc = ($caps =~ m/<migration_features>/) ? 0 : 1
+    }
+
+    logm("rc=$rc");
+    return $rc;
 }
 
 sub saverestore_check ($) {
diff --git a/Osstest/Toolstack/xend.pm b/Osstest/Toolstack/xend.pm
index ad98e65..bb39b75 100644
--- a/Osstest/Toolstack/xend.pm
+++ b/Osstest/Toolstack/xend.pm
@@ -35,7 +35,7 @@ sub new {
 }
 
 # xend always supported migration
-sub migrate_check ($) { return 0; }
+sub migrate_check ($$) { return 0; }
 
 # xend always supported save / restore
 sub saverestore_check ($) { return 0; }
diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm
index b124273..7c82770 100644
--- a/Osstest/Toolstack/xl.pm
+++ b/Osstest/Toolstack/xl.pm
@@ -58,8 +58,8 @@ sub shutdown_wait ($$$) {
     target_cmd_root($ho,"$self->{_Command} shutdown -w $gn", $timeout);
 }
 
-sub migrate_check ($) {
-    my ($self) = @_;
+sub migrate_check ($$) {
+    my ($self,$mode) = @_;
     my $ho = $self->{Host};
     my $help = target_cmd_output_root($ho, $self->{_Command}." help");
     my $rc = ($help =~ m/^\s*migrate/m) ? 0 : 1;
diff --git a/sg-run-job b/sg-run-job
index cc2ab3b..b3747a7 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -289,7 +289,7 @@ proc run-job/test-pair {} {
 }
 
 proc test-guest-migr {g} {
-    set to_reap [spawn-ts . = ts-migrate-support-check + host $g]
+    set to_reap [spawn-ts . = ts-migrate-support-check + host $g local]
     set can_migrate [reap-ts $to_reap]
     if {!$can_migrate} return
 
diff --git a/ts-migrate-support-check b/ts-migrate-support-check
index cd41f68..d237710 100755
--- a/ts-migrate-support-check
+++ b/ts-migrate-support-check
@@ -23,5 +23,8 @@ use Osstest::TestSupport;
 tsreadconfig();
 
 our $ho = selecthost($ARGV[0]);
+# $ARGV[1] is guest name, $ARG[2] is migration mode.
+# Mode should be either "local" or "remote"
+our $mode = $ARGV[2];
 
-exit(toolstack($ho)->migrate_check());
+exit(toolstack($ho)->migrate_check($mode));
-- 
1.9.1

[PATCH OSSTEST 05/12] sg-run-job: remove save/restore dependency on local migration support

[Wei Liu]

Since we've introduced different checks for save / restore and local
migration, it's possible to run save / restore tests without running
local migration tests.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 sg-run-job | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/sg-run-job b/sg-run-job
index b3747a7..79ddd2a 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -291,13 +291,21 @@ proc run-job/test-pair {} {
 proc test-guest-migr {g} {
     set to_reap [spawn-ts . = ts-migrate-support-check + host $g local]
     set can_migrate [reap-ts $to_reap]
-    if {!$can_migrate} return
+    set to_reap [spawn-ts . = ts-saverestore-support-check + host]
+    set can_saverestore [reap-ts $to_reap]
 
-    foreach iteration {{} .2} {
-        run-ts . =$iteration ts-guest-saverestore + host $g
-        run-ts . =$iteration ts-guest-localmigrate + host $g
+    if {$can_saverestore} {
+        foreach iteration {{} .2} {
+            run-ts . =$iteration ts-guest-saverestore + host $g
+        }
+    }
+
+    if {$can_migrate} {
+        foreach iteration {{} .2} {
+            run-ts . =$iteration ts-guest-localmigrate + host $g
+        }
+        run-ts . = ts-guest-localmigrate x10 + host $g
     }
-    run-ts . = ts-guest-localmigrate x10 + host $g
 }
 
 proc test-guest {g} {
-- 
1.9.1

[PATCH OSSTEST 06/12] toolstack/libvirt: guest migrate, save and restore support

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/Toolstack/libvirt.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index a804ed5..d7d5154 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -93,17 +93,22 @@ sub saverestore_check ($) {
 
 sub migrate ($) {
     my ($self,$gho,$dst,$timeout) = @_;
-    die "Migration is not yet supported on libvirt.";
+    my $ho = $self->{Host};
+    my $gn = $gho->{Name};
+    target_cmd_root($ho, "virsh migrate $gn $dst", $timeout);
 }
 
 sub save ($$$$) {
     my ($self,$gho,$f,$timeout) = @_;
-    die "Save is not yet supported on libvirt.";
+    my $ho = $self->{Host};
+    my $gn = $gho->{Name};
+    target_cmd_root($ho, "virsh save $gn $f", $timeout);
 }
 
 sub restore ($$$$) {
     my ($self,$gho,$f,$timeout) = @_;
-    die "Restore is not yet supported on libvirt.";
+    my $ho = $self->{Host};
+    target_cmd_root($ho, "virsh restore $f", $timeout);
 }
 
 1;
-- 
1.9.1

[PATCH OSSTEST 07/12] ts-xen-build-prep: install ebtables

[Wei Liu]

Libvirt's test suite needs it.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 ts-xen-build-prep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 3684c0a..1bf40db 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -178,7 +178,7 @@ sub prep () {
                                autoconf automake libtool xsltproc
                                libxml2-utils libxml2-dev libnl-dev
                                libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
-                               ccache nasm checkpolicy));
+                               ccache nasm checkpolicy ebtables));
 
     target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
     # workaround for Debian #595728
-- 
1.9.1

[PATCH OSSTEST 08/12] ts-libvirt-build: run libvirt test suite

[Wei Liu]

We're interested in xlconfigtest. Since we're running test anyway run
the whole suite.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 ts-libvirt-build | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/ts-libvirt-build b/ts-libvirt-build
index 7322d73..d9db31e 100755
--- a/ts-libvirt-build
+++ b/ts-libvirt-build
@@ -27,6 +27,7 @@ builddirsprops();
 
 our %submodmap = qw(gnulib gnulib);
 our $submodules;
+our $xenprefix;
 
 sub libvirtd_init ();
 
@@ -39,15 +40,6 @@ sub checkout () {
 }
 
 sub config() {
-    my $xenprefix;
-    foreach (qw(/usr/local /usr)) {
-	if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) {
-	    $xenprefix="$xendist$_";
-	    last;
-	}
-    }
-    die "no xen prefix" unless $xenprefix;
-
     # Uses --no-git because otherwise autogen.sh will undo
     # submodulefixup's attempts to honour
     # revision_libvirt_gnulib. This in turn requires that we specify
@@ -69,7 +61,10 @@ END
 sub build() {
     target_cmd_build($ho, 3600, $builddir, <<END);
         cd libvirt
-        (make $makeflags 2>&1 && touch ../build-ok-stamp) |tee ../log
+        (make $makeflags 2>&1 && \\
+         LD_LIBRARY_PATH=$xenprefix/lib/ \\
+           make check VIR_TEST_EXPENSIVE=1 2>&1 && \\
+         touch ../build-ok-stamp) |tee ../log
         test -f ../build-ok-stamp #/
         echo ok.
 END
@@ -90,6 +85,14 @@ END
 END
 }
 
+foreach (qw(/usr/local /usr)) {
+    if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) {
+	$xenprefix="$xendist$_";
+	last;
+    }
+}
+die "no xen prefix" unless $xenprefix;
+
 checkout();
 config();
 build();
-- 
1.9.1

[PATCH OSSTEST 09/12] ts-debian-hvm-install: stub out libvirt + ovmf / rombios

[Wei Liu]

Libvirt's configuration converter doesn't know how to deal with BIOS
selection. The end result is it always use the default one (seabios).
Stub out ovmf and rombios to avoid false positive results.

This restriction will be removed once libvirt's converter knows how to
deal with BIOS selection.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 ts-debian-hvm-install | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 449b96c..7fe9ca8 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -28,6 +28,13 @@ if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
 
 defined($r{bios}) or die "Need to define which bios to use";
 
+# Libvirt doesn't know anything about bios. It will always use the
+# default one (seabios). Stub out rombios and ovmf to avoid false
+# positive results.
+if ($r{bios} =~ m/ovmf|rombios/ && $r{toolstack} eq 'libvirt') {
+    die "libvirt + $r{bios} is not supported yet.";
+}
+
 our ($whhost,$gn) = @ARGV;
 $whhost ||= 'host';
 $gn ||= 'debianhvm';
-- 
1.9.1

[PATCH OSSTEST 10/12] make-flight: debian hvm tests with libvirt

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 make-flight | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/make-flight b/make-flight
index 8ac3a87..dabcacd 100755
--- a/make-flight
+++ b/make-flight
@@ -92,7 +92,9 @@ job_create_test_filter_callback () {
     *)
       case "$job" in
         *-qemuu-*)
-          if [ "x$toolstack" != xxl ]; then return 1; fi
+          if [ x$toolstack != xxl -a x$toolstack != xlibvirt ];then
+              return 1;
+          fi
           ;;
       esac
       ;;
@@ -208,9 +210,10 @@ do_hvm_debian_test_one () {
   testname=$1
   bios=$2
   xsm=$3
+  toolstack=$4
 
-  job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64\
-    test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+  job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix-$testname-amd64\
+    test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
     enable_xsm=$xsm                             \
     debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
     bios=$bios \
@@ -226,16 +229,20 @@ do_hvm_debian_tests() {
 
   # QEMU upstream supports ovmf and seabios
   if [ "x$qemuu_suffix" == "x-qemuu" ]; then
-    do_hvm_debian_test_one ovmf ovmf false
-    for xsm in $xsms ; do
-      do_hvm_debian_test_one debianhvm seabios $xsm
+    for toolstack in xl libvirt; do
+      do_hvm_debian_test_one ovmf ovmf false $toolstack
+      for xsm in $xsms ; do
+        do_hvm_debian_test_one debianhvm seabios $xsm $toolstack
+      done
     done
   fi
 
   # QEMU traditional supports rombios
   if [ "x$qemuu_suffix" == "x-qemut" ]; then
     for xsm in $xsms ; do
-      do_hvm_debian_test_one debianhvm rombios $xsm
+      for toolstack in xl libvirt; do
+        do_hvm_debian_test_one debianhvm rombios $xsm $toolstack
+      done
     done
   fi
 }
-- 
1.9.1

[PATCH OSSTEST 11/12] make-flight, mfi-common: rename onetoolstack to pairtoolstack

[Wei Liu]

The name "onetoolstack" in confusing. Currently it's in fact referring
to the toolstack used to test pair migration, so rename it to
"pairtoolstack".

No functional changes introduced.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 make-flight | 2 +-
 mfi-common  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/make-flight b/make-flight
index dabcacd..23d51ea 100755
--- a/make-flight
+++ b/make-flight
@@ -420,7 +420,7 @@ test_matrix_do_one () {
 
   # Test live migration
   job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
-            $onetoolstack $xenarch $dom0arch \
+            $pairtoolstack $xenarch $dom0arch \
             !host !host_hostflags \
             $debian_runvars \
             all_hostflags=$most_hostflags,equiv-1
diff --git a/mfi-common b/mfi-common
index a0603a2..8e53fbb 100644
--- a/mfi-common
+++ b/mfi-common
@@ -309,10 +309,10 @@ job_create_test () {
 test_matrix_iterate () {
 
   case "$xenbranch" in
-  xen-3.*-testing)      onetoolstack=xend ;;
-  xen-4.0-testing)      onetoolstack=xend ;;
-  xen-4.1-testing)      onetoolstack=xend ;;
-  *)                    onetoolstack=xl ;;
+  xen-3.*-testing)      pairtoolstack=xend ;;
+  xen-4.0-testing)      pairtoolstack=xend ;;
+  xen-4.1-testing)      pairtoolstack=xend ;;
+  *)                    pairtoolstack=xl ;;
   esac
 
   for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
-- 
1.9.1

[PATCH OSSTEST 12/12] make-flight, mfi-common: create live migration test for libvirt

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 make-flight | 13 +++++++++++--
 mfi-common  |  6 +++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/make-flight b/make-flight
index 23d51ea..80c9c39 100755
--- a/make-flight
+++ b/make-flight
@@ -419,11 +419,20 @@ test_matrix_do_one () {
   done # qemuu_suffix
 
   # Test live migration
-  job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
-            $pairtoolstack $xenarch $dom0arch \
+  for toolstack in $pairtoolstack; do
+    # Don't change test case name for old test cases with xl and xend
+    if [ x$toolstack = xxl -o x$toolstack = xxend ]; then
+      toolstack_suffix=""
+    else
+      toolstack_suffix="-$toolstack"
+    fi
+    job_create_test test-$xenarch$kern-$dom0arch$toolstack_suffix-pair \
+            test-pair \
+            $toolstack $xenarch $dom0arch \
             !host !host_hostflags \
             $debian_runvars \
             all_hostflags=$most_hostflags,equiv-1
+  done
 
   if [ x$test_pvh = xy -a $xenarch = amd64 -a $dom0arch = amd64 ]; then
 
diff --git a/mfi-common b/mfi-common
index 8e53fbb..8ad6450 100644
--- a/mfi-common
+++ b/mfi-common
@@ -312,7 +312,11 @@ test_matrix_iterate () {
   xen-3.*-testing)      pairtoolstack=xend ;;
   xen-4.0-testing)      pairtoolstack=xend ;;
   xen-4.1-testing)      pairtoolstack=xend ;;
-  *)                    pairtoolstack=xl ;;
+  xen-4.2-testing)      pairtoolstack=xl ;;
+  xen-4.3-testing)      pairtoolstack=xl ;;
+  xen-4.4-testing)      pairtoolstack=xl ;;
+  xen-4.5-testing)      pairtoolstack=xl ;;
+  *)                    pairtoolstack="xl libvirt" ;;
   esac
 
   for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
-- 
1.9.1

Re: [PATCH OSSTEST 01/12] toolstack: save / restore check

[Ian Campbell]

On Mon, 2015-02-09 at 11:09 +0000, Wei Liu wrote:
> +sub saverestore_check ($) {
> +    my ($self) = @_;
> +    my $ho = $self->{Host};
> +    my $help = target_cmd_output_root($ho, $self->{_Command}." help");
> +    my $rc = ($help =~ m/^\s*save/m) ? 0 : 1;
> +    logm("rc=$rc");
> +    return $rc;

You could refactor this and the migration_check into a more generic
"check for a named command" helper.

And you could prepare the libvirt one for the same once migration gets
added I suppose.

Everything else looks OK to me.

Re: [PATCH OSSTEST 02/12] Introduce ts-saverestore-support-check

[Ian Campbell]

On Mon, 2015-02-09 at 11:09 +0000, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH OSSTEST 03/12] osstest migrate support check catch -> variables

[Ian Campbell]

On Mon, 2015-02-09 at 11:09 +0000, Wei Liu wrote:
> From: Ian Jackson <Ian.Jackson@eu.citrix.com>

I remember the f2f discussion around this, but I cannot remember what
this is actually supposed to do. Can you? If so could you write it down
please ;-)

> 
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  sg-run-job | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/sg-run-job b/sg-run-job
> index 2cf810a..cc2ab3b 100755
> --- a/sg-run-job
> +++ b/sg-run-job
> @@ -289,7 +289,9 @@ proc run-job/test-pair {} {
>  }
>  
>  proc test-guest-migr {g} {
> -    if {[catch { run-ts . = ts-migrate-support-check + host $g }]} return
> +    set to_reap [spawn-ts . = ts-migrate-support-check + host $g]
> +    set can_migrate [reap-ts $to_reap]
> +    if {!$can_migrate} return
>  
>      foreach iteration {{} .2} {
>          run-ts . =$iteration ts-guest-saverestore + host $g

Re: [PATCH OSSTEST 04/12] toolstack: distinguish local and remote migration support

[Ian Campbell]

On Mon, 2015-02-09 at 11:09 +0000, Wei Liu wrote:
> Libvirt supports migrating a guest to remote host but not local host.

Jim, is that right?

(Or alternatively, Wei: Do you have a reference for that?)

> diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
> index acb801c..a804ed5 100644
> --- a/Osstest/Toolstack/libvirt.pm
> +++ b/Osstest/Toolstack/libvirt.pm
> @@ -64,9 +64,22 @@ sub shutdown_wait ($$$) {
>      guest_await_destroy($gho,$timeout);
>  }
>  
> -sub migrate_check ($) {
> -    my ($self) = @_;
> -    die "Migration check is not yet supported on libvirt.";
> +sub migrate_check ($$) {
> +    my ($self, $mode) = @_;
> +    my $rc;
> +
> +    if ($mode eq 'local') {
> +        # local migration is not supported
> +        $rc = 1;
> +    } else {
> +	# $mode eq 'remote'

Perhaps a bool $local would be better than having to sanity check the
values?

> diff --git a/ts-migrate-support-check b/ts-migrate-support-check
> index cd41f68..d237710 100755
> --- a/ts-migrate-support-check
> +++ b/ts-migrate-support-check
> @@ -23,5 +23,8 @@ use Osstest::TestSupport;
>  tsreadconfig();
>  
>  our $ho = selecthost($ARGV[0]);
> +# $ARGV[1] is guest name, $ARG[2] is migration mode.
> +# Mode should be either "local" or "remote"
> +our $mode = $ARGV[2];
>  
> -exit(toolstack($ho)->migrate_check());
> +exit(toolstack($ho)->migrate_check($mode));

Re: [PATCH OSSTEST 05/12] sg-run-job: remove save/restore dependency on local migration support

[Ian Campbell]

On Mon, 2015-02-09 at 11:09 +0000, Wei Liu wrote:
> Since we've introduced different checks for save / restore and local
> migration, it's possible to run save / restore tests without running
> local migration tests.

I don't know if it matters or if it was deliberate, but we used to
alternate savingrestore and localmigrate. I wondered if that was to try
and catch interesting interactions.

I think you could pretty trivially retain that (for platforms which
support both) but pushing the if can_foo's into the existing foreach
loop.

I was considering adding an x10 saverestore (using repeat-ts not the
existing ad-hoc thing), but I suppose that's out of scope here ;-)

> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  sg-run-job | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/sg-run-job b/sg-run-job
> index b3747a7..79ddd2a 100755
> --- a/sg-run-job
> +++ b/sg-run-job
> @@ -291,13 +291,21 @@ proc run-job/test-pair {} {
>  proc test-guest-migr {g} {
>      set to_reap [spawn-ts . = ts-migrate-support-check + host $g local]
>      set can_migrate [reap-ts $to_reap]
> -    if {!$can_migrate} return
> +    set to_reap [spawn-ts . = ts-saverestore-support-check + host]
> +    set can_saverestore [reap-ts $to_reap]
>  
> -    foreach iteration {{} .2} {
> -        run-ts . =$iteration ts-guest-saverestore + host $g
> -        run-ts . =$iteration ts-guest-localmigrate + host $g
> +    if {$can_saverestore} {
> +        foreach iteration {{} .2} {
> +            run-ts . =$iteration ts-guest-saverestore + host $g
> +        }
> +    }
> +
> +    if {$can_migrate} {
> +        foreach iteration {{} .2} {
> +            run-ts . =$iteration ts-guest-localmigrate + host $g
> +        }
> +        run-ts . = ts-guest-localmigrate x10 + host $g
>      }
> -    run-ts . = ts-guest-localmigrate x10 + host $g
>  }
>  
>  proc test-guest {g} {

Re: [PATCH OSSTEST 06/12] toolstack/libvirt: guest migrate, save and restore support

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH OSSTEST 07/12] ts-xen-build-prep: install ebtables

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> Libvirt's test suite needs it.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

But I think it will also want it at runtime, no? The libvirt logs whinge
about such things (it was suggested this meant ebtables was on the build
host,but given this patch I suppose not)

> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  ts-xen-build-prep | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ts-xen-build-prep b/ts-xen-build-prep
> index 3684c0a..1bf40db 100755
> --- a/ts-xen-build-prep
> +++ b/ts-xen-build-prep
> @@ -178,7 +178,7 @@ sub prep () {
>                                 autoconf automake libtool xsltproc
>                                 libxml2-utils libxml2-dev libnl-dev
>                                 libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
> -                               ccache nasm checkpolicy));
> +                               ccache nasm checkpolicy ebtables));
>  
>      target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
>      # workaround for Debian #595728

Re: [PATCH OSSTEST 08/12] ts-libvirt-build: run libvirt test suite

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> We're interested in xlconfigtest. Since we're running test anyway run
> the whole suite.

This is run at build time? I take it doesn't (and will never) require an
active system?

> @@ -69,7 +61,10 @@ END
>  sub build() {
>      target_cmd_build($ho, 3600, $builddir, <<END);
>          cd libvirt
> -        (make $makeflags 2>&1 && touch ../build-ok-stamp) |tee ../log
> +        (make $makeflags 2>&1 && \\
> +         LD_LIBRARY_PATH=$xenprefix/lib/ \\
> +           make check VIR_TEST_EXPENSIVE=1 2>&1 && \\
> +         touch ../build-ok-stamp) |tee ../log

I think this would be preferable as a separate target_cmd_build
invocation to run the tests, to make it clearer in the logs what
happened.

Re: [PATCH OSSTEST 09/12] ts-debian-hvm-install: stub out libvirt + ovmf / rombios

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> Libvirt's configuration converter doesn't know how to deal with BIOS
> selection. The end result is it always use the default one (seabios).
> Stub out ovmf and rombios to avoid false positive results.
> 
> This restriction will be removed once libvirt's converter knows how to
> deal with BIOS selection.

I assume no existing job tries to use an alternative BIOS with libvirt?
Assuming that is the case (i.e. this won't cause what looks like a
regression):

> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH OSSTEST 09/12] ts-debian-hvm-install: stub out libvirt + ovmf / rombios

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> Libvirt's configuration converter doesn't know how to deal with BIOS
> selection. The end result is it always use the default one (seabios).

Even with qemu-trad? Does it not use rombios in that case?

> Stub out ovmf and rombios to avoid false positive results.
> 
> This restriction will be removed once libvirt's converter knows how to
> deal with BIOS selection.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  ts-debian-hvm-install | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
> index 449b96c..7fe9ca8 100755
> --- a/ts-debian-hvm-install
> +++ b/ts-debian-hvm-install
> @@ -28,6 +28,13 @@ if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
>  
>  defined($r{bios}) or die "Need to define which bios to use";
>  
> +# Libvirt doesn't know anything about bios. It will always use the
> +# default one (seabios). Stub out rombios and ovmf to avoid false
> +# positive results.
> +if ($r{bios} =~ m/ovmf|rombios/ && $r{toolstack} eq 'libvirt') {
> +    die "libvirt + $r{bios} is not supported yet.";
> +}
> +
>  our ($whhost,$gn) = @ARGV;
>  $whhost ||= 'host';
>  $gn ||= 'debianhvm';

Re: [PATCH OSSTEST 10/12] make-flight: debian hvm tests with libvirt

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:

I know you've made ts-debian-hvm-install DTRT but this is going to
result in a load of jobs which go through all the effort of regrooving
the box and installing Xen etc, only to fail.

It seems like a rather profligate use of our limited test bandwidth (but
might be OK in the new co-lo.

Ian, do you have an opinion?

The code looks correct to me for what it wants to achieve.

Re: [PATCH OSSTEST 11/12] make-flight, mfi-common: rename onetoolstack to pairtoolstack

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> The name "onetoolstack" in confusing. Currently it's in fact referring
> to the toolstack used to test pair migration, so rename it to
> "pairtoolstack".
> 
> No functional changes introduced.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH OSSTEST 12/12] make-flight, mfi-common: create live migration test for libvirt

[Ian Campbell]

On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  make-flight | 13 +++++++++++--
>  mfi-common  |  6 +++++-
>  2 files changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/make-flight b/make-flight
> index 23d51ea..80c9c39 100755
> --- a/make-flight
> +++ b/make-flight
> @@ -419,11 +419,20 @@ test_matrix_do_one () {
>    done # qemuu_suffix
>  
>    # Test live migration
> -  job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
> -            $pairtoolstack $xenarch $dom0arch \
> +  for toolstack in $pairtoolstack; do
> +    # Don't change test case name for old test cases with xl and xend
> +    if [ x$toolstack = xxl -o x$toolstack = xxend ]; then
> +      toolstack_suffix=""
> +    else
> +      toolstack_suffix="-$toolstack"
> +    fi
> +    job_create_test test-$xenarch$kern-$dom0arch$toolstack_suffix-pair \

toolstack_suffix doesn't need {} around it, does it? I think not since
"-" is not valid in a shell var, but wanted to check.

Assuming I'm right that it doesn't:

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH OSSTEST 04/12] toolstack: distinguish local and remote migration support

[Jim Fehlig]

Ian Campbell wrote:
> On Mon, 2015-02-09 at 11:09 +0000, Wei Liu wrote:
>   
>> Libvirt supports migrating a guest to remote host but not local host.
>>     
>
> Jim, is that right?
>   

Opps, I missed this mail.  Sorry for the delay.

Yes, that is correct

# virsh migrate --live test-pv xen+ssh://localhost
error: Requested operation is not valid: domain 'test-pv' is already active

I suppose the code could be fixed up to allow localhost migration, but
doing so would be quite low on my todo list.

Regards,
Jim

Re: [PATCH OSSTEST 04/12] toolstack: distinguish local and remote migration support

[Ian Campbell]

On Wed, 2015-03-25 at 15:18 -0600, Jim Fehlig wrote:
> Ian Campbell wrote:
> > On Mon, 2015-02-09 at 11:09 +0000, Wei Liu wrote:
> >   
> >> Libvirt supports migrating a guest to remote host but not local host.
> >>     
> >
> > Jim, is that right?
> >   
> 
> Opps, I missed this mail.  Sorry for the delay.
> 
> Yes, that is correct
> 
> # virsh migrate --live test-pv xen+ssh://localhost
> error: Requested operation is not valid: domain 'test-pv' is already active
> 
> I suppose the code could be fixed up to allow localhost migration, but
> doing so would be quite low on my todo list.

Understood, it really only useful for manual testing since automated
test is capable of setting up remote migration easily enough.

Ian.

Re: [PATCH OSSTEST 09/12] ts-debian-hvm-install: stub out libvirt + ovmf / rombios

[Wei Liu]

On Wed, Mar 11, 2015 at 04:34:43PM +0000, Ian Campbell wrote:
> On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> > Libvirt's configuration converter doesn't know how to deal with BIOS
> > selection. The end result is it always use the default one (seabios).
> 
> Even with qemu-trad? Does it not use rombios in that case?
> 

I have the impression that it doesn't know how to use qemu-trad. At
least not in OSSTest.

Wei.

> > Stub out ovmf and rombios to avoid false positive results.
> > 
> > This restriction will be removed once libvirt's converter knows how to
> > deal with BIOS selection.
> > 
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > ---
> >  ts-debian-hvm-install | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
> > index 449b96c..7fe9ca8 100755
> > --- a/ts-debian-hvm-install
> > +++ b/ts-debian-hvm-install
> > @@ -28,6 +28,13 @@ if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
> >  
> >  defined($r{bios}) or die "Need to define which bios to use";
> >  
> > +# Libvirt doesn't know anything about bios. It will always use the
> > +# default one (seabios). Stub out rombios and ovmf to avoid false
> > +# positive results.
> > +if ($r{bios} =~ m/ovmf|rombios/ && $r{toolstack} eq 'libvirt') {
> > +    die "libvirt + $r{bios} is not supported yet.";
> > +}
> > +
> >  our ($whhost,$gn) = @ARGV;
> >  $whhost ||= 'host';
> >  $gn ||= 'debianhvm';
> 

Re: [PATCH OSSTEST 10/12] make-flight: debian hvm tests with libvirt

[Wei Liu]

On Wed, Mar 11, 2015 at 04:36:38PM +0000, Ian Campbell wrote:
> On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> 
> I know you've made ts-debian-hvm-install DTRT but this is going to
> result in a load of jobs which go through all the effort of regrooving
> the box and installing Xen etc, only to fail.
> 
> It seems like a rather profligate use of our limited test bandwidth (but
> might be OK in the new co-lo.
> 
> Ian, do you have an opinion?
> 

Ian(J), what do you think about this? Should we limit the test to
upstream QEMU only?

Wei.

> The code looks correct to me for what it wants to achieve.
> 

Re: [PATCH OSSTEST 08/12] ts-libvirt-build: run libvirt test suite

[Wei Liu]

On Wed, Mar 11, 2015 at 04:31:25PM +0000, Ian Campbell wrote:
> On Mon, 2015-02-09 at 11:10 +0000, Wei Liu wrote:
> > We're interested in xlconfigtest. Since we're running test anyway run
> > the whole suite.
> 
> This is run at build time? I take it doesn't (and will never) require an
> active system?
> 

Yes, build time. It doesn't require an active system.

"The internal test suite: present in the source code, it is run by
developers before submitting patches upstream, it is also suggested to
have it run and pass as part of the packaging process for
distributions."

What we do with libvirt is a bit like "packaging" so I would like to
have it run.

> > @@ -69,7 +61,10 @@ END
> >  sub build() {
> >      target_cmd_build($ho, 3600, $builddir, <<END);
> >          cd libvirt
> > -        (make $makeflags 2>&1 && touch ../build-ok-stamp) |tee ../log
> > +        (make $makeflags 2>&1 && \\
> > +         LD_LIBRARY_PATH=$xenprefix/lib/ \\
> > +           make check VIR_TEST_EXPENSIVE=1 2>&1 && \\
> > +         touch ../build-ok-stamp) |tee ../log
> 
> I think this would be preferable as a separate target_cmd_build
> invocation to run the tests, to make it clearer in the logs what
> happened.
> 

Ack.

Wei.