From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH OSSTEST] Stubdom test case Date: Mon, 8 Jun 2015 11:42:30 +0100 Message-ID: <1433760150.7108.444.camel@citrix.com> References: <1433172064-9911-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1uVn-0006BO-K8 for xen-devel@lists.xenproject.org; Mon, 08 Jun 2015 10:42:35 +0000 In-Reply-To: <1433172064-9911-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Liu Cc: Xen-devel , ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org On Mon, 2015-06-01 at 16:21 +0100, Wei Liu wrote: > 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. FWIW I think it would be harmless to switch unconditionally, it would mean the guest serial output ended up in /var/log/xen/console/ instead of in /var/log/xen/guest-qemu-dm.log is all. Which arguably makes more sense. (ISTR suggesting this before and Ian had a reason not to do so, but I don't recall why not, at the time it would have been just churn perhaps). > Signed-off-by: Wei Liu > --- > 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 Usually it is easier to see what is going on if you sort them (e.g. diff -ub <(sort ../master-runvar) <(sort ../stubdom-runvars): Sorting your list gives the following, which shows that you have added test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64(-xsm) in addition to the two in the commit message. You've also added enable_stubdom=false to the other cases, I think normally we like to just accept the toolstack default for things which don't care. +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 all_hostflags arch-amd64,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 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 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 enable_stubdom true +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 enable_xsm false +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 kernbuildjob build-amd64-pvops +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 kernkind pvops +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64 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 all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm arch amd64 +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm bios rombios +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm buildjob build-amd64-xsm +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-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm device_model_version qemu-xen-traditional +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm enable_stubdom true +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm enable_xsm true +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm kernbuildjob build-amd64-pvops +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm kernkind pvops +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm toolstack xl +xen-unstable test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm xenbuildjob build-amd64-xsm +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 all_hostflags arch-i386,arch-xen-amd64,suite-wheezy,purpose-test,hvm +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 arch i386 +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 bios rombios +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 buildjob build-i386 +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 device_model_version qemu-xen-traditional +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 enable_stubdom true +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 enable_xsm false +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 kernbuildjob build-i386-pvops +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 kernkind pvops +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 toolstack xl +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64 xenbuildjob build-amd64 +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-i386-xl-qemut-stubdom-debianhvm-amd64-xsm arch i386 +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm bios rombios +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm buildjob build-i386-xsm +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-i386-xl-qemut-stubdom-debianhvm-amd64-xsm device_model_version qemu-xen-traditional +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm enable_stubdom true +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm enable_xsm true +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm kernbuildjob build-i386-pvops +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm kernkind pvops +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm toolstack xl +xen-unstable test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm xenbuildjob build-amd64-xsm +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 > @@ -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'"; > + } I think if stubdom is defined and == 0 you should force it to be off, which as I say above ought to be distinct from stubdom not defined at all.