From patchwork Thu Feb 11 15:21:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 1439560 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=irrelevant.dk header.i=@irrelevant.dk header.a=rsa-sha256 header.s=fm2 header.b=hi/OeyKx; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm2 header.b=Zep5RxOh; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Dc0ly3DHqz9rx8 for ; Fri, 12 Feb 2021 02:24:14 +1100 (AEDT) Received: from localhost ([::1]:33074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lADpE-0003zD-1B for incoming@patchwork.ozlabs.org; Thu, 11 Feb 2021 10:24:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lADmt-0003bC-PA; Thu, 11 Feb 2021 10:21:47 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lADmr-0003jD-Ua; Thu, 11 Feb 2021 10:21:47 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 1786E5C00DC; Thu, 11 Feb 2021 10:21:45 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 11 Feb 2021 10:21:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=BfmdEzUgdDIvb g50pRo8Nb4WiAmDuGDTyLLtnjnm9sc=; b=hi/OeyKxUxnP7QtVxRM/U6j/e7uPa viV9lVngoTTQrz3mPo88t8Ut3r+LVE80Lg3USCyfgTRqBlIX6u+JFg3SnwbEAiYr k+Mfh4n1BvUwRSvxb3dxRCeWtIznKW43TIAFb+wGutffKCLyKXc/836dUJZJAbWv 98E0k6HrgZwmTQscMD0D8MWaJGj3WAu/VwsNeinvUPULw2OJR4DCdMbLf+1thuLV IV7b+WyzQaX2dpowXPaja9MUdMvaYxY99H4pY1XIlYgFEKiGAsvjGoPGMHeHBBlw hZ8fzpfCsiGOKFC5VXzgBsXv82XIqgNkEMdd5U5iYEWv2jRndl4tqUoJg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=BfmdEzUgdDIvbg50pRo8Nb4WiAmDuGDTyLLtnjnm9sc=; b=Zep5RxOh VlqMy2SilF4RZiwoCE78chIJdjnf2I7KZ2HwhKBSub+0z4z5r+8vPK57XpONPAwW SDkTL3Z4Maq/KNJL5SC3oMaNA76dATtQGu+ghWZ0sOXCsxcbGEkjA0bYA5sIJjHn R5LrDrMFIH7LF5dolR3RBJmXZRMHK2f8AHOjw6JhZLwiOGRLJ86ROSDVo/S51HN3 6adNIoz7SWGtm/CJaLm679r4PcCP3QtOXtypafXAnYu4SSANuP8d4FfCFg7fmOEX CQ1BP50h9VGuByhkIpsgqr87PDKgTO6UJUiYUVPbKT/E0qceXk+37jpdKMBGBO5Q +ikpuxQoWHu3ng== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheelgdejgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghushcu lfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrthhtvg hrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffevgfek necukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 9E06324005B; Thu, 11 Feb 2021 10:21:42 -0500 (EST) From: Klaus Jensen To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL v2 1/3] hw/block/nvme: fix legacy namespace registration Date: Thu, 11 Feb 2021 16:21:37 +0100 Message-Id: <20210211152139.1004257-2-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210211152139.1004257-1-its@irrelevant.dk> References: <20210211152139.1004257-1-its@irrelevant.dk> MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Alexander Graf , Minwoo Im , Klaus Jensen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen Moving namespace registration to the nvme-ns realization function had the unintended side-effect of breaking legacy namespace registration. Fix this. Fixes: 15d024d4aa9b ("hw/block/nvme: split setup and register for namespace") Reported-by: Alexander Graf Cc: Minwoo Im Tested-by: Alexander Graf Reviewed-by: Minwoo Im Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 5ce21b7100b3..02390f1f5230 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -4507,6 +4507,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) if (nvme_ns_setup(ns, errp)) { return; } + + if (nvme_register_namespace(n, ns, errp)) { + return; + } } } From patchwork Thu Feb 11 15:21:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 1439559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=irrelevant.dk header.i=@irrelevant.dk header.a=rsa-sha256 header.s=fm2 header.b=shv9BHKV; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm2 header.b=VsjGooIC; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Dc0l84Rywz9sBy for ; Fri, 12 Feb 2021 02:23:30 +1100 (AEDT) Received: from localhost ([::1]:60498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lADoV-0003cu-Hv for incoming@patchwork.ozlabs.org; Thu, 11 Feb 2021 10:23:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lADmu-0003bR-0L; Thu, 11 Feb 2021 10:21:48 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:41331) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lADms-0003jc-F6; Thu, 11 Feb 2021 10:21:47 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B13C75C00F5; Thu, 11 Feb 2021 10:21:45 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 11 Feb 2021 10:21:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=fm2; bh= BUB+PaVtIckRpPtKtaCZru27TXBaa+MPpa0dMGEOpKI=; b=shv9BHKVYrPZzgy5 Dtn7PAiKOtrOEufdA7m96UP3Zov5RuiZbONiZ7dC+Ls/N5YqWCkkq5nwBNciHz4b Kcr+Gv6ILLsEfRykhfzYdj5Tdcdq7cYwiN0W+DMNE4oibze9uFOqHCrQNOHZdO4T Da8MqIEWSrJ1BcaX+m8wXB1UhGlCj4qPIBjqJApPvDDhoTCP2N/zfioIPkXe4m4H 4GECOXTJAObCBaM4SLW3UkDvOiCIWJMU25JGLpMs9/PUb9BJhwgw5b3UK41+PMB3 x15mA3bOYOXbD95Ln+094T9z7RtJ5lUiaHi4T/VtrreKqnWaWdZQLIO6JMqGYhHB 65mHIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=BUB+PaVtIckRpPtKtaCZru27TXBaa+MPpa0dMGEOp KI=; b=VsjGooICZdZRSRW2b3hjFsyhpxscBotRs0b4qbcGaofuF0FM+AKo/KHDx VcFUOBp0ghKr+unqJJXHcbEVifhzj35OcuUHT18ZXG33mhJWBSJ8p93TChAUQtEK eyPcAsH8gKJ9Z3MjIChZ5Y+rQlvR+11jmA7hb4OWWgyHQ86lEH1rAcpDApGbXm2d s3fcQ4hAG2bqn8rNLAJ9ITHAI+rtpH/5xe4edovLRcjiyOYgmL9EoIYGj0xOm2k/ zBfn9UoWRLCe0XlTnuMwQ7aTEILhZKdD0SPDudMD7UZCfM/4tmolDkxiNyx2EJv9 ehIeLvTlrPNw9fJyDB7QtXdbI4lyw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheelgdejgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeetveeuudegveeiheegieelueeftedvtdekteefleegheduhfejueelvdfhffdt geenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 18223240057; Thu, 11 Feb 2021 10:21:43 -0500 (EST) From: Klaus Jensen To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL v2 2/3] hw/block/nvme: Fix a build error in nvme_get_feature() Date: Thu, 11 Feb 2021 16:21:38 +0100 Message-Id: <20210211152139.1004257-3-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210211152139.1004257-1-its@irrelevant.dk> References: <20210211152139.1004257-1-its@irrelevant.dk> MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Bin Meng , Max Reitz , Keith Busch , Klaus Jensen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Current QEMU HEAD nvme.c does not compile with the default GCC 5.4 on a Ubuntu 16.04 host: hw/block/nvme.c:3242:9: error: ‘result’ may be used uninitialized in this function [-Werror=maybe-uninitialized] trace_pci_nvme_getfeat_vwcache(result ? "enabled" : "disabled"); ^ hw/block/nvme.c:3150:14: note: ‘result’ was declared here uint32_t result; ^ Explicitly initialize the result to fix it. Fixes: aa5e55e3b07e ("hw/block/nvme: open code for volatile write cache") Fixes: Coverity CID 1446371 Signed-off-by: Bin Meng Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 02390f1f5230..fb83636abdc1 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -3228,6 +3228,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeRequest *req) result = ns->features.err_rec; goto out; case NVME_VOLATILE_WRITE_CACHE: + result = 0; for (i = 1; i <= n->num_namespaces; i++) { ns = nvme_ns(n, i); if (!ns) { From patchwork Thu Feb 11 15:21:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 1439563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=irrelevant.dk header.i=@irrelevant.dk header.a=rsa-sha256 header.s=fm2 header.b=KSwWcyF+; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm2 header.b=iq8nCxv6; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Dc0th0bXwz9s1l for ; Fri, 12 Feb 2021 02:30:04 +1100 (AEDT) Received: from localhost ([::1]:42392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lADuq-00083i-IA for incoming@patchwork.ozlabs.org; Thu, 11 Feb 2021 10:30:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lADmv-0003cI-6Z; Thu, 11 Feb 2021 10:21:49 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:53103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lADmt-0003k7-Nf; Thu, 11 Feb 2021 10:21:48 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id EE6E15C00A4; Thu, 11 Feb 2021 10:21:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 11 Feb 2021 10:21:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=/qiaKh/Umj0v0 u+CwNpOqgCztOzHKADBAylv/jX6NO0=; b=KSwWcyF+VeaZ1APqiVZtM7rLL1pF4 hQRF0AUYApY6hmCUYhNxfHFUPkMSWj+mowiensG8QiQ/seAHhRJgEp5pf1gn+a6o 2ycKBKHn48e1SDq51c4uqdlI1XfxjVGLMXXJ3dyImsPyBatm+qLQoEizUasccFIJ FegsfIjJF/XgahTjQj4pWX+Y97RkWtWxQUj2kwdE9t252z3bXDB2mRMstiYhnOv/ 0tAV1P0ZfErQBUuc5Nc0Td6W5FlNGZnLnnastZbPAn3QocRWzLv9Xar4Wac2IS+Y t+KcpwoR+1AlFPmJ32SxhpZfJN/Xp85xWznzSYcVD9mm7oCy/aUn19sLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=/qiaKh/Umj0v0u+CwNpOqgCztOzHKADBAylv/jX6NO0=; b=iq8nCxv6 qXWksR/9bEzL+yXKXBifIUrHnT9O+Q1skbW0r89cDfMYn+DYLe1RHNHl1PVXq9Z1 +9S9KOHrgvtE+aQxwO6JlpiWTqhinOMc8yoTfoGjJLoFt0bptFm5L5UiOeiSEjLj 6+NX/fFlQA1gphrEHXmKlhsazvD2FkmMU335lR3s9mO4A+MZTlDSCF2WKmnrAwo+ ldKS/PTcVY1TGJKJHYkiFWiw/JvoE4zOFfe1qlBXKPdtZ/WQrmpkH2pDv/R5wKyj 0EeAEol1yK8veDSBg6Xhpj08ffJ7euPfS25uPrBVmPwRafuzo1JCIQCxUYE/hDhC k1613lCsT2uHNg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheelgdejgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghushcu lfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrthhtvg hrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffevgfek necukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 6DBFA240062; Thu, 11 Feb 2021 10:21:45 -0500 (EST) From: Klaus Jensen To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL v2 3/3] hw/block/nvme: fix error handling in nvme_ns_realize Date: Thu, 11 Feb 2021 16:21:39 +0100 Message-Id: <20210211152139.1004257-4-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210211152139.1004257-1-its@irrelevant.dk> References: <20210211152139.1004257-1-its@irrelevant.dk> MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Minwoo Im , Klaus Jensen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen nvme_ns_realize passes errp to nvme_register_namespaces, but then try to prepend errp with local_err. Just remove the local_err and use errp directly. Fixes: 15d024d4aa9b ("hw/block/nvme: split setup and register for namespace") Cc: Minwoo Im Reviewed-by: Minwoo Im Signed-off-by: Klaus Jensen --- hw/block/nvme-ns.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index dfed71a950fa..93ac6e107a09 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -358,17 +358,12 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp) NvmeNamespace *ns = NVME_NS(dev); BusState *s = qdev_get_parent_bus(dev); NvmeCtrl *n = NVME(s->parent); - Error *local_err = NULL; - if (nvme_ns_setup(ns, &local_err)) { - error_propagate_prepend(errp, local_err, - "could not setup namespace: "); + if (nvme_ns_setup(ns, errp)) { return; } if (nvme_register_namespace(n, ns, errp)) { - error_propagate_prepend(errp, local_err, - "could not register namespace: "); return; }