From patchwork Tue Jan 12 18:12:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manuel Bouyer X-Patchwork-Id: 12014323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09472C433E0 for ; Tue, 12 Jan 2021 18:13:45 +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 BEB472311D for ; Tue, 12 Jan 2021 18:13:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BEB472311D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=antioche.eu.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.65830.116666 (Exim 4.92) (envelope-from ) id 1kzOAj-0003pg-ER; Tue, 12 Jan 2021 18:13:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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 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 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-bridge index b58e922601..cd428b5936 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -23,7 +23,10 @@ case $xstatus in xbridge=$(xenstore-read "$xpath/bridge") xfid=$(xenstore-read "$xpath/frontend-id") xhandle=$(xenstore-read "$xpath/handle") - iface=$(xenstore-read "$xpath/vifname") + iface=$(xenstore-read "$xpath/vifname") || true + if [ x${iface} = "x" ] ; then + iface=xvif$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=$(xenstore-read "$xpath/frontend-id") xhandle=$(xenstore-read "$xpath/handle") iface=$(xenstore-read "$xpath/vifname") + iface=$(xenstore-read "$xpath/vifname") || true + if [ x${iface} = "x" ] ; then + iface=xvif$xfid.$xhandle + fi ifconfig $iface $xip up xenstore-write $xpath/hotplug-status connected exit 0