From nobody Fri Apr 19 16:26:45 2024 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=fail(p=none dis=none) header.from=antioche.eu.org ARC-Seal: i=1; a=rsa-sha256; t=1610475216; cv=none; d=zohomail.com; s=zohoarc; b=SzZWu3gB9M5yUYAhIe3pXB2dNhoXe8c84XhXLwPqdv2U1sBXdG5XT6dqr879+5QhoI9DUg37HtAm9o13DICSIHHI6/LBMF1GyJhkrdi493Ix6CTyQUgENdjwkfF92vTWwYO5SEdFICJIoBmKPX9HHkUNisMb9qCwO/2jjI6JoJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610475216; 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=4NwytdA8oglB9I9+W+D2elvEj49GCed3iiQ7pXBVqAo=; b=QjDOUe7rGNRCLZ8p5M2+DO8gk+D8U0bSlLxgKjRCd3lCm1XEM5ivntDS6YaBUCc4xHUo3+LCT0/5hmq/XCoUVwyoLiC1CPOxtPPXJmP2f/l2xl0pY6SxmjmFSsxNyVXasznuMdiz20Ho5Ern6MjG7xDTYgWg3jRNwyq88e71wnw= 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=fail 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 1610475215943333.3180781876953; Tue, 12 Jan 2021 10:13:35 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.65827.116642 (Exim 4.92) (envelope-from ) id 1kzOAU-0003fU-PX; Tue, 12 Jan 2021 18:13:22 +0000 Received: by outflank-mailman (output) from mailman id 65827.116642; Tue, 12 Jan 2021 18:13:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOAU-0003fM-M3; Tue, 12 Jan 2021 18:13:22 +0000 Received: by outflank-mailman (input) for mailman id 65827; Tue, 12 Jan 2021 18:13:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOAS-0003Yo-SW for xen-devel@lists.xenproject.org; Tue, 12 Jan 2021 18:13:20 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f3168622-0c44-4f9e-9ac7-ff1feaf4399e; Tue, 12 Jan 2021 18:13:13 +0000 (UTC) Received: from asim.lip6.fr (asim.lip6.fr [132.227.86.2]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 10CIDCMM008504; Tue, 12 Jan 2021 19:13:12 +0100 (CET) Received: from armandeche.soc.lip6.fr (armandeche [132.227.63.133]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10CIDAqJ006345; Tue, 12 Jan 2021 19:13:10 +0100 (MET) Received: by armandeche.soc.lip6.fr (Postfix, from userid 20331) id B449D7218; Tue, 12 Jan 2021 19:13:10 +0100 (MET) 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: f3168622-0c44-4f9e-9ac7-ff1feaf4399e From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , Ian Jackson , Wei Liu Subject: [PATCH] NetBSD hotplug: fix block unconfigure on destroy Date: Tue, 12 Jan 2021 19:12:24 +0100 Message-Id: <20210112181242.1570-4-bouyer@antioche.eu.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210112181242.1570-1-bouyer@antioche.eu.org> References: <20210112181242.1570-1-bouyer@antioche.eu.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Tue, 12 Jan 2021 19:13:12 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Content-Type: text/plain; charset="utf-8" From: Manuel Bouyer When a domain is destroyed, xparams may not be available any more when the block script is called to unconfigure the vnd. Check xparam only at configure time, and just unconfigure any vnd present in the xenstore. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monn=C3=A9 --- tools/hotplug/NetBSD/block | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index 23c8e38ebf..27f3b98335 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -22,37 +22,28 @@ error() { xpath=3D$1 xstatus=3D$2 xparams=3D$(xenstore-read "$xpath/params") -if [ -b "$xparams" ]; then - xtype=3D"phy" -elif [ -f "$xparams" ]; then - xtype=3D"file" -elif [ -z "$xparams" ]; then - error "$xpath/params is empty, unable to attach block device." -else - error "$xparams is not a valid file type to use as block device." \ - "Only block and regular image files accepted." -fi =20 case $xstatus in 6) # device removed - case $xtype in - file) - vnd=3D$(xenstore-read "$xpath/vnd" || echo none) - if [ $vnd !=3D none ]; then - vnconfig -u $vnd - fi - ;; - phy) - ;; - *) - echo "unknown type $xtype" >&2 - ;; - esac + vnd=3D$(xenstore-read "$xpath/vnd" || echo none) + if [ $vnd !=3D none ]; then + vnconfig -u $vnd + fi xenstore-rm $xpath exit 0 ;; 2) + if [ -b "$xparams" ]; then + xtype=3D"phy" + elif [ -f "$xparams" ]; then + xtype=3D"file" + elif [ -z "$xparams" ]; then + error "$xpath/params is empty, unable to attach block device." + else + error "$xparams is not a valid file type to use as block device." \ + "Only block and regular image files accepted." + fi case $xtype in file) # Store the list of available vnd(4) devices in --=20 2.29.2