From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEHWd-0001Z5-0J for qemu-devel@nongnu.org; Mon, 13 Nov 2017 11:23:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEHWb-0004J4-UY for qemu-devel@nongnu.org; Mon, 13 Nov 2017 11:23:54 -0500 References: <20171113152424.25381-1-eblake@redhat.com> From: Vladimir Sementsov-Ogievskiy Message-ID: <0e997434-531f-7a3a-b362-006f163e4cc0@virtuozzo.com> Date: Mon, 13 Nov 2017 19:23:31 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Qemu-devel] [PATCH for-2.11] nbd/client: Use error_prepend() correctly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-stable@nongnu.org, qemu-block@nongnu.org, Markus Armbruster 13.11.2017 18:32, Eric Blake wrote: > [adding Markus as error maintainer] > > On 11/13/2017 09:24 AM, Eric Blake wrote: >> When using error prepend(), it is necessary to end with a space >> in the format string; otherwise, messages come out incorrectly, >> such as when connecting to a socket that hangs up immediately: >> >> can't open device nbd://localhost:10809/: Failed to read dataUnexpected end-of-file before all bytes were read >> >> Originally botched in commit e44ed99d, then several more instances >> added in the meantime. >> >> CC: qemu-stable@nongnu.org >> Signed-off-by: Eric Blake >> --- >> nbd/client.c | 50 ++++++++++++++++++++++++++------------------------ >> 1 file changed, 26 insertions(+), 24 deletions(-) >> >> diff --git a/nbd/client.c b/nbd/client.c >> index 1880103d2a..4e15fc484d 100644 >> --- a/nbd/client.c >> +++ b/nbd/client.c >> @@ -79,12 +79,12 @@ static int nbd_send_option_request(QIOChannel *ioc, uint32_t opt, >> stl_be_p(&req.length, len); >> >> if (nbd_write(ioc, &req, sizeof(req), errp) < 0) { >> - error_prepend(errp, "Failed to send option request header"); >> + error_prepend(errp, "Failed to send option request header: "); > A quick grep of the tree noticed that most (all?) error_prepend() > callers use trailing ": " in their format string. Should we refactor > that to be done automatically by error_prepend() itself, rather than at > every callsite? > Sounds good. -- Best regards, Vladimir