[PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript=

Michael Tokarev posted 1 patch 10 months, 3 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240107112459.335594-1-mjt@tls.msk.ru
Maintainers: Zhang Chen <chen.zhang@intel.com>, Li Zhijian <lizhijian@fujitsu.com>, Michael Tokarev <mjt@tls.msk.ru>, Laurent Vivier <laurent@vivier.eu>
docs/colo-proxy.txt | 6 +++---
qemu-options.hx     | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
[PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript=
Posted by Michael Tokarev 10 months, 3 weeks ago
There's no need to repeat script=/etc/qemu-ifup in examples,
as it is already in there.  More, all examples uses incorrect
"down script=" (which should be "downscript=").
---
I'm not sure we need so many identical examples, and why it
uses vnet=off, - it looks like vnet= 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 addresses to more
 clearly describe the usage.
 
 Primary(ip:3.3.3.3):
--netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
+-netdev tap,id=hn0,vhost=off
 -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
 -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off
 -chardev socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off
@@ -177,7 +177,7 @@ Primary(ip:3.3.3.3):
 -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1
 
 Secondary(ip:3.3.3.8):
--netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown
+-netdev tap,id=hn0,vhost=off
 -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
 -chardev socket,id=red0,host=3.3.3.3,port=9003
 -chardev socket,id=red1,host=3.3.3.3,port=9004
@@ -202,7 +202,7 @@ Primary(ip:3.3.3.3):
 -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support
 
 Secondary(ip:3.3.3.8):
--netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown
+-netdev tap,id=hn0,vhost=off
 -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
 -chardev socket,id=red0,host=3.3.3.3,port=9003
 -chardev socket,id=red1,host=3.3.3.3,port=9004
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
 
             primary:
-            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
+            -netdev tap,id=hn0,vhost=off
             -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
             -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off
             -chardev socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off
@@ -5515,7 +5515,7 @@ SRST
             -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1
 
             secondary:
-            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown
+            -netdev tap,id=hn0,vhost=off
             -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
             -chardev socket,id=red0,host=3.3.3.3,port=9003
             -chardev socket,id=red1,host=3.3.3.3,port=9004
@@ -5526,7 +5526,7 @@ SRST
             Xen COLO
 
             primary:
-            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
+            -netdev tap,id=hn0,vhost=off
             -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
             -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off
             -chardev socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off
@@ -5542,7 +5542,7 @@ SRST
             -object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,notify_dev=nofity_way,iothread=iothread1
 
             secondary:
-            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown
+            -netdev tap,id=hn0,vhost=off
             -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
             -chardev socket,id=red0,host=3.3.3.3,port=9003
             -chardev socket,id=red1,host=3.3.3.3,port=9004
-- 
2.39.2
RE: [PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript=
Posted by Zhang, Chen 10 months, 3 weeks ago

> -----Original Message-----
> From: Michael Tokarev <mjt@tls.msk.ru>
> Sent: Sunday, January 7, 2024 7:25 PM
> To: qemu-devel@nongnu.org
> Cc: Michael Tokarev <mjt@tls.msk.ru>; qemu-trivial@nongnu.org; Zhang,
> Chen <chen.zhang@intel.com>; Li Zhijian <lizhijian@fujitsu.com>
> Subject: [PATCH trivial] colo: examples: remove mentions of script= and
> (wrong) downscript=
> 
> There's no need to repeat script=/etc/qemu-ifup in examples, as it is already
> in there.  More, all examples uses incorrect "down script=" (which should be
> "downscript=").

Yes, good catch.
Reviewed-by: Zhang Chen <chen.zhang@intel.com>

> ---
> I'm not sure we need so many identical examples, and why it uses vnet=off, -
> it looks like vnet= should also be dropped.

Do you means the "vnet_hdr_support" in docs?
If yes, we can't drop it. Because the filters use this tag to communicate with an independent vnet_header.
And when a filter with vnet_hdr_support tag(like filter-mirror) connect to another filter without tag(like filter-redirector),
They cannot correctly parse the data sent to each other.

Thanks
Chen

> 
>  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
> addresses to more  clearly describe the usage.
> 
>  Primary(ip:3.3.3.3):
> --netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-
> ifdown
> +-netdev tap,id=hn0,vhost=off
>  -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
>  -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off
>  -chardev socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off
> @@ -177,7 +177,7 @@ Primary(ip:3.3.3.3):
>  -object colo-compare,id=comp0,primary_in=compare0-
> 0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1
> 
>  Secondary(ip:3.3.3.8):
> --netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-
> ifdown
> +-netdev tap,id=hn0,vhost=off
>  -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
>  -chardev socket,id=red0,host=3.3.3.3,port=9003
>  -chardev socket,id=red1,host=3.3.3.3,port=9004
> @@ -202,7 +202,7 @@ Primary(ip:3.3.3.3):
>  -object colo-compare,id=comp0,primary_in=compare0-
> 0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support
> 
>  Secondary(ip:3.3.3.8):
> --netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-
> ifdown
> +-netdev tap,id=hn0,vhost=off
>  -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
>  -chardev socket,id=red0,host=3.3.3.3,port=9003
>  -chardev socket,id=red1,host=3.3.3.3,port=9004
> 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
> 
>              primary:
> -            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-
> ifup,downscript=/etc/qemu-ifdown
> +            -netdev tap,id=hn0,vhost=off
>              -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
>              -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off
>              -chardev
> socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off
> @@ -5515,7 +5515,7 @@ SRST
>              -object colo-compare,id=comp0,primary_in=compare0-
> 0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1
> 
>              secondary:
> -            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down
> script=/etc/qemu-ifdown
> +            -netdev tap,id=hn0,vhost=off
>              -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
>              -chardev socket,id=red0,host=3.3.3.3,port=9003
>              -chardev socket,id=red1,host=3.3.3.3,port=9004
> @@ -5526,7 +5526,7 @@ SRST
>              Xen COLO
> 
>              primary:
> -            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-
> ifup,downscript=/etc/qemu-ifdown
> +            -netdev tap,id=hn0,vhost=off
>              -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
>              -chardev socket,id=mirror0,host=3.3.3.3,port=9003,server=on,wait=off
>              -chardev
> socket,id=compare1,host=3.3.3.3,port=9004,server=on,wait=off
> @@ -5542,7 +5542,7 @@ SRST
>              -object colo-compare,id=comp0,primary_in=compare0-
> 0,secondary_in=compare1,outdev=compare_out0,notify_dev=nofity_way,ioth
> read=iothread1
> 
>              secondary:
> -            -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down
> script=/etc/qemu-ifdown
> +            -netdev tap,id=hn0,vhost=off
>              -device e1000,netdev=hn0,mac=52:a4:00:12:78:66
>              -chardev socket,id=red0,host=3.3.3.3,port=9003
>              -chardev socket,id=red1,host=3.3.3.3,port=9004
> --
> 2.39.2
Re: [PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript=
Posted by Michael Tokarev 10 months, 3 weeks ago
09.01.2024 05:08, Zhang, Chen :
> 
> 
>> -----Original Message-----
>> From: Michael Tokarev <mjt@tls.msk.ru>
>> Sent: Sunday, January 7, 2024 7:25 PM
>> To: qemu-devel@nongnu.org
>> Cc: Michael Tokarev <mjt@tls.msk.ru>; qemu-trivial@nongnu.org; Zhang,
>> Chen <chen.zhang@intel.com>; Li Zhijian <lizhijian@fujitsu.com>
>> Subject: [PATCH trivial] colo: examples: remove mentions of script= and
>> (wrong) downscript=
>>
>> There's no need to repeat script=/etc/qemu-ifup in examples, as it is already
>> in there.  More, all examples uses incorrect "down script=" (which should be
>> "downscript=").
> 
> Yes, good catch.
> Reviewed-by: Zhang Chen <chen.zhang@intel.com>
> 
>> ---
>> I'm not sure we need so many identical examples, and why it uses vnet=off, -
>> it looks like vnet= should also be dropped.
> 
> Do you means the "vnet_hdr_support" in docs?

Nope, it was a thinko on my part, I mean vhost=off parameter - which is right next to script=.
Why vhost is explicitly disabled here, while it isn't even enabled by default?

And do we really need that many examples like this, maybe it's a good idea to
remove half of them and refer to the other place instead?

/mjt
RE: [PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript=
Posted by Zhang, Chen 10 months, 3 weeks ago

> -----Original Message-----
> From: Michael Tokarev <mjt@tls.msk.ru>
> Sent: Tuesday, January 9, 2024 1:44 PM
> To: Zhang, Chen <chen.zhang@intel.com>; qemu-devel@nongnu.org
> Cc: qemu-trivial@nongnu.org; Li Zhijian <lizhijian@fujitsu.com>
> Subject: Re: [PATCH trivial] colo: examples: remove mentions of script= and
> (wrong) downscript=
> 
> 09.01.2024 05:08, Zhang, Chen :
> >
> >
> >> -----Original Message-----
> >> From: Michael Tokarev <mjt@tls.msk.ru>
> >> Sent: Sunday, January 7, 2024 7:25 PM
> >> To: qemu-devel@nongnu.org
> >> Cc: Michael Tokarev <mjt@tls.msk.ru>; qemu-trivial@nongnu.org; Zhang,
> >> Chen <chen.zhang@intel.com>; Li Zhijian <lizhijian@fujitsu.com>
> >> Subject: [PATCH trivial] colo: examples: remove mentions of script=
> >> and
> >> (wrong) downscript=
> >>
> >> There's no need to repeat script=/etc/qemu-ifup in examples, as it is
> >> already in there.  More, all examples uses incorrect "down script="
> >> (which should be "downscript=").
> >
> > Yes, good catch.
> > Reviewed-by: Zhang Chen <chen.zhang@intel.com>
> >
> >> ---
> >> I'm not sure we need so many identical examples, and why it uses
> >> vnet=off, - it looks like vnet= should also be dropped.
> >
> > Do you means the "vnet_hdr_support" in docs?
> 
> Nope, it was a thinko on my part, I mean vhost=off parameter - which is right
> next to script=.
> Why vhost is explicitly disabled here, while it isn't even enabled by default?
> 

Because Qemu net filter can't support vhost.
Vhost puts virtio emulation code into the kernel, taking QEMU userspace out of the picture.
So, the filter can't works to get network data.

> And do we really need that many examples like this, maybe it's a good idea to
> remove half of them and refer to the other place instead?

Yes, nice to see optimized documentation.

Thanks
Chen

> 
> /mjt