From patchwork Fri May 20 15:50:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 96637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 38CA7B71A4 for ; Sat, 21 May 2011 01:51:08 +1000 (EST) Received: from localhost ([::1]:42768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNRyj-0006gu-Mj for incoming@patchwork.ozlabs.org; Fri, 20 May 2011 11:51:05 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNRxs-0005Vj-8Q for qemu-devel@nongnu.org; Fri, 20 May 2011 11:50:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNRxr-0001Ko-4B for qemu-devel@nongnu.org; Fri, 20 May 2011 11:50:12 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:49864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNRxq-0001GH-Sr for qemu-devel@nongnu.org; Fri, 20 May 2011 11:50:11 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QNRxh-0006ax-Pv; Fri, 20 May 2011 16:50:01 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 20 May 2011 16:50:00 +0100 Message-Id: <1305906601-25324-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1305906601-25324-1-git-send-email-peter.maydell@linaro.org> References: <1305906601-25324-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Markus Armbruster , patches@linaro.org Subject: [Qemu-devel] [PATCH 2/3] net: Don't warn about the default network setup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Don't warn about the default network setup that you get if no command line -net options are specified. There are two cases that we would otherwise complain about: (1) board doesn't support a NIC but the implicit "-net nic" requested one (2) CONFIG_SLIRP not set, so the implicit "-net nic" sets up a nic that isn't connected to anything Signed-off-by: Peter Maydell --- net.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/net.c b/net.c index 1b521a9..68c2840 100644 --- a/net.c +++ b/net.c @@ -1305,6 +1305,18 @@ void net_check_clients(void) VLANState *vlan; VLANClientState *vc; + /* Don't warn about the default network setup that you get if + * no command line -net or -netdev options are specified. There + * are two cases that we would otherwise complain about: + * (1) board doesn't support a NIC but the implicit "-net nic" + * requested one + * (2) CONFIG_SLIRP not set, in which case the implicit "-net nic" + * sets up a nic that isn't connected to anything. + */ + if (default_net) { + return; + } + QTAILQ_FOREACH(vlan, &vlans, next) { int has_nic = 0, has_host_dev = 0;