Skip to content

Commit

Permalink
slirp is enabled by default
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@884 c046a42c-6fe2-441c-8c8c-71466251a162
  • Loading branch information
bellard committed Jun 4, 2004
1 parent a3a91a3 commit 443f137
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ bigendian="no"
mingw32="no"
EXESUF=""
gdbstub="yes"
slirp="no"
slirp="yes"

# OS specific
targetos=`uname -s`
Expand Down Expand Up @@ -139,7 +139,7 @@ for opt do
;;
--enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
;;
--enable-slirp) slirp="yes"
--disable-slirp) slirp="no"
;;
esac
done
Expand All @@ -157,6 +157,7 @@ if test "$mingw32" = "yes" ; then
target_list="i386-softmmu ppc-softmmu"
EXESUF=".exe"
gdbstub="no"
slirp="no"
fi

if test -z "$cross_prefix" ; then
Expand Down
12 changes: 6 additions & 6 deletions qemu-doc.texi
Original file line number Diff line number Diff line change
Expand Up @@ -597,12 +597,10 @@ Linux distribution.

@subsection Using the user mode network stack

This is @emph{experimental} (version 0.5.4). You must configure qemu
with @code{--enable-slirp}. Then by using the option
@option{-user-net} or if you have no tun/tap init script, QEMU uses a
completely user mode network stack (you don't need root priviledge to
use the virtual network). The virtual network configuration is the
following:
By using the option @option{-user-net} or if you have no tun/tap init
script, QEMU uses a completely user mode network stack (you don't need
root priviledge to use the virtual network). The virtual network
configuration is the following:

@example
Expand All @@ -625,6 +623,8 @@ Note that @code{ping} is not supported reliably to the internet as it
would require root priviledges. It means you can only ping the local
router (10.0.2.2).

The user mode network is currently only supported on a Unix host.

@node direct_linux_boot
@section Direct Linux Boot

Expand Down

0 comments on commit 443f137

Please sign in to comment.