提交 a3a766e7 编写于 作者: J Juan Quintela 提交者: Anthony Liguori

slirp: fix !CONFIG_SLIRP compilation

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

Patchworks-ID: 35372
Signed-off-by: NJuan Quintela <quintela@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 d1570baa
...@@ -2451,6 +2451,7 @@ static int net_init_nic(QemuOpts *opts, Monitor *mon) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册