From nobody Thu Apr 25 15:52:28 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=1610475228; cv=none; d=zohomail.com; s=zohoarc; b=UdehmRZ5w1m+qSC4fUpyOIMHWDGg49rH0/m2bbGxt7EwA1XETiZQZeFSXhS6rnIbl4QuajGEARA4TGFiJV2bDyg8qAeL8hW7CRYr5GWiZP9BmvrC/GHDUHVMbs4c41UedUixg5J4IvcnBr7IuWJ6BxBiyW65KGNDKcXQrpgoJZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610475228; 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=tUHnyYUUro5aVn+ZiyM4tunq2tUcXNNbOE+VzId0REM=; b=kHF50Co86BkhtAq3DacF1f8wuDiJ8iCuwoQcyLNF4lkDFLTPH7hEFFUmN+u05DzkGr18wKq6g+rPlG2ow5/ZaquLGYCs7d0Q46cu+2pStzrycMNM8gGVyk9pUwnjURbsYQmn11Pgl6dyHAIkFXOTp/QxvJM+MTZGfEs1v53LcRo= 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 1610475228750656.3671449052041; Tue, 12 Jan 2021 10:13:48 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.65830.116666 (Exim 4.92) (envelope-from ) id 1kzOAj-0003pg-ER; Tue, 12 Jan 2021 18:13:37 +0000 Received: by outflank-mailman (output) from mailman id 65830.116666; Tue, 12 Jan 2021 18:13:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOAj-0003pX-B5; Tue, 12 Jan 2021 18:13:37 +0000 Received: by outflank-mailman (input) for mailman id 65830; Tue, 12 Jan 2021 18:13:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOAh-0003Yo-Sz for xen-devel@lists.xenproject.org; Tue, 12 Jan 2021 18:13:35 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3428765d-5843-47f9-8619-2da818d3f902; Tue, 12 Jan 2021 18:13:15 +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 10CIDEIb012141; Tue, 12 Jan 2021 19:13:14 +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 10CIDDNP026926; Tue, 12 Jan 2021 19:13:13 +0100 (MET) Received: by armandeche.soc.lip6.fr (Postfix, from userid 20331) id 29B667218; Tue, 12 Jan 2021 19:13:13 +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: 3428765d-5843-47f9-8619-2da818d3f902 From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , Ian Jackson , Wei Liu Subject: [PATCH] NetBSD hotplug: handle case where vifname is not present Date: Tue, 12 Jan 2021 19:12:25 +0100 Message-Id: <20210112181242.1570-5-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:14 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Content-Type: text/plain; charset="utf-8" From: Manuel Bouyer Some Xen version didn't set the vifname in xenstore; just build one if not present. Signed-off-by: Manuel Bouyer --- tools/hotplug/NetBSD/vif-bridge | 5 ++++- tools/hotplug/NetBSD/vif-ip | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bri= dge index b58e922601..cd428b5936 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -23,7 +23,10 @@ case $xstatus in xbridge=3D$(xenstore-read "$xpath/bridge") xfid=3D$(xenstore-read "$xpath/frontend-id") xhandle=3D$(xenstore-read "$xpath/handle") - iface=3D$(xenstore-read "$xpath/vifname") + iface=3D$(xenstore-read "$xpath/vifname") || true + if [ x${iface} =3D "x" ] ; then + iface=3Dxvif$xfid.$xhandle + fi ifconfig $iface up brconfig $xbridge add $iface xenstore-write $xpath/hotplug-status connected diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index 83cbfe20e2..944f50f881 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -24,6 +24,10 @@ case $xstatus in xfid=3D$(xenstore-read "$xpath/frontend-id") xhandle=3D$(xenstore-read "$xpath/handle") iface=3D$(xenstore-read "$xpath/vifname") + iface=3D$(xenstore-read "$xpath/vifname") || true + if [ x${iface} =3D "x" ] ; then + iface=3Dxvif$xfid.$xhandle + fi ifconfig $iface $xip up xenstore-write $xpath/hotplug-status connected exit 0 --=20 2.29.2