summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-11-16 18:40:18 +0200
committerMichael S. Tsirkin <mst@redhat.com>2015-11-16 18:48:31 +0200
commitdc3db6adde329548771ab2addc2ef8376b2b8b32 (patch)
treea01b35bc76650e4a2951cf4dfeb348cb6eadeeae
parent5421f318ecc82294ad089fd54924df787b67c971 (diff)
downloadfocaccia-qemu-dc3db6adde329548771ab2addc2ef8376b2b8b32.tar.gz
focaccia-qemu-dc3db6adde329548771ab2addc2ef8376b2b8b32.zip
vhost-user: start/stop all rings
We are currently only sending VRING_ENABLE message for the first ring,
that's wrong: we must start/stop them all.

Reported-by: Victor Kaplansky <victork@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/virtio/vhost-user.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 5bc6c45dee..71c3e16f67 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -333,18 +333,23 @@ static int vhost_user_set_vring_base(struct vhost_dev *dev,
 
 static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable)
 {
-    struct vhost_vring_state state = {
-        .index = dev->vq_index,
-        .num   = enable,
-    };
+    int i;
 
     if (!virtio_has_feature(dev->features, VHOST_USER_F_PROTOCOL_FEATURES)) {
         return -1;
     }
 
-    return vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
-}
+    for (i = 0; i < dev->nvqs; ++i) {
+        struct vhost_vring_state state = {
+            .index = dev->vq_index + i,
+            .num   = enable,
+        };
+
+        vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
+    }
 
+    return 0;
+}
 
 static int vhost_user_get_vring_base(struct vhost_dev *dev,
                                      struct vhost_vring_state *ring)