From nobody Tue Nov 4 11:30:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1602095293; cv=none; d=zohomail.com; s=zohoarc; b=dSJ0NkvYv+tJTulZVJ8Dkm/48QAhA3wYOv54EgKZ9Cy7Dxjk9Pl4mjHQtlpdnx4dBfOX/pk4zH4Tzq/XjmYM7cG/e5ECsdksNtGvXIykkfUaDHserIYlRywMnemeur/q0EulGq1vYgHeN5ybNYn9rN+JV0XOy/oVa1/ZKs2hNfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602095293; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SWyL9Kir1H0yejn8xOYVes1XjWr8+BuPQcM5OtItCFs=; b=ns2cQPYGZShWFNij4hV/iA1WHIFmZKAbm441ZI3uprMnRErhiPGN5+a/j9PFLLJGYXh4HGDG4OFqgtR7koySkoSt/5P3B5HKcuDe4e4PL4yysIBLzRBx8nPIe9ijkhFqMihXino3mTuf2RnNglyZLyvcmxBxUdpQf+5HMATNPSk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1602095293651794.0395638878988; Wed, 7 Oct 2020 11:28:13 -0700 (PDT) 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 Received: by outflank-mailman (output) from mailman id 3710.11077; Wed, 07 Oct 2020 18:27:57 +0000 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 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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" X-Inumbo-ID: 2d13658e-fba9-4421-9b68-f8e723a3e629 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 //=3D 'ready'; =20 my $what=3D "resource $restype $resname"; - $sharetype .=3D ' '.get_harness_rev(); + if (defined $sharetype) { + $sharetype .=3D ' '.get_harness_rev(); + } else { + die if $newstate eq 'ready'; + } =20 db_retry($dbh_tests, [qw(resources)], sub { $oldshr=3D 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 $sharetyp= e; die "$what shared state $oldshr->{State} not $oldstate" unless $oldshr->{State} eq $oldstate; - my $nrows=3D $dbh_tests->do(<do(<do(<{ResType}, $resname); --=20 2.20.1