From patchwork Tue Oct 4 12:26:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9361693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D2E7560752 for ; Tue, 4 Oct 2016 12:29:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5245287B8 for ; Tue, 4 Oct 2016 12:29:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B892D286E8; Tue, 4 Oct 2016 12:29:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9B53D286E8 for ; Tue, 4 Oct 2016 12:29:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brOoB-0001XN-4d; Tue, 04 Oct 2016 12:26:55 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brOo9-0001Ww-Lq for xen-devel@lists.xenproject.org; Tue, 04 Oct 2016 12:26:53 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 9B/0B-29421-C00A3F75; Tue, 04 Oct 2016 12:26:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsXitHSDvS7Pgs/ hBte2K1t83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnL3rWxFnSyVfTsvsDWwPiSpYuRk0NCwF9i 68K7zCA2m4CuRNOWv2xdjBwcIgIqErf3GoCYzAKhEjteWIJUCAtYSUybvpEVxGYBquhdO4UNx OYV8JSYffQ/1EQ5ifPHf4JN5BTwkliwbDpYXAiopu9/NzvISCEBNYm56+MhWgUlTs58AlbCLC AhcfDFC2aIMdwSt09PZZ7AyDcLSdksJGULGJlWMWoUpxaVpRbpGhvqJRVlpmeU5CZm5ugaGpj p5aYWFyemp+YkJhXrJefnbmIEhhMDEOxgbFoUeIhRkoNJSZS38vWncCG+pPyUyozE4oz4otKc 1OJDjDIcHEoSvFvmfQ4XEixKTU+tSMvMAQY2TFqCg0dJhFdvPlCat7ggMbc4Mx0idYpRl2PBj 9trmYRY8vLzUqXEed+AzBAAKcoozYMbAYuyS4yyUsK8jEBHCfEUpBblZpagyr9iFOdgVBLm1Q BZxZOZVwK36RXQEUxARwRu+QByREkiQkqqgVF/SiXL84NHlF8Frfxma2EkfGzupVezZ6ncWBP qddrgW0xz2JdolWXh3LJzEv98bz3t9kPt4Na964se5Ao2brqZuflFtHPeS64vASJaxyOFHnqe XKafMTG48pjNRu0nqwKfPZ34sWbChac8Tp94vknPn9lRtVJIly/qAzPPBmWmadIxZ6bb9jsqs RRnJBpqMRcVJwIAx6Jzl60CAAA= X-Env-Sender: prvs=07840bd4e=Ian.Jackson@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1475584010!53686280!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47905 invoked from network); 4 Oct 2016 12:26:52 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 4 Oct 2016 12:26:52 -0000 X-IronPort-AV: E=Sophos;i="5.31,295,1473120000"; d="scan'208";a="390553532" From: Ian Jackson To: Date: Tue, 4 Oct 2016 13:26:32 +0100 Message-ID: <1475583994-30203-4-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1475583994-30203-1-git-send-email-ian.jackson@eu.citrix.com> References: <1475583994-30203-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 4/6] mg-allocate: Tiny refactoring X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Break out $shareix assignment from $4. (We are going to want to put some code just after this point which will want to do regexp matching, which would trash $4.) Signed-off-by: Ian Jackson --- mg-allocate | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mg-allocate b/mg-allocate index 9b66114..0317229 100755 --- a/mg-allocate +++ b/mg-allocate @@ -111,7 +111,8 @@ sub parse_1res ($) { my $restype= defined($2) ? $2 : 'host'; $restype= 'share-host' if $restype eq 'S'; my $resname= $3; - my $shareix= defined($4) ? $4+0 : '*'; + my $shareix= $4; + $shareix= defined($shareix) ? $shareix+0 : '*'; my $shareixcond = $shareix eq '*' ? '' : "AND shareix = $shareix"; my @resnames;