From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Jason Wang 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> Subject: [Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Jason Wang , Vincenzo Maffione 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; -- 2.1.4