diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-05-08 12:34:18 +0200 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2009-06-09 11:38:49 +0100 |
| commit | b8e8af38ee4a4d516e75c64d1c3fbcf9a81d00e4 (patch) | |
| tree | 4031a1a28dc11f07fbf011f1d7531a462ed81334 /slirp | |
| parent | 10ae5a7a98f7c1d901fbb6658324e9c4c4fec8cf (diff) | |
| download | qemu-b8e8af38ee4a4d516e75c64d1c3fbcf9a81d00e4.zip qemu-b8e8af38ee4a4d516e75c64d1c3fbcf9a81d00e4.tar.gz qemu-b8e8af38ee4a4d516e75c64d1c3fbcf9a81d00e4.tar.bz2 | |
slirp: Reorder initialization
This patch reorders the initialization of slirp itself as well as its
associated features smb and redirection. So far the first reference to
slirp triggered the initialization, independent of the actual -net user
option which may carry additional parameters. Now we save any request to
add a smb export or some redirections until the actual initialization of
the stack. This also allows to move a few parameters that were passed
via global variable into the argument list of net_slirp_init.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/libslirp.h | 2 | ||||
| -rw-r--r-- | slirp/slirp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/slirp/libslirp.h b/slirp/libslirp.h index b2313b4..d0df24b 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -5,7 +5,7 @@ extern "C" { #endif -void slirp_init(int restricted, char *special_ip); +void slirp_init(int restricted, const char *special_ip); void slirp_select_fill(int *pnfds, fd_set *readfds, fd_set *writefds, fd_set *xfds); diff --git a/slirp/slirp.c b/slirp/slirp.c index 9cab731..30d4ee2 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -171,7 +171,7 @@ static void slirp_cleanup(void) static void slirp_state_save(QEMUFile *f, void *opaque); static int slirp_state_load(QEMUFile *f, void *opaque, int version_id); -void slirp_init(int restricted, char *special_ip) +void slirp_init(int restricted, const char *special_ip) { // debug_init("/tmp/slirp.log", DEBUG_DEFAULT); |