From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 28 Mar 2024 10:20:41 +0000 (+0400)
Subject: hw/vhost-scsi: fix -Werror=maybe-uninitialized
X-Git-Tag: v9.2.0-rc0~64^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa7e5e9e1c52b2b197f478265b221e766679a236;p=thirdparty%2Fqemu.git

hw/vhost-scsi: fix -Werror=maybe-uninitialized

../hw/scsi/vhost-scsi.c:173:12: error: ‘ret’ may be used uninitialized [-Werror=maybe-uninitialized]

It can be reached when num_queues=0. It probably doesn't make much sense
to instantiate a vhost-scsi with 0 IO queues though. For now, make
vhost_scsi_set_workers() return success/0 anyway, when no workers have
been setup.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
---

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 49cff2a0cb5..22d16dc26bf 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -172,7 +172,7 @@ static int vhost_scsi_set_workers(VHostSCSICommon *vsc, bool per_virtqueue)
     struct vhost_dev *dev = &vsc->dev;
     struct vhost_vring_worker vq_worker;
     struct vhost_worker_state worker;
-    int i, ret;
+    int i, ret = 0;
 
     /* Use default worker */
     if (!per_virtqueue || dev->nvqs == VHOST_SCSI_VQ_NUM_FIXED + 1) {