Le 08/01/2020 à 03:51, [email protected] a écrit : > From: Pan Nengyuan <[email protected]> > > Fixes: > /mnt/sdb/qemu/nbd/server.c: In function 'nbd_handle_request': > /mnt/sdb/qemu/nbd/server.c:2313:9: error: 'ret' may be used uninitialized in > this function [-Werror=maybe-uninitialized] > int ret; > > Reported-by: Euler Robot <[email protected]> > Signed-off-by: Pan Nengyuan <[email protected]> > --- > Changes v2 to v1: > - change 'if(client->export_meta.bitmap)' into 'else' to fix uninitialized > warning and clean up pointless code (suggested by Eric Blake) > --- > nbd/server.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/nbd/server.c b/nbd/server.c > index 24ebc1a805..87fcd2e7bf 100644 > --- a/nbd/server.c > +++ b/nbd/server.c > @@ -2384,20 +2384,12 @@ static coroutine_fn int nbd_handle_request(NBDClient > *client, > !client->export_meta.bitmap, > NBD_META_ID_BASE_ALLOCATION, > errp); > - if (ret < 0) { > - return ret; > - } > - } > - > - if (client->export_meta.bitmap) { > + } else { /* client->export_meta.bitmap */ > ret = nbd_co_send_bitmap(client, request->handle, > client->exp->export_bitmap, > request->from, request->len, > dont_fragment, > true, NBD_META_ID_DIRTY_BITMAP, > errp); > - if (ret < 0) { > - return ret; > - } > } > > return ret; >
Reviewed-by: Laurent Vivier <[email protected]> And applied to my trivial-patches branch. Thanks, Laurent
