From patchwork Wed Oct 7 17:59:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11821547 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 D6B8D14D5 for ; Wed, 7 Oct 2020 18:28:53 +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 AAEEF2173E for ; Wed, 7 Oct 2020 18:28:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAEEF2173E 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.3710.11077 (Exim 4.92) (envelope-from ) id 1kQEAP-00042s-Of; Wed, 07 Oct 2020 18:27:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3710.11077; Wed, 07 Oct 2020 18:27:57 +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 1kQEAO-00041g-Ns; Wed, 07 Oct 2020 18:27:56 +0000 Received: by outflank-mailman (input) for mailman id 3710; Wed, 07 Oct 2020 18:27:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE5f-00072Q-Ol for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:23:03 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2d13658e-fba9-4421-9b68-f8e723a3e629; Wed, 07 Oct 2020 18:21:16 +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-GO; 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 1kQE5f-00072Q-Ol for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:23:03 +0000 X-Inumbo-ID: 2d13658e-fba9-4421-9b68-f8e723a3e629 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2d13658e-fba9-4421-9b68-f8e723a3e629; Wed, 07 Oct 2020 18:21:16 +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-GO; 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 25/82] host allocation: *_shared_mark_ready: Make $sharetype check optional Date: Wed, 7 Oct 2020 18:59:27 +0100 Message-Id: <20201007180024.7932-26-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 We are going to want to be able to set shares to other than ready, without double-checking the sharetype. The change to the UPDATE statement makes no difference because resource_check_allocated_core has just got that sharetype out of the db. (This does remove one safety check against bugs, sadly.) No functional change for existing callers. Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index f0038f6b..fd975590 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -1059,21 +1059,25 @@ sub executive_resource_shared_mark_ready ($$$;$$) { $newstate //= 'ready'; my $what= "resource $restype $resname"; - $sharetype .= ' '.get_harness_rev(); + if (defined $sharetype) { + $sharetype .= ' '.get_harness_rev(); + } else { + die if $newstate eq 'ready'; + } db_retry($dbh_tests, [qw(resources)], sub { $oldshr= resource_check_allocated_core($restype, $resname); if (defined $oldshr) { die "$what shared $oldshr->{Type} not $sharetype" - unless $oldshr->{Type} eq $sharetype; + unless !defined $sharetype or $oldshr->{Type} eq $sharetype; die "$what shared state $oldshr->{State} not $oldstate" unless $oldshr->{State} eq $oldstate; - my $nrows= $dbh_tests->do(<do(<do(<{ResType}, $resname);