From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEH7o-0004L3-Hz for qemu-devel@nongnu.org; Mon, 04 Aug 2014 08:12:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEH7i-0005FU-1v for qemu-devel@nongnu.org; Mon, 04 Aug 2014 08:12:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEH7h-0005Et-RR for qemu-devel@nongnu.org; Mon, 04 Aug 2014 08:12:18 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s74CCGSn015776 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 4 Aug 2014 08:12:16 -0400 Date: Mon, 4 Aug 2014 14:12:39 +0200 From: "Michael S. Tsirkin" Message-ID: <1407154111-13155-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] vhost_net: cleanup start/stop condition List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jason Wang Checking vhost device internal state in vhost_net looks like a layering violation since vhost_net does not set this flag: it is set and tested by vhost.c. There seems to be no reason to check this: caller in virtio net uses its own flag, vhost_started, to ensure vhost is started/stopped as appropriate. Signed-off-by: Michael S. Tsirkin --- hw/net/vhost_net.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index f87c798..d9423d1 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -195,10 +195,6 @@ static int vhost_net_start_one(struct vhost_net *net, struct vhost_vring_file file = { }; int r; - if (net->dev.started) { - return 0; - } - net->dev.nvqs = 2; net->dev.vqs = net->vqs; net->dev.vq_index = vq_index; @@ -251,15 +247,11 @@ fail_notifiers: return r; } static void vhost_net_stop_one(struct vhost_net *net, VirtIODevice *dev) { struct vhost_vring_file file = { .fd = -1 }; - if (!net->dev.started) { - return; - } - if (net->nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP) { for (file.index = 0; file.index < net->dev.nvqs; ++file.index) { const VhostOps *vhost_ops = net->dev.vhost_ops; -- MST