From patchwork Sat Jul 26 07:18:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 373928 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5E4EA140076 for ; Sat, 26 Jul 2014 17:19:09 +1000 (EST) Received: from localhost ([::1]:58076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAwG2-0005yd-MR for incoming@patchwork.ozlabs.org; Sat, 26 Jul 2014 03:19:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAwFX-0005GH-TG for qemu-devel@nongnu.org; Sat, 26 Jul 2014 03:18:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XAwFS-0006wk-W0 for qemu-devel@nongnu.org; Sat, 26 Jul 2014 03:18:35 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:56695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAwFS-0006v5-Ob; Sat, 26 Jul 2014 03:18:30 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7D9E545443; Sat, 26 Jul 2014 11:18:22 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 6DDF16BD; Sat, 26 Jul 2014 11:18:22 +0400 (MSK) Received: (nullmailer pid 17846 invoked by uid 1000); Sat, 26 Jul 2014 07:18:22 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sat, 26 Jul 2014 11:18:21 +0400 Message-Id: <1406359101-17791-2-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1406359101-17791-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1406359101-17791-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev Subject: [Qemu-devel] [PULL] qemu-options: fix another allows-to for -net l2tpv3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Tokarev --- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"