From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A50F2C433DB for ; Thu, 11 Feb 2021 15:37:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46DA564E8A for ; Thu, 11 Feb 2021 15:37:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46DA564E8A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAE1g-0007P8-7w for qemu-devel@archiver.kernel.org; Thu, 11 Feb 2021 10:37:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lADzn-0006Y5-Mv for qemu-devel@nongnu.org; Thu, 11 Feb 2021 10:35:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lADzl-000174-De for qemu-devel@nongnu.org; Thu, 11 Feb 2021 10:35:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613057703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p1NRHXOOHBlSLyPaPBKtmZATUbmd9wQvZfCPR8qUreA=; b=TpyZ0rDeChlX2SjZiHFFey8XaW11JfNfbTVN6qJHT+YUbCzDevBy+0vKlV2HEOLmgs8K/i jz5qkWueSNlw/1vfeTBMHdbZbjdUh194gmL3W8o3k0Tgy6mFMY/kb8jgA2WioLk+VLApyt kQiMSQgBQZwSahDCINA1hHiSzmsIB0Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-407-lRJiIkZRNXiTmAnvMqvJsg-1; Thu, 11 Feb 2021 10:34:58 -0500 X-MC-Unique: lRJiIkZRNXiTmAnvMqvJsg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1625107AFA8; Thu, 11 Feb 2021 15:34:56 +0000 (UTC) Received: from dresden.str.redhat.com (ovpn-114-199.ams2.redhat.com [10.36.114.199]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D5EC619744; Thu, 11 Feb 2021 15:34:42 +0000 (UTC) Subject: Re: [PULL v4 14/27] io: add qio_channel_readv_full_all_eof & qio_channel_readv_full_all helpers To: Stefan Hajnoczi , Peter Maydell , qemu-devel@nongnu.org References: <20210210092628.193785-1-stefanha@redhat.com> <20210210092628.193785-15-stefanha@redhat.com> From: Max Reitz Message-ID: <7a12b897-3157-7a2b-115b-cb6b263b147d@redhat.com> Date: Thu, 11 Feb 2021 16:34:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210210092628.193785-15-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.119, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , John G Johnson , thuth@redhat.com, Jagannathan Raman , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Elena Ufimtseva , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Wainer dos Santos Moschetta , Paolo Bonzini , Igor Mammedov , "Denis V. Lunev" , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10.02.21 10:26, Stefan Hajnoczi wrote: > From: Elena Ufimtseva > > Adds qio_channel_readv_full_all_eof() and qio_channel_readv_full_all() > to read both data and FDs. Refactors existing code to use these helpers. > > Signed-off-by: Elena Ufimtseva > Signed-off-by: John G Johnson > Signed-off-by: Jagannathan Raman > Acked-by: Daniel P. Berrangé > Message-id: b059c4cc0fb741e794d644c144cc21372cad877d.1611938319.git.jag.raman@oracle.com > Signed-off-by: Stefan Hajnoczi > --- > include/io/channel.h | 53 +++++++++++++++++++++++ > io/channel.c | 101 ++++++++++++++++++++++++++++++++++--------- > 2 files changed, 134 insertions(+), 20 deletions(-) [...] > diff --git a/io/channel.c b/io/channel.c > index 0d4b8b5160..4555021b62 100644 > --- a/io/channel.c > +++ b/io/channel.c [...] > @@ -135,20 +193,23 @@ int qio_channel_readv_all_eof(QIOChannel *ioc, > return ret; > } > > -int qio_channel_readv_all(QIOChannel *ioc, > - const struct iovec *iov, > - size_t niov, > - Error **errp) > +int qio_channel_readv_full_all(QIOChannel *ioc, > + const struct iovec *iov, > + size_t niov, > + int **fds, size_t *nfds, > + Error **errp) > { > - int ret = qio_channel_readv_all_eof(ioc, iov, niov, errp); > + int ret = qio_channel_readv_full_all_eof(ioc, iov, niov, fds, nfds, errp); > > if (ret == 0) { > - ret = -1; > - error_setg(errp, > - "Unexpected end-of-file before all bytes were read"); > - } else if (ret == 1) { > - ret = 0; > + error_prepend(errp, > + "Unexpected end-of-file before all data were read."); > + return -1; This change breaks iotest 083 (i.e., it segfaults), because qio_channel_readv_full_all_eof() doesn’t set *errp when it returns 0, so there is no error to prepend. Also, I think usually we don’t let error messages end in full stops. Max