Patchwork [1/4] doc: Fix host forwarding monitor command documentation

login
register
mail settings
Submitter Markus Armbruster
Date May 4, 2010, 11:20 a.m.
Message ID <1272972033-31475-2-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/51591/
State New
Headers show

Comments

Markus Armbruster - May 4, 2010, 11:20 a.m.
Commit f3546deb replaced host_net_redir by hostfwd_add,
hostfwd_remove, but neglected to update documentation.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu-monitor.hx |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
Anthony Liguori - May 10, 2010, 8:19 p.m.
On 05/04/2010 06:20 AM, Markus Armbruster wrote:
> Commit f3546deb replaced host_net_redir by hostfwd_add,
> hostfwd_remove, but neglected to update documentation.
>
> Signed-off-by: Markus Armbruster<armbru@redhat.com>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori

> ---
>   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
>
>       {
>

Patch

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
 
     {