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 11:02:18 +0100 Message-ID: <1433152938.15036.92.camel@citrix.com> References: <556C2C52020000780007F8A0@mail.emea.novell.com> <1433147647.15036.76.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzMYb-0002ap-Ho for xen-devel@lists.xenproject.org; Mon, 01 Jun 2015 10:02:57 +0000 In-Reply-To: <1433147647.15036.76.camel@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: Jan Beulich Cc: xen-devel , ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org On Mon, 2015-06-01 at 09:34 +0100, Ian Campbell wrote: > From aa79bd958fe42da2876fd76e61468c183a7fabdc Mon Sep 17 00:00:00 2001 > From: Ian Campbell > Date: Mon, 1 Jun 2015 09:32:37 +0100 > Subject: [PATCH] Toolstack: Do not pass -F to xm shutdown > > This is a feature of xl only. > > Signed-off-by: Ian Campbell With Ian being away for a bit and this blocking testing of older branches which contain xend I've pushed this to osstest's pretest branch. Ian. > --- > 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); > } >