Commit 443f1376bc5f35159d09b043c0fdca3a1c4e0af1
1 parent
a3a91a35
slirp is enabled by default
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@884 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
9 additions
and
8 deletions
configure
@@ -71,7 +71,7 @@ bigendian="no" | @@ -71,7 +71,7 @@ bigendian="no" | ||
71 | mingw32="no" | 71 | mingw32="no" |
72 | EXESUF="" | 72 | EXESUF="" |
73 | gdbstub="yes" | 73 | gdbstub="yes" |
74 | -slirp="no" | 74 | +slirp="yes" |
75 | 75 | ||
76 | # OS specific | 76 | # OS specific |
77 | targetos=`uname -s` | 77 | targetos=`uname -s` |
@@ -139,7 +139,7 @@ for opt do | @@ -139,7 +139,7 @@ for opt do | ||
139 | ;; | 139 | ;; |
140 | --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" | 140 | --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" |
141 | ;; | 141 | ;; |
142 | - --enable-slirp) slirp="yes" | 142 | + --disable-slirp) slirp="no" |
143 | ;; | 143 | ;; |
144 | esac | 144 | esac |
145 | done | 145 | done |
@@ -157,6 +157,7 @@ if test "$mingw32" = "yes" ; then | @@ -157,6 +157,7 @@ if test "$mingw32" = "yes" ; then | ||
157 | target_list="i386-softmmu ppc-softmmu" | 157 | target_list="i386-softmmu ppc-softmmu" |
158 | EXESUF=".exe" | 158 | EXESUF=".exe" |
159 | gdbstub="no" | 159 | gdbstub="no" |
160 | + slirp="no" | ||
160 | fi | 161 | fi |
161 | 162 | ||
162 | if test -z "$cross_prefix" ; then | 163 | if test -z "$cross_prefix" ; then |
qemu-doc.texi
@@ -597,12 +597,10 @@ Linux distribution. | @@ -597,12 +597,10 @@ Linux distribution. | ||
597 | 597 | ||
598 | @subsection Using the user mode network stack | 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 | @example | 605 | @example |
608 | 606 | ||
@@ -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 | ||
625 | would require root priviledges. It means you can only ping the local | 623 | would require root priviledges. It means you can only ping the local |
626 | router (10.0.2.2). | 624 | router (10.0.2.2). |
627 | 625 | ||
626 | +The user mode network is currently only supported on a Unix host. | ||
627 | + | ||
628 | @node direct_linux_boot | 628 | @node direct_linux_boot |
629 | @section Direct Linux Boot | 629 | @section Direct Linux Boot |
630 | 630 |