Patchwork slirp: fix !CONFIG_SLIRP compilation

login
register
mail settings
Submitter Juan Quintela
Date Oct. 7, 2009, 9:44 p.m.
Message ID <1254951855-21698-1-git-send-email-quintela@redhat.com>
Download mbox | patch
Permalink /patch/35372/
State Under Review
Headers show

Comments

Juan Quintela - Oct. 7, 2009, 9:44 p.m.
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(-)
Mark McLoughlin - Oct. 8, 2009, 7:12 a.m.
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.

Patch

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;
     }