From: Vincenzo Maffione <v.maffione@gmail.com>
Date: Tue, 10 Nov 2015 09:47:21 +0000 (+0100)
Subject: net: netmap: Fix compilation issue
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=54c59b4de584b3467166febb4ff84627a2f29a0e;p=qemu.git

net: netmap: Fix compilation issue

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 <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Vincenzo Maffione <v.maffione@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---

diff --git a/net/netmap.c b/net/netmap.c
index 508b82947d..4197a9c9ba 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;