From nobody Sat May 10 10:01:59 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721214762613202.73570481437991; Wed, 17 Jul 2024 04:12:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sU2W7-0005X6-So; Wed, 17 Jul 2024 07:08:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sU2Uy-0000rf-Q5; Wed, 17 Jul 2024 07:07:04 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sU2Ut-0007TA-5d; Wed, 17 Jul 2024 07:07:04 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 434757B379; Wed, 17 Jul 2024 14:06:36 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id AAD1C10B28E; Wed, 17 Jul 2024 14:06:40 +0300 (MSK) Received: (nullmailer pid 844403 invoked by uid 1000); Wed, 17 Jul 2024 11:06:40 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Zhao Liu , qemu-trivial@nongnu.org, Jason Wang , Michael Tokarev Subject: [PULL 07/16] doc/net/l2tpv3: Update boolean fields' description to avoid short-form use Date: Wed, 17 Jul 2024 14:06:31 +0300 Message-Id: <20240717110640.844335-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717110640.844335-1-mjt@tls.msk.ru> References: <20240717110640.844335-1-mjt@tls.msk.ru> MIME-Version: 1.0 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZM-MESSAGEID: 1721214763851116300 Content-Type: text/plain; charset="utf-8" From: Zhao Liu The short-form boolean options has been deprecated since v6.0 (refer to docs/about/deprecated.rst). Update the description and example of boolean fields in l2tpv3 option to avoid deprecation warning. Cc: Jason Wang Signed-off-by: Zhao Liu Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- qemu-options.hx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index ad6521ef5e..edeaefe2c7 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3353,7 +3353,7 @@ SRST -device e1000,netdev=3Dn1,mac=3D52:54:00:12:34:56= \\ -netdev socket,id=3Dn1,mcast=3D239.192.168.1:1102= ,localaddr=3D1.2.3.4 =20 -``-netdev l2tpv3,id=3Did,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcport][,= dstport=3Ddstport],txsession=3Dtxsession[,rxsession=3Drxsession][,ipv6=3Don= |off][,udp=3Don|off][,cookie64][,counter][,pincounter][,txcookie=3Dtxcookie= ][,rxcookie=3Drxcookie][,offset=3Doffset]`` +``-netdev l2tpv3,id=3Did,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcport][,= dstport=3Ddstport],txsession=3Dtxsession[,rxsession=3Drxsession][,ipv6=3Don= |off][,udp=3Don|off][,cookie64=3Don|off][,counter=3Don|off][,pincounter=3Do= n|off][,txcookie=3Dtxcookie][,rxcookie=3Drxcookie][,offset=3Doffset]`` Configure a L2TPv3 pseudowire host network backend. L2TPv3 (RFC3931) is a popular protocol to transport Ethernet (and other Layer 2) data frames between two systems. It is present in routers, firewalls and @@ -3368,7 +3368,7 @@ SRST ``dst=3Ddstaddr`` destination address (mandatory) =20 - ``udp`` + ``udp=3Don`` select udp encapsulation (default is ip). =20 ``srcport=3Dsrcport`` @@ -3377,7 +3377,7 @@ SRST ``dstport=3Ddstport`` destination udp port. =20 - ``ipv6`` + ``ipv6=3Don`` force v6, otherwise defaults to v4. =20 ``rxcookie=3Drxcookie``; \ ``txcookie=3Dtxcookie`` @@ -3385,7 +3385,7 @@ SRST Their function is mostly to prevent misconfiguration. By default they are 32 bit. =20 - ``cookie64`` + ``cookie64=3Don`` Set cookie size to 64 bit instead of the default 32 =20 ``counter=3Doff`` @@ -3419,7 +3419,7 @@ SRST # launch QEMU instance - if your network has reorder or is very lo= ssy add ,pincounter =20 |qemu_system| linux.img -device e1000,netdev=3Dn1 \\ - -netdev l2tpv3,id=3Dn1,src=3D4.2.3.1,dst=3D1.2.3.4,udp,srcport= =3D16384,dstport=3D16384,rxsession=3D0xffffffff,txsession=3D0xffffffff,coun= ter + -netdev l2tpv3,id=3Dn1,src=3D4.2.3.1,dst=3D1.2.3.4,udp=3Don,sr= cport=3D16384,dstport=3D16384,rxsession=3D0xffffffff,txsession=3D0xffffffff= ,counter=3Don =20 ``-netdev vde,id=3Did[,sock=3Dsocketpath][,port=3Dn][,group=3Dgroupname][,= mode=3Doctalmode]`` Configure VDE backend to connect to PORT n of a vde switch running --=20 2.39.2