Re: [PATCH v2 17/24] vhost: vhost-user: update vhost_dev_virtqueue_restart()

[Kangjie Xu]

在 2022/8/24 12:03, Jason Wang 写道:

在 2022/8/16 09:06, Kangjie Xu 写道:

Update vhost_dev_virtqueue_restart() for vhost-user scenario.

Signed-off-by: Kangjie Xu <kangjie...@linux.alibaba.com>
Signed-off-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
---
  hw/virtio/vhost.c | 26 ++++++++++++++++++++++----
  1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index a0d6824353..bd90cfe13a 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c

@@ -1937,11 +1937,29 @@ int vhost_dev_virtqueue_restart(struct vhost_dev *hdev, VirtIODevice *vdev,

                                  int idx)
  {
      const VhostOps *vhost_ops = hdev->vhost_ops;
+    int r;
        assert(vhost_ops);
  -    return vhost_virtqueue_start(hdev,
-                                 vdev,
-                                 hdev->vqs + idx,
-                                 hdev->vq_index + idx);
+    r = vhost_virtqueue_start(hdev,
+                              vdev,
+                              hdev->vqs + idx,
+                              hdev->vq_index + idx);
+    if (r < 0) {
+        goto err_start;
+    }
+
+    if (vhost_ops->vhost_set_single_vring_enable) {
+        r = vhost_ops->vhost_set_single_vring_enable(hdev,
+ hdev->vq_index + idx,
+                                                     1);

Rethink about the name, I think the current names is kind of confusing:

        .vhost_set_single_vring_enable = vhost_user_set_single_vring_enable,

        .vhost_set_vring_enable = vhost_user_set_vring_enable,

I wonder if it's better:

1) rename vhost_set_vring_enable to vhost_set_dev_enable()

then we can

2) use vhost_set_vring_enable() for per vq enabling?

Thanks

I agree. It looks better, I will refactor this part.

Thanks.

+        if (r < 0) {
+            goto err_start;
+        }
+    }
+
+    return 0;
+
+err_start:
+    return r;
  }