qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>,
	Vincenzo Maffione <v.maffione@gmail.com>
Subject: [Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue
Date: Thu, 12 Nov 2015 16:32:29 +0800	[thread overview]
Message-ID: <1447317150-31076-12-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1447317150-31076-1-git-send-email-jasowang@redhat.com>

From: Vincenzo Maffione <v.maffione@gmail.com>

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>
---
 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

  parent reply	other threads:[~2015-11-12  8:33 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-12  8:32 [Qemu-devel] [PULL v2 00/12] Net patches Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 01/12] slirp: Fix type casts and format strings in debug code Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 02/12] e1000: Cosmetic and alignment fixes Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 03/12] e1000: Add support for migrating the entire MAC registers' array Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 04/12] e1000: Introduced an array to control the access to the MAC registers Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 05/12] e1000: Trivial implementation of various " Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 06/12] e1000: Fixing the received/transmitted packets' counters Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 07/12] e1000: Fixing the received/transmitted octets' counters Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 08/12] e1000: Fixing the packet address filtering procedure Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 09/12] e1000: Implementing various counters Jason Wang
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 10/12] e1000: Introducing backward compatibility command line parameter Jason Wang
2015-11-12  8:32 ` Jason Wang [this message]
2015-11-12  8:32 ` [Qemu-devel] [PULL v2 12/12] net: netmap: use error_setg() helpers in place of error_report() Jason Wang
2015-11-12 14:50 ` [Qemu-devel] [PULL v2 00/12] Net patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447317150-31076-12-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=v.maffione@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).