From patchwork Sun Apr 24 07:19:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 92638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3F07B1007D1 for ; Sun, 24 Apr 2011 17:20:21 +1000 (EST) Received: from localhost ([::1]:43535 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QDtcA-0000xC-Od for incoming@patchwork.ozlabs.org; Sun, 24 Apr 2011 03:20:18 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QDtc2-0000ww-K1 for qemu-devel@nongnu.org; Sun, 24 Apr 2011 03:20:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QDtc1-00056y-E5 for qemu-devel@nongnu.org; Sun, 24 Apr 2011 03:20:10 -0400 Received: from ipmail05.adl6.internode.on.net ([150.101.137.143]:41519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QDtc1-00056S-0y for qemu-devel@nongnu.org; Sun, 24 Apr 2011 03:20:09 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AnMHALjOs02WZXPNgWdsb2JhbACYGI1fAQEWJiXARA6FaAQ Received: from ppp115-205.static.internode.on.net (HELO incana) ([150.101.115.205]) by ipmail05.adl6.internode.on.net with ESMTP; 24 Apr 2011 16:50:05 +0930 From: Brad Hards To: qemu-devel@nongnu.org Date: Sun, 24 Apr 2011 17:19:56 +1000 Message-Id: <1303629596-5561-1-git-send-email-bradh@frogmouth.net> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 150.101.137.143 Cc: Brad Hards Subject: [Qemu-devel] [PATCH] doc: fix slirp description 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 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 Reviewed-by: Stefan Hajnoczi --- qemu-options.hx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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