All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com
Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com
Subject: [Qemu-devel] [PATCH 1/6] configure: add new config define CONFIG_VHOST_NET_USED
Date: Thu, 19 Jun 2014 18:07:15 +0300	[thread overview]
Message-ID: <20140619150708.10499.23280.stgit@3820> (raw)
In-Reply-To: <20140619150355.10499.53297.stgit@3820>

This will be used in net.c (for now) to enable vhos-user netdev backend.

Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
---
 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;

  reply	other threads:[~2014-06-19 15:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-19 15:06 [Qemu-devel] [PATCH 0/6] vhost-user qtest fixes Nikolay Nikolaev
2014-06-19 15:07 ` Nikolay Nikolaev [this message]
2014-06-19 15:35   ` [Qemu-devel] [PATCH 1/6] configure: add new config define CONFIG_VHOST_NET_USED Michael S. Tsirkin
2014-06-19 15:38     ` [Qemu-devel] [snabb-devel] " Nikolay Nikolaev
2014-06-19 15:07 ` [Qemu-devel] [PATCH 2/6] libqemustub: add more stubs for qemu-char Nikolay Nikolaev
2014-06-19 16:06   ` Andrew Jones
2014-06-19 15:07 ` [Qemu-devel] [PATCH 3/6] qtest: fix qtest for vhost-user Nikolay Nikolaev
2014-06-19 15:08 ` [Qemu-devel] [PATCH 4/6] qtest: fix vhost-user-test unbalanced mutex locks Nikolay Nikolaev
2014-06-19 15:08 ` [Qemu-devel] [PATCH 5/6] vhost: fix migration_blocker initialization Nikolay Nikolaev
2014-06-19 15:09 ` [Qemu-devel] [PATCH 6/6] qtest: enable vhost-user-test Nikolay Nikolaev
2014-06-19 15:41   ` Michael S. Tsirkin
2014-06-19 17:18     ` Paolo Bonzini
2014-06-19 15:48 ` [Qemu-devel] [PATCH 0/6] vhost-user qtest fixes Michael S. Tsirkin
2014-06-19 15:55   ` [Qemu-devel] [snabb-devel] " Nikolay Nikolaev
2014-06-19 16:20     ` Nikolay Nikolaev

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=20140619150708.10499.23280.stgit@3820 \
    --to=n.nikolaev@virtualopensystems.com \
    --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.