From: Boris Fiuczynski Date: Thu, 13 Aug 2020 14:03:46 +0000 (+0200) Subject: storage: avoid maybe-uninitialized warning by GCC 10 X-Git-Tag: v6.7.0-rc1~120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae8a83c35378d8d3eac2e41b3a10cac0e587ce54;p=thirdparty%2Flibvirt.git storage: avoid maybe-uninitialized warning by GCC 10 GCC 10 complains about variables may be used uninitialized. Even though it might be false positives, we can easily avoid them. Avoiding ../src/storage/storage_backend_iscsi_direct.c:634:11: error: ‘nb_block’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 634 | while (lba < nb_block) { | ^ ../src/storage/storage_backend_iscsi_direct.c:619:14: note: ‘nb_block’ was declared here 619 | uint64_t nb_block; | ^~~~~~~~ ../src/storage/storage_backend_iscsi_direct.c:637:16: error: ‘block_size’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 637 | task = iscsi_write16_sync(iscsi, lun, lba, data, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 638 | block_size * to_write, | ~~~~~~~~~~~~~~~~~~~~~~ 639 | block_size, 0, 0, 0, 0, 0); | ~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/storage/storage_backend_iscsi_direct.c:618:14: note: ‘block_size’ was declared here 618 | uint32_t block_size; | ^~~~~~~~~~ ../src/storage/storage_backend_iscsi_direct.c: In function ‘virStorageBackendISCSIDirectRefreshPool’: ../src/storage/storage_backend_iscsi_direct.c:320:39: error: ‘nb_block’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 320 | vol->target.capacity = block_size * nb_block; | ~~~~~~~~~~~^~~~~~~~~~ ../src/storage/storage_backend_iscsi_direct.c:306:14: note: ‘nb_block’ was declared here 306 | uint64_t nb_block; | ^~~~~~~~ ../src/storage/storage_backend_iscsi_direct.c:320:39: error: ‘block_size’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 320 | vol->target.capacity = block_size * nb_block; | ~~~~~~~~~~~^~~~~~~~~~ ../src/storage/storage_backend_iscsi_direct.c:305:14: note: ‘block_size’ was declared here 305 | uint32_t block_size; | ^~~~~~~~~~ Signed-off-by: Boris Fiuczynski Reviewed-by: Marc Hartmayer Reviewed-by: Erik Skultety --- diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index c37c671db6..027fa83de7 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -302,8 +302,8 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, char *portal) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - uint32_t block_size; - uint64_t nb_block; + uint32_t block_size = 0; + uint64_t nb_block = 0; g_autoptr(virStorageVolDef) vol = NULL; if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) @@ -615,8 +615,8 @@ virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, struct iscsi_context *iscsi) { uint64_t lba = 0; - uint32_t block_size; - uint64_t nb_block; + uint32_t block_size = 0; + uint64_t nb_block = 0; struct scsi_task *task = NULL; int lun = 0; int ret = -1;