diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-06-24 14:42:28 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-06-29 08:52:44 -0500 |
| commit | ad196a9d0c14f681f010bb4b979030ec125ba976 (patch) | |
| tree | 0655e9af27aee23adec993cdb971a8b8294bd27e /slirp/libslirp.h | |
| parent | 5db4af8bc8eb99333b0d2be1f88c943353361e50 (diff) | |
| download | qemu-ad196a9d0c14f681f010bb4b979030ec125ba976.zip qemu-ad196a9d0c14f681f010bb4b979030ec125ba976.tar.gz qemu-ad196a9d0c14f681f010bb4b979030ec125ba976.tar.bz2 | |
slirp: Move smb, redir, tftp and bootp parameters and -net channel
So far a couple of slirp-related parameters were expressed via
stand-alone command line options. This it inconsistent and unintuitive.
Moreover, it prevents both dynamically reconfigured (host_net_add/
delete) and multi-instance slirp.
This patch refactors the configuration by turning -smb, -redir, -tftp
and -bootp as well as -net channel into options of "-net user". The old
stand-alone command line options are still processed, but no longer
advertised. This allows smooth migration of management applications to
to the new syntax and also the extension of that syntax later in this
series.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/libslirp.h')
| -rw-r--r-- | slirp/libslirp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/slirp/libslirp.h b/slirp/libslirp.h index c04f3a2..7dee34b 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -5,7 +5,8 @@ extern "C" { #endif -void slirp_init(int restricted, const char *special_ip); +void slirp_init(int restricted, const char *special_ip, const char *tftp_path, + const char *bootfile); void slirp_select_fill(int *pnfds, fd_set *readfds, fd_set *writefds, fd_set *xfds); @@ -24,9 +25,7 @@ int slirp_redir(int is_udp, int host_port, int slirp_add_exec(int do_pty, const void *args, int addr_low_byte, int guest_port); -extern const char *tftp_prefix; extern char slirp_hostname[33]; -extern const char *bootp_filename; void slirp_stats(void); void slirp_socket_recv(int addr_low_byte, int guest_port, const uint8_t *buf, |