提交 443f1376 编写于 作者: B bellard

slirp is enabled by default


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@884 c046a42c-6fe2-441c-8c8c-71466251a162
上级 a3a91a35
...@@ -71,7 +71,7 @@ bigendian="no" ...@@ -71,7 +71,7 @@ bigendian="no"
mingw32="no" mingw32="no"
EXESUF="" EXESUF=""
gdbstub="yes" gdbstub="yes"
slirp="no" slirp="yes"
# OS specific # OS specific
targetos=`uname -s` targetos=`uname -s`
...@@ -139,7 +139,7 @@ for opt do ...@@ -139,7 +139,7 @@ for opt do
;; ;;
--enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
;; ;;
--enable-slirp) slirp="yes" --disable-slirp) slirp="no"
;; ;;
esac esac
done done
...@@ -157,6 +157,7 @@ if test "$mingw32" = "yes" ; then ...@@ -157,6 +157,7 @@ if test "$mingw32" = "yes" ; then
target_list="i386-softmmu ppc-softmmu" target_list="i386-softmmu ppc-softmmu"
EXESUF=".exe" EXESUF=".exe"
gdbstub="no" gdbstub="no"
slirp="no"
fi fi
if test -z "$cross_prefix" ; then if test -z "$cross_prefix" ; then
......
...@@ -597,12 +597,10 @@ Linux distribution. ...@@ -597,12 +597,10 @@ Linux distribution.
@subsection Using the user mode network stack @subsection Using the user mode network stack
This is @emph{experimental} (version 0.5.4). You must configure qemu By using the option @option{-user-net} or if you have no tun/tap init
with @code{--enable-slirp}. Then by using the option script, QEMU uses a completely user mode network stack (you don't need
@option{-user-net} or if you have no tun/tap init script, QEMU uses a root priviledge to use the virtual network). The virtual network
completely user mode network stack (you don't need root priviledge to configuration is the following:
use the virtual network). The virtual network configuration is the
following:
@example @example
...@@ -625,6 +623,8 @@ Note that @code{ping} is not supported reliably to the internet as it ...@@ -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 would require root priviledges. It means you can only ping the local
router (10.0.2.2). router (10.0.2.2).
The user mode network is currently only supported on a Unix host.
@node direct_linux_boot @node direct_linux_boot
@section Direct Linux Boot @section Direct Linux Boot
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册