From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH OSSTEST] Toolstack: Do not pass -F to xm shutdown (Was: Re: [xen-4.2-testing test] 57630: regressions - FAIL) Date: Mon, 1 Jun 2015 10:42:22 +0100 Message-ID: <1433151742.15036.82.camel@citrix.com> References: <556C2C52020000780007F8A0@mail.emea.novell.com> <1433147647.15036.76.camel@citrix.com> <556C402B020000780007F9AC@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzMGS-0000rg-GB for xen-devel@lists.xenproject.org; Mon, 01 Jun 2015 09:44:12 +0000 In-Reply-To: <556C402B020000780007F9AC@mail.emea.novell.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: Jan Beulich Cc: xen-devel , ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org On Mon, 2015-06-01 at 10:21 +0100, Jan Beulich wrote: > >>> On 01.06.15 at 10:34, wrote: > > Subject: [PATCH] Toolstack: Do not pass -F to xm shutdown > > > > This is a feature of xl only. > > > > Signed-off-by: Ian Campbell > > --- > > Osstest/Toolstack/xl.pm | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm > > index dd12ae1..23328d3 100644 > > --- a/Osstest/Toolstack/xl.pm > > +++ b/Osstest/Toolstack/xl.pm > > @@ -56,7 +56,7 @@ sub shutdown_wait ($$$) { > > my $ho = $self->{Host}; > > my $gn = $gho->{Name}; > > my $acpi_fallback = guest_var($gho,'acpi_shutdown','false') eq 'true' > > - ? "F" : ""; > > + && $self->{Name} eq 'xl' ? "F" : ""; > > target_cmd_root($ho,"$self->{_Command} shutdown -w${acpi_fallback} $gn", $timeout); > > Well - to me, not knowing much about osstest's structure, catering > for xm in a file called xl.pm seems odd. And then, taking into > consideration a hypothetical 3rd toolstack, I wonder whether > assuming only xl supports -F (instead of "only xm does not support > it") is the more suitable check. xend.pm inherits from xl.pm in a oo-ish way. I did consider adding shutdown_wait to xend.pm to overload this one, but that meant duplicating 95% unaltered. A third toolstack is not hypothetical, libvirt's virsh is supported, but virsh.pm sharing no historical legacy with xl/xm inherets from the toplevel toolstack parent, not the xl one. Ian.