@@ -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');
@@ -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
@@ -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
@@ -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
"