Patchwork doc: fix slirp description

login
register
mail settings
Submitter Brad Hards
Date April 24, 2011, 7:19 a.m.
Message ID <1303629596-5561-1-git-send-email-bradh@frogmouth.net>
Download mbox | patch
Permalink /patch/92638/
State New
Headers show

Comments

Brad Hards - April 24, 2011, 7:19 a.m.
net/slirp.c says:
    /* default settings according to historic slirp */
    struct in_addr net  = { .s_addr = htonl(0x0a000200) }; /* 10.0.2.0 */
    struct in_addr mask = { .s_addr = htonl(0xffffff00) }; /* 255.255.255.0 */
    struct in_addr host = { .s_addr = htonl(0x0a000202) }; /* 10.0.2.2 */
    struct in_addr dhcp = { .s_addr = htonl(0x0a00020f) }; /* 10.0.2.15 */
    struct in_addr dns  = { .s_addr = htonl(0x0a000203) }; /* 10.0.2.3 */

Which I think is not what the documentation says.

Signed-off-by: Brad Hards <bradh@frogmouth.net>
---
 qemu-options.hx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Stefan Hajnoczi - April 24, 2011, 10:35 a.m.
On Sun, Apr 24, 2011 at 8:19 AM, Brad Hards <bradh@frogmouth.net> wrote:
> net/slirp.c says:
>    /* default settings according to historic slirp */
>    struct in_addr net  = { .s_addr = htonl(0x0a000200) }; /* 10.0.2.0 */
>    struct in_addr mask = { .s_addr = htonl(0xffffff00) }; /* 255.255.255.0 */
>    struct in_addr host = { .s_addr = htonl(0x0a000202) }; /* 10.0.2.2 */
>    struct in_addr dhcp = { .s_addr = htonl(0x0a00020f) }; /* 10.0.2.15 */
>    struct in_addr dns  = { .s_addr = htonl(0x0a000203) }; /* 10.0.2.3 */
>
> Which I think is not what the documentation says.
>
> Signed-off-by: Brad Hards <bradh@frogmouth.net>
> ---
>  qemu-options.hx |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Aurelien Jarno - April 25, 2011, 9:02 p.m.
On Sun, Apr 24, 2011 at 05:19:56PM +1000, Brad Hards wrote:
> net/slirp.c says:
>     /* default settings according to historic slirp */
>     struct in_addr net  = { .s_addr = htonl(0x0a000200) }; /* 10.0.2.0 */
>     struct in_addr mask = { .s_addr = htonl(0xffffff00) }; /* 255.255.255.0 */
>     struct in_addr host = { .s_addr = htonl(0x0a000202) }; /* 10.0.2.2 */
>     struct in_addr dhcp = { .s_addr = htonl(0x0a00020f) }; /* 10.0.2.15 */
>     struct in_addr dns  = { .s_addr = htonl(0x0a000203) }; /* 10.0.2.3 */
> 
> Which I think is not what the documentation says.
> 
> Signed-off-by: Brad Hards <bradh@frogmouth.net>
> ---
>  qemu-options.hx |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Thanks, applied.

> diff --git a/qemu-options.hx b/qemu-options.hx
> index 677c550..489df10 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -1152,7 +1152,7 @@ Assign symbolic name for use in monitor commands.
>  @item net=@var{addr}[/@var{mask}]
>  Set IP network address the guest will see. Optionally specify the netmask,
>  either in the form a.b.c.d or as number of valid top-most bits. Default is
> -10.0.2.0/8.
> +10.0.2.0/24.
>  
>  @item host=@var{addr}
>  Specify the guest-visible address of the host. Default is the 2nd IP in the
> @@ -1168,7 +1168,7 @@ Specifies the client hostname reported by the builtin DHCP server.
>  
>  @item dhcpstart=@var{addr}
>  Specify the first of the 16 IPs the built-in DHCP server can assign. Default
> -is the 16th to 31st IP in the guest network, i.e. x.x.x.16 to x.x.x.31.
> +is the 15th to 31st IP in the guest network, i.e. x.x.x.15 to x.x.x.31.
>  
>  @item dns=@var{addr}
>  Specify the guest-visible address of the virtual nameserver. The address must
> -- 
> 1.7.1
> 
> 
>

Patch

diff --git a/qemu-options.hx b/qemu-options.hx
index 677c550..489df10 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1152,7 +1152,7 @@  Assign symbolic name for use in monitor commands.
 @item net=@var{addr}[/@var{mask}]
 Set IP network address the guest will see. Optionally specify the netmask,
 either in the form a.b.c.d or as number of valid top-most bits. Default is
-10.0.2.0/8.
+10.0.2.0/24.
 
 @item host=@var{addr}
 Specify the guest-visible address of the host. Default is the 2nd IP in the
@@ -1168,7 +1168,7 @@  Specifies the client hostname reported by the builtin DHCP server.
 
 @item dhcpstart=@var{addr}
 Specify the first of the 16 IPs the built-in DHCP server can assign. Default
-is the 16th to 31st IP in the guest network, i.e. x.x.x.16 to x.x.x.31.
+is the 15th to 31st IP in the guest network, i.e. x.x.x.15 to x.x.x.31.
 
 @item dns=@var{addr}
 Specify the guest-visible address of the virtual nameserver. The address must