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.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 5F782C433DB for ; Thu, 11 Feb 2021 15:49:22 +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 015F664E8B for ; Thu, 11 Feb 2021 15:49:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 015F664E8B 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]:52530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAEDZ-0000PY-2F for qemu-devel@archiver.kernel.org; Thu, 11 Feb 2021 10:49:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAEBW-0006U9-C3 for qemu-devel@nongnu.org; Thu, 11 Feb 2021 10:47:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lAEBT-0006U4-Ie for qemu-devel@nongnu.org; Thu, 11 Feb 2021 10:47:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613058430; h=from:from:reply-to: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=s3UgHYU0X9VArROfuASc3JkNJc1U70Q0IEhd8u/QPSI=; b=YgNepYN1UjolW8GhqFZ1H6M//aqskiNsmsntdFiFRBp7kPybPUsX96vh6itBJvmyMe5WVc NlfCSiVd5S8kgFwmVO4/G31D9CnIK5/8t2SYgo2+/mN5vmcBJ49vQlMvCh+b4WWM3ypGDz yrAE/SGtVLfcIxp3IxIs+TpF2PYPJyo= 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-100-jXakkWgnPAijtjUIvlDOVw-1; Thu, 11 Feb 2021 10:47:06 -0500 X-MC-Unique: jXakkWgnPAijtjUIvlDOVw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E1D89126F; Thu, 11 Feb 2021 15:47:04 +0000 (UTC) Received: from redhat.com (ovpn-114-239.ams2.redhat.com [10.36.114.239]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A1A076E505; Thu, 11 Feb 2021 15:46:50 +0000 (UTC) Date: Thu, 11 Feb 2021 15:46:47 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Max Reitz Subject: Re: [PULL v4 14/27] io: add qio_channel_readv_full_all_eof & qio_channel_readv_full_all helpers Message-ID: <20210211154647.GK1302824@redhat.com> References: <20210210092628.193785-1-stefanha@redhat.com> <20210210092628.193785-15-stefanha@redhat.com> <7a12b897-3157-7a2b-115b-cb6b263b147d@redhat.com> MIME-Version: 1.0 In-Reply-To: <7a12b897-3157-7a2b-115b-cb6b263b147d@redhat.com> User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Fam Zheng , Peter Maydell , thuth@redhat.com, Jagannathan Raman , Eduardo Habkost , qemu-block@nongnu.org, John G Johnson , Alex =?utf-8?Q?Benn=C3=A9e?= , "Michael S. Tsirkin" , Elena Ufimtseva , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Paolo Bonzini , Stefan Hajnoczi , Igor Mammedov , "Denis V. Lunev" , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Feb 11, 2021 at 04:34:40PM +0100, Max Reitz wrote: > 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. Opps, yes, this needs to be error_setg() not error_prepend() Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|