aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-10-07 23:44:15 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-12 09:42:31 -0500
commita3a766e7b3878e598dee5e4d426c067d5db051d3 (patch)
tree3591fb6381f63fc555d924f10f475e825facb6d9
parentd1570baa5790d3c529a60120539193a58cd31229 (diff)
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>
-rw-r--r--net.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net.c b/net.c
index 2e4dd58e74..e93017d3e8 100644
--- a/net.c
+++ b/net.c
@@ -2451,6 +2451,7 @@ static int net_init_nic(QemuOpts *opts, Monitor *mon)
return idx;
}
+#if defined(CONFIG_SLIRP)
static int net_init_slirp_configs(const char *name, const char *value, void *opaque)
{
struct slirp_config_str *config;
@@ -2546,6 +2547,7 @@ static int net_init_slirp(QemuOpts *opts, Monitor *mon)
return ret;
}
+#endif /* CONFIG_SLIRP */
#ifdef _WIN32
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)
{
+#if defined(CONFIG_SLIRP)
/* handle legacy -net channel,port:chr */
if (!strncmp(optarg, "channel,", strlen("channel,"))) {
int ret;
@@ -3248,7 +3251,7 @@ int net_client_parse(const char *optarg)
return ret;
}
-
+#endif
if (!qemu_opts_parse(&qemu_net_opts, optarg, "type")) {
return -1;
}