[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] configure: add new config define CONFIG_VHOST_N
From: |
Nikolay Nikolaev |
Subject: |
[Qemu-devel] [PATCH 1/6] configure: add new config define CONFIG_VHOST_NET_USED |
Date: |
Thu, 19 Jun 2014 18:07:15 +0300 |
User-agent: |
StGit/0.17.1-dirty |
This will be used in net.c (for now) to enable vhos-user netdev backend.
Signed-off-by: Nikolay Nikolaev <address@hidden>
---
configure | 3 +++
net/net.c | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 9f4ba45..fb3c856 100755
--- a/configure
+++ b/configure
@@ -4543,6 +4543,9 @@ fi
if test "$vhost_scsi" = "yes" ; then
echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
fi
+if test "$vhost_net" = "yes" ; then
+ echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak
+fi
if test "$blobs" = "yes" ; then
echo "INSTALL_BLOBS=yes" >> $config_host_mak
fi
diff --git a/net/net.c b/net/net.c
index 0c30414..3dac29b 100644
--- a/net/net.c
+++ b/net/net.c
@@ -803,7 +803,7 @@ 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
+#ifdef CONFIG_VHOST_NET_USED
[NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user,
#endif
};
@@ -839,7 +839,7 @@ 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
+#ifdef CONFIG_VHOST_NET_USED
case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
#endif
break;
- [Qemu-devel] [PATCH 0/6] vhost-user qtest fixes, Nikolay Nikolaev, 2014/06/19
- [Qemu-devel] [PATCH 1/6] configure: add new config define CONFIG_VHOST_NET_USED,
Nikolay Nikolaev <=
- [Qemu-devel] [PATCH 2/6] libqemustub: add more stubs for qemu-char, Nikolay Nikolaev, 2014/06/19
- [Qemu-devel] [PATCH 3/6] qtest: fix qtest for vhost-user, Nikolay Nikolaev, 2014/06/19
- [Qemu-devel] [PATCH 4/6] qtest: fix vhost-user-test unbalanced mutex locks, Nikolay Nikolaev, 2014/06/19
- [Qemu-devel] [PATCH 5/6] vhost: fix migration_blocker initialization, Nikolay Nikolaev, 2014/06/19
- [Qemu-devel] [PATCH 6/6] qtest: enable vhost-user-test, Nikolay Nikolaev, 2014/06/19