From patchwork Wed Oct 7 17:59:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11821447 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5738B14D5 for ; Wed, 7 Oct 2020 18:20:03 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2DA432173E for ; Wed, 7 Oct 2020 18:20:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2DA432173E Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.3644.10543 (Exim 4.92) (envelope-from ) id 1kQE1j-00077c-L5; Wed, 07 Oct 2020 18:18:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3644.10543; Wed, 07 Oct 2020 18:18:59 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE1j-00077U-FR; Wed, 07 Oct 2020 18:18:59 +0000 Received: by outflank-mailman (input) for mailman id 3644; Wed, 07 Oct 2020 18:18:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE1i-00072Q-FZ for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:18:58 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4107dd9a-78d9-4391-844b-8506c6bdd8d7; Wed, 07 Oct 2020 18:18:54 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDjz-0007CF-Mp; Wed, 07 Oct 2020 19:00:39 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE1i-00072Q-FZ for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:18:58 +0000 X-Inumbo-ID: 4107dd9a-78d9-4391-844b-8506c6bdd8d7 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4107dd9a-78d9-4391-844b-8506c6bdd8d7; Wed, 07 Oct 2020 18:18:54 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDjz-0007CF-Mp; Wed, 07 Oct 2020 19:00:39 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 26/82] host allocation: selecthost: allow sort-of-selection of prospective hosts Date: Wed, 7 Oct 2020 18:59:28 +0100 Message-Id: <20201007180024.7932-27-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201007180024.7932-1-iwj@xenproject.org> References: <20201007180024.7932-1-iwj@xenproject.org> MIME-Version: 1.0 From: Ian Jackson If one passes a trueish value for $prospective, selecthost does not worry about whether any host has actually been selected. It does a limited amount of prep work. This will be useful if we want to know some of the non-host-specific information selecthost computes - in particular, $ho->{Suite} etc. No functional change with existing callers. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 7292a329..3d5f0be3 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1170,9 +1170,9 @@ sub power_state ($$;$) { #---------- host selection and properties ---------- -sub selecthost ($;$); -sub selecthost ($;$) { - my ($ident, $none_ok) = @_; +sub selecthost ($;$$); +sub selecthost ($;$$) { + my ($ident, $none_ok, $prospective) = @_; # must be run outside transaction # $ident is @@ -1199,7 +1199,7 @@ sub selecthost ($;$) { $r{$ident}= $name; } else { $name= $r{$ident}; - if (!defined $name) { + if (!defined $name and !$prospective) { return undef if $none_ok; die "no specified $ident"; } @@ -1220,6 +1220,8 @@ sub selecthost ($;$) { $ho->{OS} = target_var($ho, "os") // "debian"; } + return $ho if $prospective; + #----- handle hosts which are themselves guests (nested) ----- if ($name =~ s/^(.*)://) {