[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue |
Date: |
Thu, 12 Nov 2015 16:32:29 +0800 |
From: Vincenzo Maffione <address@hidden>
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Vincenzo Maffione <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
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
- [Qemu-devel] [PULL v2 01/12] slirp: Fix type casts and format strings in debug code, (continued)
- [Qemu-devel] [PULL v2 01/12] slirp: Fix type casts and format strings in debug code, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 02/12] e1000: Cosmetic and alignment fixes, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 03/12] e1000: Add support for migrating the entire MAC registers' array, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 04/12] e1000: Introduced an array to control the access to the MAC registers, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 05/12] e1000: Trivial implementation of various MAC registers, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 06/12] e1000: Fixing the received/transmitted packets' counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 07/12] e1000: Fixing the received/transmitted octets' counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 08/12] e1000: Fixing the packet address filtering procedure, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 09/12] e1000: Implementing various counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 10/12] e1000: Introducing backward compatibility command line parameter, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue,
Jason Wang <=
- [Qemu-devel] [PULL v2 12/12] net: netmap: use error_setg() helpers in place of error_report(), Jason Wang, 2015/11/12
- Re: [Qemu-devel] [PULL v2 00/12] Net patches, Peter Maydell, 2015/11/12