From nobody Fri May 2 05:05:29 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
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=fail(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1606186124; cv=none;
d=zohomail.com; s=zohoarc;
b=SyjAAw9L1/Xo8OxIvnEYBnmL0hXFDjs6RE5Ay9SclhNMpI4nQZ6VBzGtIM3z/csJbrOFBIYqI2lU85Qralpbt7U5CVhjAzMKiSHOpxES/yfaHu/p6M1aSb649KM1zt9CRXcYmECYviUljy5qKsDXLtoUNm3T6f99FDc1ZiIr+A0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1606186124;
h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To;
bh=ABx0p2qmAGxG+XfxGy7HrResy/wTlAIDE6SIuSRFQPY=;
b=d2luLLhHIpvjt9/l3GBQLADy1+5R37RTSHxhZgapUdp/By9fq35LT8Tb0cltswd/b7WBUQrd5LR7d7iNtwMPyjJoQCKZsRaW83XfKXZ+fRHln2yGB0OqXvY9+MSRXqAqTFvZ3pXu2gZs+ESMe3VC87oVTf+Cq25t+zEq6tET4Jk=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=fail;
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=fail header.from=<jasowang@redhat.com> (p=none dis=none)
header.from=<jasowang@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1606186124649224.22642031251723;
Mon, 23 Nov 2020 18:48:44 -0800 (PST)
Received: from localhost ([::1]:44724 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1khONn-0003gv-Ks
for importer@patchew.org; Mon, 23 Nov 2020 21:48:43 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:37386)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jasowang@redhat.com>)
id 1khOJx-0008NF-Fo
for qemu-devel@nongnu.org; Mon, 23 Nov 2020 21:44:45 -0500
Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41435)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <jasowang@redhat.com>)
id 1khOJv-00029V-S6
for qemu-devel@nongnu.org; Mon, 23 Nov 2020 21:44:45 -0500
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-568-791gNTF_NCugf9wUyYmy0w-1; Mon, 23 Nov 2020 21:44:38 -0500
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
[10.5.11.14])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F46B8049CF;
Tue, 24 Nov 2020 02:44:37 +0000 (UTC)
Received: from jason-ThinkPad-T430s.redhat.com (ovpn-13-43.pek2.redhat.com
[10.72.13.43])
by smtp.corp.redhat.com (Postfix) with ESMTP id 0AF285D9CC;
Tue, 24 Nov 2020 02:44:35 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1606185883;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to:
references:references; bh=ABx0p2qmAGxG+XfxGy7HrResy/wTlAIDE6SIuSRFQPY=;
b=TeJ6o1KJhsTng1YUUqbT9uqNr1/B9vQhuUwFKIWfQp6LL1BBi9IIEkik3lgfdefNyOxLSu
0w0pycLK6Tj+LmEi5INCnaMBxD8ty3yI8GCM7KcATzxuGEHjSvZVvNO09c7bdhY2va1PWb
brWKcW/z1/AAe9EZK21WfwmxXG434aE=
X-MC-Unique: 791gNTF_NCugf9wUyYmy0w-1
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org,
qemu-devel@nongnu.org
Subject: [PULL 5/5] net: Use correct default-path macro for downscript
Date: Tue, 24 Nov 2020 10:44:23 +0800
Message-Id: <1606185863-25996-6-git-send-email-jasowang@redhat.com>
In-Reply-To: <1606185863-25996-1-git-send-email-jasowang@redhat.com>
References: <1606185863-25996-1-git-send-email-jasowang@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
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=63.128.21.124; envelope-from=jasowang@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
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_H4=0.001, RCVD_IN_MSPIKE_WL=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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Jason Wang <jasowang@redhat.com>, Keqian Zhu <zhukeqian1@huawei.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
From: Keqian Zhu <zhukeqian1@huawei.com>
Fixes: 63c4db4c2e6d (net: relocate paths to helpers and scripts)
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/tap.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/tap.c b/net/tap.c
index fe95fa7..b751285 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -953,7 +953,8 @@ free_fail:
script =3D default_script =3D get_relocated_path(DEFAULT_NETWO=
RK_SCRIPT);
}
if (!downscript) {
- downscript =3D default_downscript =3D get_relocated_path(DEFAU=
LT_NETWORK_SCRIPT);
+ downscript =3D default_downscript =3D
+ get_relocated_path(DEFAULT_NETWORK_DOWN_S=
CRIPT);
}
=20
if (tap->has_ifname) {
--=20
2.7.4