ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slirp: fix !CONFIG_SLIRP compilation 

This moves the code that depens on slirp under CONFIG_SLIRP again.

Patchworks-ID: 35372
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-10-07 23:44:15 +02:00 committed by Anthony Liguori
parent d1570baa57
commit a3a766e7b3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net.c
View File

@ -2451,6 +2451,7 @@ static int net_init_nic(QemuOpts *opts, Monitor *mon)
return idx; return idx;
} }
#if defined(CONFIG_SLIRP)
static int net_init_slirp_configs(const char *name, const char *value, void *opaque) static int net_init_slirp_configs(const char *name, const char *value, void *opaque)
{ {
struct slirp_config_str *config; struct slirp_config_str *config;
@ -2546,6 +2547,7 @@ static int net_init_slirp(QemuOpts *opts, Monitor *mon)
return ret; return ret;
} }
#endif /* CONFIG_SLIRP */
#ifdef _WIN32 #ifdef _WIN32
static int net_init_tap_win32(QemuOpts *opts, Monitor *mon) static int net_init_tap_win32(QemuOpts *opts, Monitor *mon)
@ -3227,6 +3229,7 @@ int net_init_clients(void)
int net_client_parse(const char *optarg) int net_client_parse(const char *optarg)
{ {
#if defined(CONFIG_SLIRP)
/* handle legacy -net channel,port:chr */ /* handle legacy -net channel,port:chr */
if (!strncmp(optarg, "channel,", strlen("channel,"))) { if (!strncmp(optarg, "channel,", strlen("channel,"))) {
int ret; int ret;
@ -3248,7 +3251,7 @@ int net_client_parse(const char *optarg)
return ret; return ret;
} }
#endif
if (!qemu_opts_parse(&qemu_net_opts, optarg, "type")) { if (!qemu_opts_parse(&qemu_net_opts, optarg, "type")) {
return -1; return -1;
} }