From patchwork Wed Jun 24 15:37:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 488121 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 7677D14030F for ; Thu, 25 Jun 2015 01:41:26 +1000 (AEST) Received: from localhost ([::1]:51390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mnk-0000qc-GR for incoming@patchwork.ozlabs.org; Wed, 24 Jun 2015 11:41:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mk8-0003Ya-Fe 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 1Z7mk7-0003mI-Jj for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mk7-0003mA-FX for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:39 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 2376AB7A73; Wed, 24 Jun 2015 15:37:39 +0000 (UTC) Received: from localhost (ovpn-112-73.ams2.redhat.com [10.36.112.73]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5OFbcPu003573; Wed, 24 Jun 2015 11:37:38 -0400 From: Stefan Hajnoczi To: Date: Wed, 24 Jun 2015 16:37:27 +0100 Message-Id: <1435160247-24134-6-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.23 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 5/5] net: simplify net_client_init1() 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 Drop the union and move the hubport creation into the !is_netdev case. Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-id: 1432743412-15943-6-git-send-email-stefanha@redhat.com --- net/net.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/net/net.c b/net/net.c index 8e5b6f6..6ff7fec 100644 --- a/net/net.c +++ b/net/net.c @@ -913,18 +913,14 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( static int net_client_init1(const void *object, int is_netdev, Error **errp) { - union { - const Netdev *netdev; - const NetLegacy *net; - } u; const NetClientOptions *opts; const char *name; NetClientState *peer = NULL; if (is_netdev) { - u.netdev = object; - opts = u.netdev->opts; - name = u.netdev->id; + const Netdev *netdev = object; + opts = netdev->opts; + name = netdev->id; if (opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP || opts->kind == NET_CLIENT_OPTIONS_KIND_NIC || @@ -934,19 +930,19 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) return -1; } } else { - u.net = object; - opts = u.net->opts; - if (opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", - "a net type"); - return -1; - } + const NetLegacy *net = object; + opts = net->opts; /* missing optional values have been initialized to "all bits zero" */ - name = u.net->has_id ? u.net->id : u.net->name; + name = net->has_id ? net->id : net->name; if (opts->kind == NET_CLIENT_OPTIONS_KIND_NONE) { return 0; /* nothing to do */ } + if (opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", + "a net type"); + return -1; + } if (!net_client_init_fun[opts->kind]) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", @@ -954,14 +950,12 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) "into this binary)"); return -1; } - } - /* Do not add to a vlan if it's a -netdev or a nic with a netdev= - * parameter. */ - if (!is_netdev && - (opts->kind != NET_CLIENT_OPTIONS_KIND_NIC || - !opts->nic->has_netdev)) { - peer = net_hub_add_port(u.net->has_vlan ? u.net->vlan : 0, NULL); + /* Do not add to a vlan if it's a nic with a netdev= parameter. */ + if (opts->kind != NET_CLIENT_OPTIONS_KIND_NIC || + !opts->nic->has_netdev) { + peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL); + } } if (net_client_init_fun[opts->kind](opts, name, peer, errp) < 0) {