From: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com
Cc: a.motakis@virtualopensystems.com, luke@snabb.co,
tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com
Subject: [Qemu-devel] [PATCH] net: fix vhost-user mingw compilation
Date: Wed, 18 Jun 2014 23:45:45 +0300 [thread overview]
Message-ID: <20140618204530.16806.54996.stgit@3820> (raw)
Make net.o linkage expect net_init_vhost_user only when
CONFIG_VHOST_NET is defined.
Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
---
net/net.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/net.c b/net/net.c
index de76e30..0c30414 100644
--- a/net/net.c
+++ b/net/net.c
@@ -803,7 +803,9 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
[NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge,
#endif
[NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport,
+#ifdef CONFIG_VHOST_NET
[NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user,
+#endif
};
@@ -837,7 +839,9 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
case NET_CLIENT_OPTIONS_KIND_BRIDGE:
#endif
case NET_CLIENT_OPTIONS_KIND_HUBPORT:
+#ifdef CONFIG_VHOST_NET
case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
+#endif
break;
default:
next reply other threads:[~2014-06-18 20:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 20:45 Nikolay Nikolaev [this message]
2014-06-19 14:16 ` [Qemu-devel] [PATCH] net: fix vhost-user mingw compilation Nikolay Nikolaev
2014-06-19 14:24 ` Michael S. Tsirkin
2014-06-19 14:33 ` Nikolay Nikolaev
2014-06-19 14:47 ` Michael S. Tsirkin
2014-06-19 14:54 ` Michael S. Tsirkin
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=20140618204530.16806.54996.stgit@3820 \
--to=n.nikolaev@virtualopensystems.com \
--cc=a.motakis@virtualopensystems.com \
--cc=luke@snabb.co \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=snabb-devel@googlegroups.com \
--cc=tech@virtualopensystems.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.