summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLuke Gorrie <luke@snabb.co>2015-04-26 15:00:49 +0200
committerMichael S. Tsirkin <mst@redhat.com>2015-04-27 20:49:45 +0200
commit294ce717e0f212ed0763307f3eab72b4a1bdf4d0 (patch)
tree6219dfb61787de117b5b4765836e9031f9455fe7
parent658c27181bf3b08a9cf2fab00ecce7f76065f6af (diff)
downloadfocaccia-qemu-294ce717e0f212ed0763307f3eab72b4a1bdf4d0.tar.gz
focaccia-qemu-294ce717e0f212ed0763307f3eab72b4a1bdf4d0.zip
vhost-user: Send VHOST_RESET_OWNER on vhost stop
Ensure that the vhost-user slave knows when the vrings are valid and
when they are invalid, for example during a guest reboot.

The vhost-user protocol says this of VHOST_RESET_OWNER:

      Issued when a new connection is about to be closed. The Master
      will no longer own this connection (and will usually close it).

Send this message to tell the vhost-user slave that the vhost session
has ended and that session state (e.g. vrings) is no longer valid.

Signed-off-by: Luke Gorrie <luke@snabb.co>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


-rw-r--r--hw/net/vhost_net.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index cf23335ba2..47f8b89d51 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -263,6 +263,13 @@ 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);