From patchwork Tue May 4 11:20:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 51591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 62E0CB7D27 for ; Tue, 4 May 2010 21:26:44 +1000 (EST) Received: from localhost ([127.0.0.1]:34969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9GFm-0000AK-Sg for incoming@patchwork.ozlabs.org; Tue, 04 May 2010 07:25:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9GBF-0005pk-Pg for qemu-devel@nongnu.org; Tue, 04 May 2010 07:20:50 -0400 Received: from [140.186.70.92] (port=49212 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9GB8-0005iX-PM for qemu-devel@nongnu.org; Tue, 04 May 2010 07:20:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9GB3-0003Mx-Ra for qemu-devel@nongnu.org; Tue, 04 May 2010 07:20:42 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:39836) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9GB3-0003LO-J9 for qemu-devel@nongnu.org; Tue, 04 May 2010 07:20:37 -0400 Received: from blackfin.pond.sub.org (pD9E39049.dip.t-dialin.net [217.227.144.73]) by oxygen.pond.sub.org (Postfix) with ESMTPA id F2E0A276DAE for ; Tue, 4 May 2010 13:20:34 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id E7EE2DD; Tue, 4 May 2010 13:20:33 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 4 May 2010 13:20:30 +0200 Message-Id: <1272972033-31475-2-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1272972033-31475-1-git-send-email-armbru@redhat.com> References: <1272972033-31475-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH 1/4] doc: Fix host forwarding monitor command documentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit f3546deb replaced host_net_redir by hostfwd_add, hostfwd_remove, but neglected to update documentation. Signed-off-by: Markus Armbruster --- qemu-monitor.hx | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 5ea5748..21aeb6b 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -953,7 +953,14 @@ ETEXI .help = "redirect TCP or UDP connections from host to guest (requires -net user)", .mhandler.cmd = net_slirp_hostfwd_add, }, +#endif +STEXI +@item hostfwd_add +@findex hostfwd_add +Redirect TCP or UDP connections from host to guest (requires -net user). +ETEXI +#ifdef CONFIG_SLIRP { .name = "hostfwd_remove", .args_type = "arg1:s,arg2:s?,arg3:s?", @@ -964,9 +971,9 @@ ETEXI #endif STEXI -@item host_net_redir -@findex host_net_redir -Redirect TCP or UDP connections from host to guest (requires -net user). +@item hostfwd_remove +@findex hostfwd_remove +Remove host-to-guest TCP or UDP redirection. ETEXI {