From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKgcU-0004p9-Kz for qemu-devel@nongnu.org; Mon, 21 May 2018 04:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKgcT-0002fq-Ru for qemu-devel@nongnu.org; Mon, 21 May 2018 04:56:42 -0400 Date: Mon, 21 May 2018 16:56:33 +0800 From: Fam Zheng Message-ID: <20180521085633.GA12591@lemon.usersys.redhat.com> References: <20180521063516.5479-1-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH] nvme: Make nvme_init error handling code more readable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers , Kevin Wolf , Paolo Bonzini , Qemu-block , Max Reitz On Mon, 05/21 09:35, Peter Maydell wrote: > On 21 May 2018 at 07:35, Fam Zheng wrote: > > Coverity doesn't like the tests under fail label (report CID 1385847). > > Reset the fields so the clean up order is more apparent. > > > > Signed-off-by: Fam Zheng > > --- > > block/nvme.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/block/nvme.c b/block/nvme.c > > index 6f71122bf5..8239b920c8 100644 > > --- a/block/nvme.c > > +++ b/block/nvme.c > > @@ -560,6 +560,13 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, > > qemu_co_queue_init(&s->dma_flush_queue); > > s->nsid = namespace; > > s->aio_context = bdrv_get_aio_context(bs); > > + > > + /* Fields we've not touched should be zero-initialized by block layer > > + * already, but reset them anyway to make the error handling code easier to > > + * reason. */ > > + s->regs = NULL; > > + s->vfio = NULL; > > + > > ret = event_notifier_init(&s->irq_notifier, 0); > > if (ret) { > > error_setg(errp, "Failed to init event notifier"); > > I suspect that either coverity or some compilers will complain that > the assignment to s->vfio here is redundant, because we'll either > return early without looking at it, or we'll get to the assignment > s->vfio = qemu_vfio_open_pci(...) > which overrides it. Hmm, okay, the compiler wants you to be at least as smart as it is, but no smarter! I will revise the patch. Fam