From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKjKp-00011F-LD for qemu-devel@nongnu.org; Thu, 30 Jul 2015 04:37:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKjKl-0006Bs-Ms for qemu-devel@nongnu.org; Thu, 30 Jul 2015 04:37:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKjKl-0006Bo-Gk for qemu-devel@nongnu.org; Thu, 30 Jul 2015 04:36:59 -0400 Date: Thu, 30 Jul 2015 11:36:56 +0300 From: "Michael S. Tsirkin" Message-ID: <1438245296-1446-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 for-2.4] Revert "vhost-user: Send VHOST_RESET_OWNER on vhost stop" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Luke Gorrie , Marcel Apfelbaum This reverts commit 294ce717e0f212ed0763307f3eab72b4a1bdf4d0. vhost stop happens e.g. when guest unloads the driver, so closing the backend connection is not the right thing to do here. VHOST_RESET_OWNER should happen on vhost_dev_cleanup - it's the counterpart of VHOST_SET_OWNER. Cc: Luke Gorrie Signed-off-by: Michael S. Tsirkin --- I think we need this in 2.4 to avoid introducing regressions in the protocol. We'll fix properly in 2.5. Luke, can you comment please? hw/net/vhost_net.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index c864237..b8d88ec 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -284,13 +284,6 @@ static void vhost_net_stop_one(struct vhost_net *net, &file); assert(r >= 0); } - } else if (net->nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER) { - for (file.index = 0; file.index < net->dev.nvqs; ++file.index) { - const VhostOps *vhost_ops = net->dev.vhost_ops; - int r = vhost_ops->vhost_call(&net->dev, VHOST_RESET_OWNER, - NULL); - assert(r >= 0); - } } if (net->nc->info->poll) { net->nc->info->poll(net->nc, true); -- MST