From nobody Sun May 5 08:55:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1611701372; cv=none; d=zohomail.com; s=zohoarc; b=IW8biOX/uuQcgXcl3X/xH+IWM4G9Anb+QX4XqnnyrfCfToc2UJMNh7DvQON47Yt55GOrC3DrzZB6+cFM1++kaOBaU30BOhq+mYVAVk4KVECY90g4JWdHrNo2hcp0qmewHjyFIsrykvs9Cqk91aWTSQq8UzRyqFSn5lMj6e9iIVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611701372; h=Content-Type: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=0LiXfM95LwidFdpuxlE1M+vrMT8+w+sdyYO/t0lLvp8=; b=cmSq7NdMkXz1bkzvgPaJ/LCxV2Rk8XXbCNq/79428hfc89IhgcWDjvKZuhO/9tOHO8MhDIeYWjz074+DYsuwUcbl43MG33N+lxVA9FHDgC9UlVbdx7OdjV6ldePHY4oq0zkga09nidP8KrlVax1t47UzCZJzLW4KU4qkUgWQ2ok= 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1611701372296581.1292047837634; Tue, 26 Jan 2021 14:49:32 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.75616.136205 (Exim 4.92) (envelope-from ) id 1l4X9B-000282-2X; Tue, 26 Jan 2021 22:49:17 +0000 Received: by outflank-mailman (output) from mailman id 75616.136205; Tue, 26 Jan 2021 22:49:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l4X9A-00027q-Tr; Tue, 26 Jan 2021 22:49:16 +0000 Received: by outflank-mailman (input) for mailman id 75616; Tue, 26 Jan 2021 22:49:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l4X99-0001QY-OA for xen-devel@lists.xenproject.org; Tue, 26 Jan 2021 22:49:15 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b5c52ba7-bba4-40eb-9c72-6b6a0525097a; Tue, 26 Jan 2021 22:48:37 +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 10QMmXpt028712; Tue, 26 Jan 2021 23:48:33 +0100 (CET) Received: from borneo.soc.lip6.fr (borneo [132.227.103.47]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10QMmWj3029452; Tue, 26 Jan 2021 23:48:32 +0100 (MET) Received: by borneo.soc.lip6.fr (Postfix, from userid 373) id BD2FAAA8BC; Tue, 26 Jan 2021 23:48:32 +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: b5c52ba7-bba4-40eb-9c72-6b6a0525097a From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Ian Jackson , Wei Liu Subject: [PATCH v2] NetBSD hotplug: fix block unconfigure on destroy Date: Tue, 26 Jan 2021 23:47:49 +0100 Message-Id: <20210126224800.1246-3-bouyer@netbsd.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210126224800.1246-1-bouyer@netbsd.org> References: <20210126224800.1246-1-bouyer@netbsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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, 26 Jan 2021 23:48:33 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 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 2a0516f436..c8b31a7b2b 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -20,37 +20,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