From patchwork Mon Apr 28 10:41:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29196 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4759F202FE for ; Mon, 28 Apr 2014 10:42:36 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp4sf39998917obc.8 for ; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=GpcPPv21DigQ4Q07EMKdPShG1GC5S92vbKYxX5x0C6w=; b=NTck2Ft1qj+pkXauL1G4xI7sM1Qfs0gxIltefq8yJrMaNtov+Pr5MptkNT8ktb3IXW fBil3pupCpLy24FnBRi1YdgMxVCzoEIzGANEkPzwGpV8vkSgK0QxnekpG5RFTNNMH+jG cA8SKGf+9pkY2jyT3g9To7+k5zxyzsNDgoiqmnTTvQ/kMgiR2QJNbOMp9/0qVWHGjSYx UC9mf+OJYaED3Oiap2UPHBH8aaM2HoU49IJCUF3ADZlqh4Qv9WZTNfWRfZHpB4onQTRb rYz29ihg+Aidjk8YDUDaJWQ/xtAVLD8/F5IsH1InZzEn371mF7VUNUWzx8v61/RwNt9H MJMQ== X-Gm-Message-State: ALoCoQnwRoq7xjJMYF3ucKXScd0sAI/PCoJFn5czQEarJ7PhhoPE5mVB0otnsrEGOYCpTMo+0YeU X-Received: by 10.50.51.68 with SMTP id i4mr10823456igo.5.1398681755709; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.209 with SMTP id x75ls2411672qgx.46.gmail; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) X-Received: by 10.58.195.202 with SMTP id ig10mr153465vec.33.1398681755558; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id vd8si3517179vdc.70.2014.04.28.03.42.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:35 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so7565750veb.40 for ; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) X-Received: by 10.58.31.136 with SMTP id a8mr23979960vei.20.1398681755493; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp107031vcb; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) X-Received: by 10.229.89.65 with SMTP id d1mr31846642qcm.14.1398681755162; Mon, 28 Apr 2014 03:42:35 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id v9si7522443qar.220.2014.04.28.03.42.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:35 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wej0O-0007tD-GR; Mon, 28 Apr 2014 10:41:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wej0L-0007q0-46 for xen-devel@lists.xen.org; Mon, 28 Apr 2014 10:41:45 +0000 Received: from [193.109.254.147:20792] by server-9.bemta-14.messagelabs.com id 58/6F-03644-8603E535; Mon, 28 Apr 2014 10:41:44 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1398681701!1303545!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22993 invoked from network); 28 Apr 2014 10:41:43 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 28 Apr 2014 10:41:43 -0000 X-IronPort-AV: E=Sophos;i="4.97,943,1389744000"; d="scan'208";a="124285709" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 28 Apr 2014 10:41:43 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 28 Apr 2014 06:41:42 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Wej0H-0007Zh-HY; Mon, 28 Apr 2014 11:41:42 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Mon, 28 Apr 2014 11:41:41 +0100 From: Ian Campbell To: Date: Mon, 28 Apr 2014 11:41:27 +0100 Message-ID: <1398681696-2773-6-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398681672.29700.55.camel@kazak.uk.xensource.com> References: <1398681672.29700.55.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 06/15] TestSupport: allow overring of on_* in prepareguest_part_xencfg X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Currently only on_reboot can be overridden Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/TestSupport.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index b283e07..132e8e9 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1416,6 +1416,8 @@ sub prepareguest_part_lvmdisk ($$$) { sub prepareguest_part_xencfg ($$$$$) { my ($ho, $gho, $ram_mb, $xopts, $cfgrest) = @_; my $onreboot= $xopts->{OnReboot} || 'restart'; + my $onpoweroff= $xopts->{OnPowerOff} || 'destroy'; + my $oncrash= $xopts->{OnCrash} || 'preserve'; my $vcpus= guest_var($gho, 'vcpus', $xopts->{DefVcpus} || 2); my $xoptcfg= $xopts->{ExtraConfig}; $xoptcfg='' unless defined $xoptcfg; @@ -1424,9 +1426,9 @@ name = '$gho->{Name}' memory = ${ram_mb} vif = [ 'type=ioemu,mac=$gho->{Ether}' ] # -on_poweroff = 'destroy' +on_poweroff = '$onpoweroff' on_reboot = '$onreboot' -on_crash = 'preserve' +on_crash = '$oncrash' # vcpus = $vcpus #