mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trivial patches for 2014-07-26 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJT01XnAAoJEL7lnXSkw9fbEW0H/1bxDeovwkXkyZhwd/LJTohD
 KUR1vv7e+dz2evmuPh0VuF9/VVmVKNJsKkOsSgFKQKDUyV2MsIZDrR/C14kj+cua
 vQAziFfkQVnGogUFUcULUgA6qfleGaZklELhARDG/woDjlqlYKUSYDDLtMZR/KPl
 04A7dPGYhbcPDNgBDozP+r01q6QLqweZXVQB4T4EioqxgTWiLQbCqOgHdLl1SVWv
 7iwcXGHVb/1mdsKLa0HDioyDua0pUtGOsXrivY+06DlNdgobh6EbB5lPDwS0JOA/
 9qIm9LEH7QGSDm2qOD9Ud7sBd1J/gtAdf/tRFYYS9Bir6jxnCJvK8g8Vswa4ndk=
 =N5qB
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2014-07-28 11:05:14 +01:00
parent c60a57ff49 2f47b403bd
commit f45c56e016
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu-options.hx
View File

@ -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"