Revision 443f1376

b/configure
71 71
mingw32="no"
72 72
EXESUF=""
73 73
gdbstub="yes"
74
slirp="no"
74
slirp="yes"
75 75

  
76 76
# OS specific
77 77
targetos=`uname -s`
......
139 139
  ;;
140 140
  --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
141 141
  ;; 
142
  --enable-slirp) slirp="yes"
142
  --disable-slirp) slirp="no"
143 143
  ;; 
144 144
  esac
145 145
done
......
157 157
    target_list="i386-softmmu ppc-softmmu"
158 158
    EXESUF=".exe"
159 159
    gdbstub="no"
160
    slirp="no"
160 161
fi
161 162

  
162 163
if test -z "$cross_prefix" ; then
b/qemu-doc.texi
597 597

  
598 598
@subsection Using the user mode network stack
599 599

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

  
607 605
@example
608 606

  
......
625 623
would require root priviledges. It means you can only ping the local
626 624
router (10.0.2.2).
627 625

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

  
628 628
@node direct_linux_boot
629 629
@section Direct Linux Boot
630 630

  

Also available in: Unified diff