From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvyEQ-0006MG-N4 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvyEJ-0006Ho-IK for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:52 -0400 Received: from [199.232.76.173] (port=52361 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvyEJ-0006HB-9f for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53318) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvyEE-00073T-K3 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:42 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n98J0eLR020535 for ; Thu, 8 Oct 2009 15:00:40 -0400 From: Mark McLoughlin Date: Thu, 8 Oct 2009 19:58:17 +0100 Message-Id: <1255028312-28180-2-git-send-email-markmc@redhat.com> In-Reply-To: <1255028312-28180-1-git-send-email-markmc@redhat.com> References: <1255028312-28180-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 01/16] slirp: fix !CONFIG_SLIRP compilation List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin , Juan Quintela From: Juan Quintela This moves the code that depens on slirp under CONFIG_SLIRP again. Signed-off-by: Juan Quintela Signed-off-by: Mark McLoughlin --- 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