From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0sfy-0008HH-TX for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:32:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0sfu-000831-Rn for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:32:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0sfu-00082l-L6 for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:32:46 -0400 From: Pankaj Gupta Date: Fri, 5 Jun 2015 20:02:29 +0530 Message-Id: <1433514749-19584-1-git-send-email-pagupta@redhat.com> Subject: [Qemu-devel] [PATCH v2] net:Enable vhost with vhostforce, vhost options for guests without MSI-X support 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 We use vhostforce to enable vhost even if Guests don't have MSI-X support and we fall back to QEMU virtio-net. This patch will enable vhost unconditionally whenever we have vhostforce='ON' or vhost='ON'. Initially, I wanted to remove vhostforce completely as an additional argument. But after discussing this in mailing list found that some programs are using vhostforce and some vhost. So, we want to keep semantics of both the options. Signed-off-by: Pankaj Gupta --- net/tap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/tap.c b/net/tap.c index d1ca314..4618359 100644 --- a/net/tap.c +++ b/net/tap.c @@ -649,13 +649,13 @@ static void 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) || tap->vhostforce) { VhostNetOptions options; options.backend_type = VHOST_BACKEND_TYPE_KERNEL; options.net_backend = &s->nc; - options.force = tap->has_vhostforce && tap->vhostforce; + options.force = true; if (tap->has_vhostfd || tap->has_vhostfds) { vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err); -- 1.9.3