From nobody Mon Feb 9 18:44:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598941305; cv=none; d=zohomail.com; s=zohoarc; b=UrnD2PzysBjIPveZeOh5sEGOmKcRZpQwsXVN9XC26nLqsdFY0kvlftFzBOn/xVEZ0U4IlgzMXpGZeWHnmdqbfNSs5szROkUzBdDIjkS1q3/h+Z5yDaMVC0byX6IKyl4WndO1t3wJBxlz/bGSBjj9m+9AMGg9y2dEyUcBAL1w+1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598941305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fDAR9Gc1bkWQ8YVcuK3lfmWjcu2H3hixFFWXHzCayLk=; b=U3QyWkaTAZmHNn+btcUpF6KRpOI7iVxoLriEPmOaCSsDjzi39TbICRi4KwR7iD83IIhRlpDesxcRi1ee3KiR2GoUkOM1vYSPh9ihaVWCtijNOi3CHmqdVr26BZncVPhAs7WlM3vhitvCIBCGs6pZRJcx3m7CLIzrmo4OEw+vs20= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598941305936568.3817231478004; Mon, 31 Aug 2020 23:21:45 -0700 (PDT) Received: from localhost ([::1]:55756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCzft-0007jj-5f for importer@patchew.org; Tue, 01 Sep 2020 02:21:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCzef-00061u-Gx for qemu-devel@nongnu.org; Tue, 01 Sep 2020 02:20:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44629 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCzed-0000lp-N4 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 02:20:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-238-namVbS7zPS2-VGEwNYqkvQ-1; Tue, 01 Sep 2020 02:20:24 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DFD811DDF0; Tue, 1 Sep 2020 06:20:23 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D6141002D4E; Tue, 1 Sep 2020 06:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598941226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fDAR9Gc1bkWQ8YVcuK3lfmWjcu2H3hixFFWXHzCayLk=; b=IdlIBhotY2sEE111Sjhp5lh4wdtRqNAsqr1gn0HE1hNH0BZymI4PFncXq6f4qRXGEHDY5e lpHqVTMl/tNxpSbfqytEsd8x33GkqUWozJPhZ+Fyld5VeoDaVl5H8Hv+vnoFA5efbXOxH0 cgcgYEYTcmVsPnnCtWvJGmfScnSfBqo= X-MC-Unique: namVbS7zPS2-VGEwNYqkvQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/13] net: relocate paths to helpers and scripts Date: Tue, 1 Sep 2020 02:20:14 -0400 Message-Id: <20200901062020.26660-8-pbonzini@redhat.com> In-Reply-To: <20200901062020.26660-1-pbonzini@redhat.com> References: <20200901062020.26660-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 22:05:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/net/net.h | 4 ++-- net/tap.c | 28 +++++++++++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index e7ef42d62b..897b2d7595 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -209,8 +209,8 @@ void netdev_add(QemuOpts *opts, Error **errp); int net_hub_id_for_client(NetClientState *nc, int *id); NetClientState *net_hub_port_find(int hub_id); =20 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" +#define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup" +#define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown" #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" #define DEFAULT_BRIDGE_INTERFACE "br0" =20 diff --git a/net/tap.c b/net/tap.c index 14dc904fca..a271046461 100644 --- a/net/tap.c +++ b/net/tap.c @@ -582,14 +582,20 @@ int net_init_bridge(const Netdev *netdev, const char = *name, NetClientState *peer, Error **errp) { const NetdevBridgeOptions *bridge; - const char *helper, *br; + g_autofree char *default_helper =3D NULL; + const char *helper; + const char *br; TAPState *s; int fd, vnet_hdr; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE); bridge =3D &netdev->u.bridge; =20 - helper =3D bridge->has_helper ? bridge->helper : DEFAULT_BRIDGE_HELPER; + if (!bridge->has_helper) { + helper =3D default_helper =3D get_relocated_path(DEFAULT_BRIDGE_HE= LPER); + } else { + helper =3D bridge->helper; + } br =3D bridge->has_br ? bridge->br : DEFAULT_BRIDGE_INTERF= ACE; =20 fd =3D net_bridge_run_helper(helper, br, errp); @@ -773,8 +779,8 @@ int net_init_tap(const Netdev *netdev, const char *name, const NetdevTapOptions *tap; int fd, vnet_hdr =3D 0, i =3D 0, queues; /* for the no-fd, no-helper case */ - const char *script =3D NULL; /* suppress wrong "uninit'd use" gcc warn= ing */ - const char *downscript =3D NULL; + const char *script; + const char *downscript; Error *err =3D NULL; const char *vhostfdname; char ifname[128]; @@ -784,6 +790,8 @@ int net_init_tap(const Netdev *netdev, const char *name, tap =3D &netdev->u.tap; queues =3D tap->has_queues ? tap->queues : 1; vhostfdname =3D tap->has_vhostfd ? tap->vhostfd : NULL; + script =3D tap->has_script ? tap->script : NULL; + downscript =3D tap->has_downscript ? tap->downscript : NULL; =20 /* QEMU hubs do not support multiqueue tap, in this case peer is set. * For -netdev, peer is always NULL. */ @@ -934,13 +942,19 @@ free_fail: return -1; } } else { + g_autofree char *default_script =3D NULL; + g_autofree char *default_downscript =3D NULL; if (tap->has_vhostfds) { error_setg(errp, "vhostfds=3D is invalid if fds=3D wasn't spec= ified"); return -1; } - script =3D tap->has_script ? tap->script : DEFAULT_NETWORK_SCRIPT; - downscript =3D tap->has_downscript ? tap->downscript : - DEFAULT_NETWORK_DOWN_SCRIPT; + + if (!tap->has_script) { + script =3D default_script =3D get_relocated_path(DEFAULT_NETWO= RK_SCRIPT); + } + if (!tap->has_downscript) { + downscript =3D default_downscript =3D get_relocated_path(DEFAU= LT_NETWORK_SCRIPT); + } =20 if (tap->has_ifname) { pstrcpy(ifname, sizeof ifname, tap->ifname); --=20 2.26.2