diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-28 11:05:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-28 11:05:14 +0100 |
| commit | f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef (patch) | |
| tree | a9a0eee5c92d7eb38c7720c07f173e06429680a7 | |
| parent | c60a57ff497667780132a3fcdc1500c83af5d5c0 (diff) | |
| parent | 2f47b403bd494b6717ef14c0d278d4b2d364b382 (diff) | |
| download | qemu-f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef.zip qemu-f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef.tar.gz qemu-f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-07-26' into staging
trivial patches for 2014-07-26
# gpg: Signature made Sat 26 Jul 2014 08:16:55 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB
* remotes/mjt/tags/trivial-patches-2014-07-26:
qemu-options: fix another allows-to for -net l2tpv3
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qemu-options.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 9e54686..1549625 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1437,7 +1437,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "-net l2tpv3[,vlan=n][,name=str],src=srcaddr,dst=dstaddr[,srcport=srcport][,dstport=dstport],txsession=txsession[,rxsession=rxsession][,ipv6=on/off][,udp=on/off][,cookie64=on/off][,counter][,pincounter][,txcookie=txcookie][,rxcookie=rxcookie][,offset=offset]\n" " connect the VLAN to an Ethernet over L2TPv3 pseudowire\n" " Linux kernel 3.3+ as well as most routers can talk\n" - " L2TPv3. This transport allows to connect a VM to a VM,\n" + " L2TPv3. This transport allows connecting a VM to a VM,\n" " VM to a router and even VM to Host. It is a nearly-universal\n" " standard (RFC3391). Note - this implementation uses static\n" " pre-configured tunnels (same as the Linux kernel).\n" |