Mailing List Archive

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

This was for distinguishing the old-style Xenolinux kernels from pvops
kernels.

We have not actually tested any non-pvops kernels for a very very long
time. Delete this now because the runvar is slightly in the way of
test host reuse.

(Sorry for the wide CC but it seems better to make sure anyone who
might object can do so.)

All this machinery exists just to configure the guest console
device (Xenolinux used "xvc" rather than "hvc") and the guest root
block device (Xenolinux stole "hda"/"sda" rather than using "xvda").

Specifically, in this commit:
* In what is now target_setup_rootdev_console_inittab, do not
look at any kernkind runvar and simply do what we would if
it were "pvops" or unset, as it is in all current jobs.
* Remove the runvar from all jobs creation and example runes.
(This has no functional change even for jobs running with
the previous osstest code because we have defaulted to "pvops"
for a very long time.)

We retain the setting of the shell variable "kernbuild", because that
ends up in build jobs' names. All our kernel build jobs now end in
-pvops and I intend to retain that name component since abolishing it
is nontrivial.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
CC: Juergen Gross <jgross@suse.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Wei Liu <wei.liu@kernel.org>
CC: Paul Durrant <paul@xen.org>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
CC: Andrew Cooper <Andrew.Cooper3@citrix.com>
CC: Olivier Lambert <olivier.lambert@vates.fr>
---
Osstest/TestSupport.pm | 9 ++-------
README | 2 +-
make-hosts-flight | 1 -
mfi-common | 7 ++-----
4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index d9bb2585..99c7654d 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -2569,14 +2569,9 @@ sub target_setup_rootdev_console_inittab ($$$) {
my ($ho, $gho, $root) = @_;

my $pfx= target_var_prefix($gho);
- my $kernkind= $r{$pfx."kernkind"} // 'pvops';
my $isguest= exists $gho->{Guest};
- if ($kernkind eq 'pvops') {
- store_runvar($pfx."rootdev", 'xvda') if $isguest;
- store_runvar($pfx."console", 'hvc0');
- } elsif ($kernkind !~ m/2618/) {
- store_runvar($pfx."console", 'xvc0') if $isguest;
- }
+ store_runvar($pfx."rootdev", 'xvda') if $isguest;
+ store_runvar($pfx."console", 'hvc0');

my $inittabpath= "$root/etc/inittab";
my $console= target_var($gho,'console');
diff --git a/README b/README
index 2804ecf3..ba4bea1d 100644
--- a/README
+++ b/README
@@ -861,7 +861,7 @@ echo $flight
job=play-amd64-amd64-xen-boot
./cs-job-create $flight $job play-xen-boot-x5 \
all_hostflags=arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test \
- arch=amd64 toolstack=xl enable_xsm=false kernkind=pvops \
+ arch=amd64 toolstack=xl enable_xsm=false \
host=$host

# Reuse the binaries from the Xen template job for both the hypervisor
diff --git a/make-hosts-flight b/make-hosts-flight
index e2c3776a..63ac7b71 100755
--- a/make-hosts-flight
+++ b/make-hosts-flight
@@ -73,7 +73,6 @@ hosts_iterate () {
local freebsd_runvars
set_freebsd_runvars true
runvars+="
- kernkind=pvops
all_host_di_version=$di_version
all_host_suite=$suite
$freebsd_runvars
diff --git a/mfi-common b/mfi-common
index e577449f..34b0c116 100644
--- a/mfi-common
+++ b/mfi-common
@@ -619,9 +619,8 @@ test_matrix_iterate () {
case $kern in
'')
kernbuild=pvops
- kernkind=pvops
;;
- *) echo >&2 "kernkind ? $kern"; exit 1 ;;
+ *) echo >&2 "kernbuild ? $kern"; exit 1 ;;
esac

for dom0arch in i386 amd64 armhf arm64; do
@@ -639,8 +638,7 @@ test_matrix_iterate () {
arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\"
"

- debian_runvars="debian_kernkind=$kernkind \
- debian_arch=$dom0arch \
+ debian_runvars="debian_arch=$dom0arch \
debian_suite=$guestsuite \
"

@@ -659,7 +657,6 @@ test_matrix_iterate () {
most_runvars="
arch=$dom0arch \
kernbuildjob=${bfi}build-$dom0arch-$kernbuild \
- kernkind=$kernkind \
$arch_runvars $hostos_runvars
"

--
2.20.1