From patchwork Thu Nov 12 08:32:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 543269 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 2E1DE1413BC for ; Thu, 12 Nov 2015 19:34:21 +1100 (AEDT) Received: from localhost ([::1]:45199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwnKl-0002cj-7W for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2015 03:34:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwnK8-0001R9-4c for qemu-devel@nongnu.org; Thu, 12 Nov 2015 03:33:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwnK7-0001zd-8g for qemu-devel@nongnu.org; Thu, 12 Nov 2015 03:33:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwnK7-0001zZ-3F for qemu-devel@nongnu.org; Thu, 12 Nov 2015 03:33:39 -0500 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 CCBCA5BA12; Thu, 12 Nov 2015 08:33:38 +0000 (UTC) Received: from jason-ThinkPad-T430s.nay.redhat.com (dhcp-14-168.nay.redhat.com [10.66.14.168]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tAC8WWl6029417; Thu, 12 Nov 2015 03:33:34 -0500 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Thu, 12 Nov 2015 16:32:29 +0800 Message-Id: <1447317150-31076-12-git-send-email-jasowang@redhat.com> In-Reply-To: <1447317150-31076-1-git-send-email-jasowang@redhat.com> References: <1447317150-31076-1-git-send-email-jasowang@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: Jason Wang , Vincenzo Maffione Subject: [Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue 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 From: Vincenzo Maffione Reorganization of struct NetClientOptions (commit e4ba22b) caused a compilation failure of the netmap backend. This patch fixes the issue by properly accessing the union field. Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-by: Vincenzo Maffione Signed-off-by: Jason Wang --- net/netmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netmap.c b/net/netmap.c index 508b829..4197a9c 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -439,7 +439,7 @@ int net_init_netmap(const NetClientOptions *opts, const char *name, NetClientState *peer, Error **errp) { /* FIXME error_setg(errp, ...) on failure */ - const NetdevNetmapOptions *netmap_opts = opts->netmap; + const NetdevNetmapOptions *netmap_opts = opts->u.netmap; NetClientState *nc; NetmapPriv me; NetmapState *s;