From nobody Tue Nov 26 20:12:58 2024 Delivered-To: importer@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+importer=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 1704626787320623.7617127934886; Sun, 7 Jan 2024 03:26:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMRHd-0003v1-AC; Sun, 07 Jan 2024 06:25:37 -0500 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 1rMRHY-0003ud-Q9; Sun, 07 Jan 2024 06:25:34 -0500 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 1rMRHT-0000Pd-Fp; Sun, 07 Jan 2024 06:25:31 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D5D3341147; Sun, 7 Jan 2024 14:25:08 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 3B21F5C24E; Sun, 7 Jan 2024 14:25:01 +0300 (MSK) Received: (nullmailer pid 335608 invoked by uid 1000); Sun, 07 Jan 2024 11:25:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org, Zhang Chen , Li Zhijian Subject: [PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript= Date: Sun, 7 Jan 2024 14:24:59 +0300 Message-Id: <20240107112459.335594-1-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 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+importer=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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1704626794700100002 Content-Type: text/plain; charset="utf-8" There's no need to repeat script=3D/etc/qemu-ifup in examples, as it is already in there. More, all examples uses incorrect "down script=3D" (which should be "downscript=3D"). Reviewed-by: Zhang Chen --- I'm not sure we need so many identical examples, and why it uses vnet=3Doff, - it looks like vnet=3D should also be dropped. docs/colo-proxy.txt | 6 +++--- qemu-options.hx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 1fc38aed1b..e712c883db 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -162,7 +162,7 @@ Here is an example using demonstration IP and port addr= esses to more clearly describe the usage. =20 Primary(ip:3.3.3.3): --netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/etc= /qemu-ifdown +-netdev tap,id=3Dhn0,vhost=3Doff -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server=3Don,wait= =3Doff -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server=3Don,wait= =3Doff @@ -177,7 +177,7 @@ Primary(ip:3.3.3.3): -object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,secondary_in=3Dcom= pare1,outdev=3Dcompare_out0,iothread=3Diothread1 =20 Secondary(ip:3.3.3.8): --netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down script=3D/et= c/qemu-ifdown +-netdev tap,id=3Dhn0,vhost=3Doff -device e1000,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dred0,host=3D3.3.3.3,port=3D9003 -chardev socket,id=3Dred1,host=3D3.3.3.3,port=3D9004 @@ -202,7 +202,7 @@ Primary(ip:3.3.3.3): -object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,secondary_in=3Dcom= pare1,outdev=3Dcompare_out0,vnet_hdr_support =20 Secondary(ip:3.3.3.8): --netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down script=3D/et= c/qemu-ifdown +-netdev tap,id=3Dhn0,vhost=3Doff -device e1000,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dred0,host=3D3.3.3.3,port=3D9003 -chardev socket,id=3Dred1,host=3D3.3.3.3,port=3D9004 diff --git a/qemu-options.hx b/qemu-options.hx index b66570ae00..d667bfa0c2 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -5500,7 +5500,7 @@ SRST KVM COLO =20 primary: - -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downs= cript=3D/etc/qemu-ifdown + -netdev tap,id=3Dhn0,vhost=3Doff -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server= =3Don,wait=3Doff -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,serve= r=3Don,wait=3Doff @@ -5515,7 +5515,7 @@ SRST -object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,second= ary_in=3Dcompare1,outdev=3Dcompare_out0,iothread=3Diothread1 =20 secondary: - -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down = script=3D/etc/qemu-ifdown + -netdev tap,id=3Dhn0,vhost=3Doff -device e1000,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dred0,host=3D3.3.3.3,port=3D9003 -chardev socket,id=3Dred1,host=3D3.3.3.3,port=3D9004 @@ -5526,7 +5526,7 @@ SRST Xen COLO =20 primary: - -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downs= cript=3D/etc/qemu-ifdown + -netdev tap,id=3Dhn0,vhost=3Doff -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server= =3Don,wait=3Doff -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,serve= r=3Don,wait=3Doff @@ -5542,7 +5542,7 @@ SRST -object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,second= ary_in=3Dcompare1,outdev=3Dcompare_out0,notify_dev=3Dnofity_way,iothread=3D= iothread1 =20 secondary: - -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down = script=3D/etc/qemu-ifdown + -netdev tap,id=3Dhn0,vhost=3Doff -device e1000,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dred0,host=3D3.3.3.3,port=3D9003 -chardev socket,id=3Dred1,host=3D3.3.3.3,port=3D9004 --=20 2.39.2