[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH trivial] colo: examples: remove mentions of script= and (wrong) d
From: |
Michael Tokarev |
Subject: |
[PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript= |
Date: |
Sun, 7 Jan 2024 14:24:59 +0300 |
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
- [PATCH trivial] colo: examples: remove mentions of script= and (wrong) downscript=,
Michael Tokarev <=