diff options
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | qemu-doc.texi | 12 |
2 files changed, 9 insertions, 8 deletions
@@ -71,7 +71,7 @@ bigendian="no" mingw32="no" EXESUF="" gdbstub="yes" -slirp="no" +slirp="yes" # OS specific targetos=`uname -s` @@ -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 @@ -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 diff --git a/qemu-doc.texi b/qemu-doc.texi index 94c1ccf190..dfa3639277 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -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 @@ -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 |