From patchwork Tue Jul 19 17:22:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 650286 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 3rv6ML3QKLz9srZ for ; Wed, 20 Jul 2016 03:23:26 +1000 (AEST) Received: from localhost ([::1]:57476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYjs-0000m1-6c for incoming@patchwork.ozlabs.org; Tue, 19 Jul 2016 13:23:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYij-0007mt-6V for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:22:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPYie-00027b-4m for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:22:13 -0400 Received: from resqmta-po-07v.sys.comcast.net ([2001:558:fe16:19:96:114:154:166]:32886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYid-00027P-VB for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:22:08 -0400 Received: from resomta-po-06v.sys.comcast.net ([96.114.154.230]) by resqmta-po-07v.sys.comcast.net with SMTP id PYiTbk5QgqbrLPYidbQs3T; Tue, 19 Jul 2016 17:22:07 +0000 Received: from red.redhat.com ([24.10.254.122]) by comcast with SMTP id PYiZbBdq8PqfgPYicb4OZE; Tue, 19 Jul 2016 17:22:07 +0000 From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 19 Jul 2016 11:22:02 -0600 Message-Id: <1468948922-11074-1-git-send-email-eblake@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1468928377-20384-15-git-send-email-armbru@redhat.com> References: <1468928377-20384-15-git-send-email-armbru@redhat.com> X-CMAE-Envelope: MS4wfAHOsFatMcLZAWgls2Q7AYJMgmtl7OTbAy1HsaIam6ChN3DZbYMkr23dYxTCU/3mjGlshi98RobCAHL/s9B6Fk8UDOvBhAyJuPXvtFgJuSgAGFDdPdpB u7F4PWcfXT3s2B/KlXV+WSjnLq+Pdpg1eOv0Arpt91VtSOOd4L4SRMz0uSYoweAT4BPY963ozjTSN4y056+5Pzk0xaGIumyBWORtjNr9Wf0jsDGjyjf+1nlI X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:558:fe16:19:96:114:154:166 Subject: [Qemu-devel] [PATCH 14/15] fixup! qapi: Change Netdev into a flat union X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , armbru@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" [Fix compilation problems in the files I can't build by default] Signed-off-by: Eric Blake --- net/tap-win32.c | 2 +- net/vde.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tap-win32.c b/net/tap-win32.c index 729309d..662f9b6 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -795,7 +795,7 @@ int net_init_tap(const Netdev *netdev, const char *name, const NetdevTapOptions *tap; assert(netdev->type == NET_CLIENT_DRIVER_TAP); - tap = netdev->u.tap; + tap = &netdev->u.tap; if (!tap->has_ifname) { error_report("tap: no interface name"); diff --git a/net/vde.c b/net/vde.c index b8725f8..e50e5d6 100644 --- a/net/vde.c +++ b/net/vde.c @@ -116,7 +116,7 @@ int net_init_vde(const Netdev *netdev, const char *name, const NetdevVdeOptions *vde; assert(netdev->type == NET_CLIENT_DRIVER_VDE); - vde = netdev->u.vde; + vde = &netdev->u.vde; /* missing optional values have been initialized to "all bits zero" */ if (net_vde_init(peer, "vde", name, vde->sock, vde->port, vde->group,