From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLn8T-0005xl-Gd for qemu-devel@nongnu.org; Thu, 12 Feb 2015 01:20:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLn8P-00011F-FB for qemu-devel@nongnu.org; Thu, 12 Feb 2015 01:20:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLn8P-00010n-8k for qemu-devel@nongnu.org; Thu, 12 Feb 2015 01:20:21 -0500 From: Pankaj Gupta Date: Thu, 12 Feb 2015 11:50:05 +0530 Message-Id: <1423722005-6129-1-git-send-email-pagupta@redhat.com> Subject: [Qemu-devel] [RFC] net: 'Remove vhostforce option in addition to vhost param' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Pankaj Gupta , jasowang@redhat.com, aliguori@amazon.com, stefanha@redhat.com, mst@redhat.com vhostforce was added to enable use of vhost when guest don't have MSI-X support. Now, we have scenarios which dont use interrupts like DPDK and still use vhost. Also, performance of guests without MSI-X support is getting less popular. Its ok to remove this extra option and enable vhost on the basis of vhost=ON/OFF. Signed-off-by: Pankaj Gupta --- net/tap.c | 4 +--- net/vhost-user.c | 16 ++-------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/net/tap.c b/net/tap.c index 1fe0edf..bd2efa9 100644 --- a/net/tap.c +++ b/net/tap.c @@ -634,13 +634,11 @@ static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, } } - if (tap->has_vhost ? tap->vhost : - vhostfdname || (tap->has_vhostforce && tap->vhostforce)) { + if (tap->has_vhost ? tap->vhost : vhostfdname) { VhostNetOptions options; options.backend_type = VHOST_BACKEND_TYPE_KERNEL; options.net_backend = &s->nc; - options.force = tap->has_vhostforce && tap->vhostforce; if (tap->has_vhostfd || tap->has_vhostfds) { vhostfd = monitor_handle_fd_param(cur_mon, vhostfdname); diff --git a/net/vhost-user.c b/net/vhost-user.c index 24e050c..d2d7bf2 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -18,7 +18,6 @@ typedef struct VhostUserState { NetClientState nc; CharDriverState *chr; - bool vhostforce; VHostNetState *vhost_net; } VhostUserState; @@ -51,7 +50,6 @@ static int vhost_user_start(VhostUserState *s) options.backend_type = VHOST_BACKEND_TYPE_USER; options.net_backend = &s->nc; options.opaque = s->chr; - options.force = s->vhostforce; s->vhost_net = vhost_net_init(&options); @@ -133,8 +131,7 @@ static void net_vhost_user_event(void *opaque, int event) } static int net_vhost_user_init(NetClientState *peer, const char *device, - const char *name, CharDriverState *chr, - bool vhostforce) + const char *name, CharDriverState *chr) { NetClientState *nc; VhostUserState *s; @@ -149,7 +146,6 @@ static int net_vhost_user_init(NetClientState *peer, const char *device, /* We don't provide a receive callback */ s->nc.receive_disabled = 1; s->chr = chr; - s->vhostforce = vhostforce; qemu_chr_add_handlers(s->chr, NULL, NULL, net_vhost_user_event, s); @@ -230,7 +226,6 @@ int net_init_vhost_user(const NetClientOptions *opts, const char *name, { const NetdevVhostUserOptions *vhost_user_opts; CharDriverState *chr; - bool vhostforce; assert(opts->kind == NET_CLIENT_OPTIONS_KIND_VHOST_USER); vhost_user_opts = opts->vhost_user; @@ -247,12 +242,5 @@ int net_init_vhost_user(const NetClientOptions *opts, const char *name, return -1; } - /* vhostforce for non-MSIX */ - if (vhost_user_opts->has_vhostforce) { - vhostforce = vhost_user_opts->vhostforce; - } else { - vhostforce = false; - } - - return net_vhost_user_init(peer, "vhost_user", name, chr, vhostforce); + return net_vhost_user_init(peer, "vhost_user", name, chr); } -- 1.8.3.1