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=-12.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,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 4EB95C4363A for ; Wed, 28 Oct 2020 11:11:58 +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 AC05D246AE for ; Wed, 28 Oct 2020 11:11:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iMu2Q++2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC05D246AE 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]:48222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXjMy-00016c-L1 for qemu-devel@archiver.kernel.org; Wed, 28 Oct 2020 07:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXjLZ-0008TL-B2 for qemu-devel@nongnu.org; Wed, 28 Oct 2020 07:10:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:27271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kXjLW-0005Pf-8E for qemu-devel@nongnu.org; Wed, 28 Oct 2020 07:10:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603883425; 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=ez05HQplgKTSEiVaJwlbAT5Hma6RJr+K+xCArVtnoAc=; b=iMu2Q++2VXsiQ/yNNvgQT2yA5os9911TR10eOobHf58uh6h/cROHE0cJM6Acaf5sjtpWAv Uc82N5DLVo/Z/EKST/ws2PWxOty7AUoVVDHKFi4s2sIPw6UXpIkJfT006fluKyYybL06WP H/8X5FK+WUCF7B+d4BKA21oGXYm6iHA= 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-34-wN_QrY2CMQyTzPhH1y9EVA-1; Wed, 28 Oct 2020 07:10:21 -0400 X-MC-Unique: wN_QrY2CMQyTzPhH1y9EVA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C3D01084C86; Wed, 28 Oct 2020 11:10:20 +0000 (UTC) Received: from [10.36.112.194] (ovpn-112-194.ams2.redhat.com [10.36.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56D5B5B4BC; Wed, 28 Oct 2020 11:10:14 +0000 (UTC) Subject: Re: [PATCH 12/25] block/nvme: Make nvme_init_queue() return boolean indicating error To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20201027135547.374946-1-philmd@redhat.com> <20201027135547.374946-13-philmd@redhat.com> From: Auger Eric Message-ID: <6ff35b3e-e502-c7a5-fd78-a198565d70c8@redhat.com> Date: Wed, 28 Oct 2020 12:10:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20201027135547.374946-13-philmd@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/28 01:51:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.921, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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 , Kevin Wolf , qemu-block@nongnu.org, Max Reitz , Keith Busch , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi, On 10/27/20 2:55 PM, Philippe Mathieu-Daudé wrote: > Just for consistency, following the example documented since > commit e3fe3988d7 ("error: Document Error API usage rules"), > return a boolean value indicating an error is set or not. > This simplifies a bit nvme_create_queue_pair(). also directly pass errp as the local_err is not requested in our case. > > Signed-off-by: Philippe Mathieu-Daudé > --- > block/nvme.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/block/nvme.c b/block/nvme.c > index 74994c442e5..9324f0bfdc4 100644 > --- a/block/nvme.c > +++ b/block/nvme.c > @@ -160,7 +160,8 @@ static QemuOptsList runtime_opts = { > }, > }; > > -static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q, > +/* Returns true on success, false on failure. */ > +static bool nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q, > unsigned nentries, size_t entry_bytes, Error **errp) > { > size_t bytes; > @@ -171,13 +172,14 @@ static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q, I personally prefer returning a conventional int instead of bool. > q->queue = qemu_try_memalign(s->page_size, bytes); > if (!q->queue) { > error_setg(errp, "Cannot allocate queue"); > - return; > + return false; > } > memset(q->queue, 0, bytes); > r = qemu_vfio_dma_map(s->vfio, q->queue, bytes, false, &q->iova); > if (r) { > error_setg(errp, "Cannot map queue"); > } > + return r == 0; also avoids that kind of conversion and use of !() in the called > } > > static void nvme_free_queue_pair(NVMeQueuePair *q) > @@ -210,7 +212,6 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s, > Error **errp) > { > int i, r; > - Error *local_err = NULL; > NVMeQueuePair *q; > uint64_t prp_list_iova; > > @@ -247,16 +248,12 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s, > req->prp_list_iova = prp_list_iova + i * s->page_size; > } > > - nvme_init_queue(s, &q->sq, size, NVME_SQ_ENTRY_BYTES, &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > + if (!nvme_init_queue(s, &q->sq, size, NVME_SQ_ENTRY_BYTES, errp)) { > goto fail; > } > q->sq.doorbell = &s->doorbells[idx * s->doorbell_scale].sq_tail; > > - nvme_init_queue(s, &q->cq, size, NVME_CQ_ENTRY_BYTES, &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > + if (!nvme_init_queue(s, &q->cq, size, NVME_CQ_ENTRY_BYTES, errp)) { > goto fail; > } > q->cq.doorbell = &s->doorbells[idx * s->doorbell_scale].cq_head; > Thanks Eric