From patchwork Mon May 21 08:58:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 10414363 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8EB89600CC for ; Mon, 21 May 2018 08:59:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8049B2879E for ; Mon, 21 May 2018 08:59:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75139287AC; Mon, 21 May 2018 08:59:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E72A12879E for ; Mon, 21 May 2018 08:59:55 +0000 (UTC) Received: from localhost ([::1]:49422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKgfb-0008IS-AK for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 May 2018 04:59:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKgeW-0006G2-Ak for qemu-devel@nongnu.org; Mon, 21 May 2018 04:58:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKgeV-00039E-Kn for qemu-devel@nongnu.org; Mon, 21 May 2018 04:58:48 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37562 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKgeR-00038K-BS; Mon, 21 May 2018 04:58:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CEDF0BB41B; Mon, 21 May 2018 08:58:42 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-101.pek2.redhat.com [10.72.12.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F2072166BAD; Mon, 21 May 2018 08:58:39 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 21 May 2018 16:58:34 +0800 Message-Id: <20180521085834.15632-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 21 May 2018 08:58:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 21 May 2018 08:58:42 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2] nvme: Make nvme_init error handling code more readable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , peter.maydell@linaro.org, Fam Zheng , qemu-block@nongnu.org, Max Reitz , pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- v2: Don't play stupid. [Peter] --- block/nvme.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/nvme.c b/block/nvme.c index 6f71122bf5..c2eb9e2a4e 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -566,6 +566,10 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, return ret; } + /* Fields we've not touched should be zero-initialized by block layer + * already, but reset it anyway to make the error handling code easier to + * reason. */ + s->regs = NULL; s->vfio = qemu_vfio_open_pci(device, errp); if (!s->vfio) { ret = -EINVAL;