diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-20 14:56:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-20 14:56:40 +0000 |
| commit | db655a9653af05aaa90f41e55433d41e398d4b75 (patch) | |
| tree | 2b1b71c45bafc4254565033f1495adcf26c5e427 /docs | |
| parent | 4383fa7c8019193676e76de466375babc3a89c83 (diff) | |
| parent | fac7d7b1cdb21f921d7ac396365f5e920ef03096 (diff) | |
| download | qemu-db655a9653af05aaa90f41e55433d41e398d4b75.zip qemu-db655a9653af05aaa90f41e55433d41e398d4b75.tar.gz qemu-db655a9653af05aaa90f41e55433d41e398d4b75.tar.bz2 | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 20 Jan 2017 02:58:57 GMT
# gpg: using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
tap: fix memory leak on failure in net_init_tap()
hw/pci: use-after-free in pci_nic_init_nofail when nic device fails to initialize
hw/net/dp8393x: Avoid unintentional sign extensions on addresses
m68k: QOMify the MCF Fast Ethernet Controller device
net: optimize checksum computation
docs: Fix description of the sentence
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/colo-proxy.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 76767cb..c4941de 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -158,7 +158,9 @@ secondary. == Usage == -Here, we use demo ip and port discribe more clearly. +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 -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66 |