From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: ian.jackson@eu.citrix.com, Wei Liu <wei.liu2@citrix.com>,
ian.campbell@citrix.com
Subject: [PATCH OSSTEST] Stubdom test case
Date: Mon, 1 Jun 2015 16:21:04 +0100 [thread overview]
Message-ID: <1433172064-9911-1-git-send-email-wei.liu2@citrix.com> (raw)
Currently only QEMU traditional supports stubdom, so we only create
test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64
test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm
Note that stubdom only supports serial='pty'. Piping serial to stderr
causes stubdom to exit abnormally.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Diff of xen-unstable flight runvar dump before and after this change:
diff -ub ../master-runvars ../stubdom-runvars | sed 's/[ \t]*$//' | egrep '^[\+|-]'
--- ../master-runvars 2015-06-01 12:36:22.759594425 +0100
+++ ../stubdom-runvars 2015-06-01 12:37:49.584329616 +0100
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 all_hostflags arch-i386,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm all_hostflags arch-i386,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 arch amd64
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm arch amd64
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 arch i386
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm arch i386
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 bios rombios
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm bios rombios
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 bios rombios
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm bios rombios
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 buildjob build-amd64
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm buildjob build-amd64-xsm
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 buildjob build-i386
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm buildjob build-i386-xsm
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 debianhvm_image debian-7.2.0-amd64-CD-1.iso
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm debianhvm_image debian-7.2.0-amd64-CD-1.iso
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 debianhvm_image debian-7.2.0-amd64-CD-1.iso
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm debianhvm_image debian-7.2.0-amd64-CD-1.iso
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 device_model_version qemu-xen-traditional
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm device_model_version qemu-xen-traditional
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 device_model_version qemu-xen-traditional
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm device_model_version qemu-xen-traditional
+xen-unstable test-amd64-amd64-xl-qemut-debianhvm-amd64 enable_stubdom false
+xen-unstable test-amd64-amd64-xl-qemut-debianhvm-amd64-xsm enable_stubdom false
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 enable_stubdom true
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm enable_stubdom true
+xen-unstable test-amd64-amd64-xl-qemuu-debianhvm-amd64 enable_stubdom false
+xen-unstable test-amd64-amd64-xl-qemuu-debianhvm-amd64-xsm enable_stubdom false
+xen-unstable test-amd64-amd64-xl-qemuu-ovmf-amd64 enable_stubdom false
+xen-unstable test-amd64-i386-xl-qemut-debianhvm-amd64 enable_stubdom false
+xen-unstable test-amd64-i386-xl-qemut-debianhvm-amd64-xsm enable_stubdom false
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 enable_stubdom true
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm enable_stubdom true
+xen-unstable test-amd64-i386-xl-qemuu-debianhvm-amd64 enable_stubdom false
+xen-unstable test-amd64-i386-xl-qemuu-debianhvm-amd64-xsm enable_stubdom false
+xen-unstable test-amd64-i386-xl-qemuu-ovmf-amd64 enable_stubdom false
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 enable_xsm false
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm enable_xsm true
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 enable_xsm false
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm enable_xsm true
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 kernbuildjob build-amd64-pvops
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm kernbuildjob build-amd64-pvops
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 kernbuildjob build-i386-pvops
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm kernbuildjob build-i386-pvops
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 kernkind pvops
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm kernkind pvops
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 kernkind pvops
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm kernkind pvops
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 toolstack xl
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm toolstack xl
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 toolstack xl
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm toolstack xl
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 xenbuildjob build-amd64
+xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm xenbuildjob build-amd64-xsm
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 xenbuildjob build-amd64
+xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm xenbuildjob build-amd64-xsm
---
Osstest/TestSupport.pm | 10 +++++++++-
make-flight | 19 ++++++++++++++-----
ts-debian-hvm-install | 3 +++
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 1f3bab2..170be41 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1648,7 +1648,6 @@ vncdisplay=0
vnclisten='$ho->{Ip}'
vncpasswd='$passwd'
-serial='file:/dev/stderr'
#
boot = 'dc'
END
@@ -1663,6 +1662,15 @@ END
$cfg .= "bios='$bios'\n";
}
+ my $stubdom = $xopts{Stubdom};
+ $stubdom = 0 unless defined $stubdom;
+ if ($stubdom == 1) {
+ $cfg .= "device_model_stubdomain_override=1\n";
+ $cfg .= "serial='pty'";
+ } else {
+ $cfg .= "serial='file:/dev/stderr'";
+ }
+
$xopts{VifType} ||= "ioemu";
my $cfgpath= prepareguest_part_xencfg($ho, $gho, $ram_mb, \%xopts, $cfg);
target_cmd_root($ho, <<END);
diff --git a/make-flight b/make-flight
index 41c7520..c497578 100755
--- a/make-flight
+++ b/make-flight
@@ -214,10 +214,17 @@ do_hvm_debian_test_one () {
testname=$1
bios=$2
xsm=$3
+ stubdom=$4
- job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64\
+ stubdom_suffix="";
+ if [ $stubdom = true ]; then
+ stubdom_suffix="-stubdom"
+ fi
+
+ job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix$stubdom_suffix-$testname-amd64\
test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
enable_xsm=$xsm \
+ enable_stubdom=$stubdom \
debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
bios=$bios \
all_hostflags=$most_hostflags,hvm
@@ -232,16 +239,18 @@ 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
+ do_hvm_debian_test_one ovmf ovmf false false
for xsm in $xsms ; do
- do_hvm_debian_test_one debianhvm seabios $xsm
+ do_hvm_debian_test_one debianhvm seabios $xsm false
done
fi
- # QEMU traditional supports rombios
+ # QEMU traditional supports rombios and stubdom
if [ "x$qemuu_suffix" == "x-qemut" ]; then
for xsm in $xsms ; do
- do_hvm_debian_test_one debianhvm rombios $xsm
+ for stubdom in true false ; do
+ do_hvm_debian_test_one debianhvm rombios $xsm $stubdom
+ done
done
fi
}
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index ea2d1ad..a81dad2 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -28,6 +28,8 @@ if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
defined($r{bios}) or die "Need to define which bios to use";
+my $enable_stubdom = ($r{enable_stubdom}//'false') =~ m/true/ ? 1 : 0;
+
our ($whhost,$gn) = @ARGV;
$whhost ||= 'host';
$gn ||= 'debianhvm';
@@ -181,6 +183,7 @@ sub prep () {
more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
OnReboot => 'preserve',
Bios => $r{bios},
+ Stubdom => $enable_stubdom,
PostImageHook => sub {
my $cmds = iso_copy_content_from_image($gho, $newiso);
$cmds .= prepare_initrd($initrddir,$newiso,$preseed_file_path);
--
1.9.1
next reply other threads:[~2015-06-01 15:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 15:21 Wei Liu [this message]
2015-06-08 10:42 ` [PATCH OSSTEST] Stubdom test case Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433172064-9911-1-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).