From 0f515ff831f46ef34cd83aa145e547e48d8b3b56 Mon Sep 17 00:00:00 2001 From: libai Date: Thu, 14 Dec 2023 11:05:52 +0800 Subject: [PATCH] vdpa: set vring enable only if the vring address has already been set Currently, vhost-vdpa does not determine the status of each vring when performing the enable operation on vring. When the vBIOS(EDK2) is running, the driver will not enable all vrings. In this case, setting all vrings to enable is isconsistent with the actual situation. Add logic when enabling vring, make a judement on the vring status. If the vring address is not set, the vring will not enabled. Signed-off-by: libai --- hw/virtio/vhost-vdpa.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 30408f2069..d49826845f 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -890,6 +890,11 @@ int vhost_vdpa_set_vring_ready(struct vhost_vdpa *v, unsigned idx) .index = idx, .num = 1, }; + hwaddr addr = virtio_queue_get_desc_addr(dev->vdev, idx); + if (addr == 0) { + return 0; + } + int r = vhost_vdpa_call(dev, VHOST_VDPA_SET_VRING_ENABLE, &state); trace_vhost_vdpa_set_vring_ready(dev, idx, r); -- 2.27.0