27.10.2017 13:45, Eric Blake wrote:
Commenting these two lines is enough to avoid the change to 083.out in 12/12. That is evidence that we may want these two lines to be trace points rather than error messages; or maybe we really do like the extra verbosity in the case of an unexpected communication break.This patch does not meet coding guidelines, and I'm not proud enough of it to give S-o-b, but I'm posting it for conversation. --- block/nbd-client.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index b44d4d4a01..e063b3fbc0 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -654,7 +654,8 @@ static int nbd_co_request(BlockDriverState *bs, NBDRequest *request, ret = nbd_co_receive_return_code(client, request->handle, &local_err); if (local_err) { - error_report_err(local_err); + assert(ret < 0); +// error_report_err(local_err); } return ret; } @@ -682,7 +683,7 @@ int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset, ret = nbd_co_receive_cmdread_reply(client, request.handle, offset, qiov, &local_err); if (ret < 0) { - error_report_err(local_err); + //error_report_err(local_err); } return ret; }
commenting is not ok, you should call error_free instead. -- Best regards, Vladimir
