block/blkio: fix compiler false-positive warning
Under some optimization, gcc produces a false-positive: ../block/blkio.c: In function ‘blkio_co_getlength’: ../block/blkio.c:943:8: error: ‘ret’ may be used uninitialized [-Werror=maybe-uninitialized] 943 | if (ret < 0) { | ^ Replace WITH_QEMU_LOCK_GUARD with the simpler QEMU_LOCK_GUARD. Suggested-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Marc-André Lureau committed
Jul 26, 2026 at 20:18 UTC
6b47b70185c35a902ad6e93d0be2f942d6dce07c
1 file changed
+2
-3
block/blkio.c
+2
-3
@@ -937,9 +937,8 @@ static int64_t coroutine_fn blkio_co_getlength(BlockDriverState *bs)
937
uint64_t capacity;
938
int ret;
939
940
- WITH_QEMU_LOCK_GUARD(&s->blkio_lock) {
941
- ret = blkio_get_uint64(s->blkio, "capacity", &capacity);
942
- }
940
+ QEMU_LOCK_GUARD(&s->blkio_lock);
941
+ ret = blkio_get_uint64(s->blkio, "capacity", &capacity);
942
if (ret < 0) {
943
return -ret;
944
}