[PATCH OSSTEST 1/2] When invoking xl create do so verbosely

[PATCH OSSTEST 1/2] When invoking xl create do so verbosely

[Ian Campbell]

xend.pm inherits from xl.pm, but I don't know what (if any) support
for verbosity it has, so the xm invocation is unchanged.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 Osstest/Toolstack/xend.pm | 1 +
 Osstest/Toolstack/xl.pm   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Osstest/Toolstack/xend.pm b/Osstest/Toolstack/xend.pm
index 1d5d059..972b3b1 100644
--- a/Osstest/Toolstack/xend.pm
+++ b/Osstest/Toolstack/xend.pm
@@ -30,6 +30,7 @@ sub new {
 		   NewDaemons => [qw(xend)],
 		   OldDaemonInitd => 'xend',
 		   _Command => 'xm',
+		   _VerboseCommand => 'xm', # no verbosity here
 		   Dom0MemFixed => 1,
     }, $class;
 }
diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm
index 23328d3..3c3d348 100644
--- a/Osstest/Toolstack/xl.pm
+++ b/Osstest/Toolstack/xl.pm
@@ -29,6 +29,7 @@ sub new {
 		   NewDaemons => [],
 		   Dom0MemFixed => 1,
 		   _Command => 'xl',
+		   _VerboseCommand => 'xl -vvv',
 		   RestoreNeedsConfig => 1,
     }, $class;
 }
@@ -42,7 +43,7 @@ sub destroy ($$) {
 sub create ($$) {
     my ($self,$gho) = @_;
     my $cfg = $gho->{CfgPath};
-    target_cmd_root($self->{Host}, $self->{_Command}." create $cfg", 100);
+    target_cmd_root($self->{Host}, $self->{_VerboseCommand}." create $cfg", 100);
 }
 
 sub consolecmd ($$) {
-- 
2.1.4

[PATCH OSSTEST 2/2] ts-debian-hvm-install: Arrange for installed guest to use a serial console

[Ian Campbell]

So that the guest boot will be logged somewhere useful (the qemu-dm
log).

It still seems to pickup a "quiet" from somewhere, so it's not as
useful as it might be, but it is an improvement.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ts-debian-hvm-install | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index ea2d1ad..f05b1a7 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -98,19 +98,22 @@ END
 }
 
 sub grub_cfg () {
-
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
+    # why console= is repeated.
     return <<"END";
 set default="0"
 set timeout=5
 
 menuentry 'debian guest auto Install' {
-    linux /install.amd/vmlinuz console=vga console=ttyS0,115200n8 preseed/file=/preseed.cfg
+    linux /install.amd/vmlinuz console=vga preseed/file=/preseed.cfg console=ttyS0,115200n8 -- console=ttyS0,115200n8
     initrd /install.amd/initrd.gz
 }
 END
 }
 
 sub isolinux_cfg () {
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
+    # why console= is repeated.
     return <<"END";
     default autoinstall
     prompt 0
@@ -118,7 +121,7 @@ sub isolinux_cfg () {
 
     label autoinstall
         kernel /install.amd/vmlinuz
-        append video=vesa:ywrap,mtrr vga=788 console=ttyS0,115200n8 preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz
+        append video=vesa:ywrap,mtrr vga=788 preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz console=ttyS0,115200n8 -- console=ttyS0,115200n8
 END
 }
 
-- 
2.1.4

Re: [PATCH OSSTEST 1/2] When invoking xl create do so verbosely

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST 1/2] When invoking xl create do so verbosely"):
> xend.pm inherits from xl.pm, but I don't know what (if any) support
> for verbosity it has, so the xm invocation is unchanged.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Re: [PATCH OSSTEST 2/2] ts-debian-hvm-install: Arrange for installed guest to use a serial console

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST 2/2] ts-debian-hvm-install: Arrange for installed guest to use a serial console"):
> So that the guest boot will be logged somewhere useful (the qemu-dm
> log).
> 
> It still seems to pickup a "quiet" from somewhere, so it's not as
> useful as it might be, but it is an improvement.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>


I spotted that

>  sub grub_cfg () {
>  sub isolinux_cfg () {

these two functions are rather similar, but I shan't ask you to merge
them now.

Ian.

Re: [PATCH OSSTEST 2/2] ts-debian-hvm-install: Arrange for installed guest to use a serial console

[Ian Campbell]

On Mon, 2015-07-06 at 14:57 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST 2/2] ts-debian-hvm-install: Arrange for installed guest to use a serial console"):
> > So that the guest boot will be logged somewhere useful (the qemu-dm
> > log).
> > 
> > It still seems to pickup a "quiet" from somewhere, so it's not as
> > useful as it might be, but it is an improvement.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Thanks!

This and the previous patch were born out of looking at flight 59040 and
I think would be good to have in pretest sooner rather than later to see
if they can help debug those failures.

> I spotted that
> 
> >  sub grub_cfg () {
> >  sub isolinux_cfg () {
> 
> these two functions are rather similar, but I shan't ask you to merge
> them now.

Thanks!

They differ in ways which I think must be down to differences in the
original ones which come from Debian. In any case I think they can
probably both be convinced to use di_installcmdline_core like my distro
series' ts-debian-di-install does, although perhaps with some
adjustments.

Ian.