From patchwork Wed Jun 24 15:37:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 488118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0775A140322 for ; Thu, 25 Jun 2015 01:39:37 +1000 (AEST) Received: from localhost ([::1]:51375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mlz-0006uh-8O for incoming@patchwork.ozlabs.org; Wed, 24 Jun 2015 11:39:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mk9-0003Zn-Fd for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7mk3-0003iK-TJ for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mk3-0003i9-NC for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:35 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 5CEE33582C5; Wed, 24 Jun 2015 15:37:35 +0000 (UTC) Received: from localhost (ovpn-112-73.ams2.redhat.com [10.36.112.73]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5OFbYpG032587; Wed, 24 Jun 2015 11:37:34 -0400 From: Stefan Hajnoczi To: Date: Wed, 24 Jun 2015 16:37:25 +0100 Message-Id: <1435160247-24134-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1435160247-24134-1-git-send-email-stefanha@redhat.com> References: <1435160247-24134-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 3/5] net: raise an error if -net type is invalid 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 When a -net type is used that was not compiled into the binary there should be an error message. Note the special case for -net none, which is a no-op. Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-id: 1432743412-15943-4-git-send-email-stefanha@redhat.com --- net/net.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/net/net.c b/net/net.c index 63450c0..7c1b203 100644 --- a/net/net.c +++ b/net/net.c @@ -942,6 +942,17 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) } /* missing optional values have been initialized to "all bits zero" */ name = u.net->has_id ? u.net->id : u.net->name; + + if (opts->kind == NET_CLIENT_OPTIONS_KIND_NONE) { + return 0; /* nothing to do */ + } + + if (!net_client_init_fun[opts->kind]) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", + "a net backend type (maybe it is not compiled " + "into this binary)"); + return -1; + } } if (net_client_init_fun[opts->kind]) {