From patchwork Fri Apr 26 16:39:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE99215A6 for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD9A128DEB for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1D2128E04; Fri, 26 Apr 2019 16:42:46 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5ACF228DEB for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ub-00083G-Tj; Fri, 26 Apr 2019 16:41:21 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ua-000836-Ll for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:20 +0000 X-Inumbo-ID: 1d915710-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 1d915710-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:18 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519653" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:48 +0100 Message-ID: <20190426164002.22381-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 01/15] TestSupport: target_var: Refactor to allow for another host case X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make an explicit list of the prefixes and a loop to walk over them. No functional change. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ec867e4f..fcbde0a2 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2471,10 +2471,18 @@ sub target_var_prefix ($) { sub target_var ($$) { my ($ho,$vn) = @_; - my $pfx = target_var_prefix($ho); - my $allthing = exists $ho->{Guest} ? "guest" : "host"; - return $r{ $pfx. $vn } // - $r{ "all_${allthing}_${vn}" }; + my @prefixes; + push @prefixes, target_var_prefix($ho); + if (exists $ho->{Guest}) { + push @prefixes, 'all_guest_'; + } else { + push @prefixes, 'all_host_'; + } + foreach my $prefix (@prefixes) { + my $v = $r{ $prefix.$vn }; + return $v if defined $v; + } + return undef; } sub target_kernkind_check ($) {