* [Qemu-devel] [PATCH] slirp: fix !CONFIG_SLIRP compilation
@ 2009-10-07 21:44 Juan Quintela
2009-10-08 7:12 ` [Qemu-devel] " Mark McLoughlin
0 siblings, 1 reply; 2+ messages in thread
From: Juan Quintela @ 2009-10-07 21:44 UTC (permalink / raw)
To: qemu-devel; +Cc: markmc
This moves the code that depens on slirp under CONFIG_SLIRP again.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
net.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/net.c b/net.c
index 2e4dd58..e93017d 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;
}
--
1.6.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Qemu-devel] Re: [PATCH] slirp: fix !CONFIG_SLIRP compilation
2009-10-07 21:44 [Qemu-devel] [PATCH] slirp: fix !CONFIG_SLIRP compilation Juan Quintela
@ 2009-10-08 7:12 ` Mark McLoughlin
0 siblings, 0 replies; 2+ messages in thread
From: Mark McLoughlin @ 2009-10-08 7:12 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel
On Wed, 2009-10-07 at 23:44 +0200, Juan Quintela wrote:
> This moves the code that depens on slirp under CONFIG_SLIRP again.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Gah. Looks good, thanks
Acked-by: Mark McLoughlin <markmc@redhat.com>
Cheers,
Mark.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-08 7:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-07 21:44 [Qemu-devel] [PATCH] slirp: fix !CONFIG_SLIRP compilation Juan Quintela
2009-10-08 7:12 ` [Qemu-devel] " Mark McLoughlin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).