From nobody Fri May 17 00:09:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668118139854976.9599866534833; Thu, 10 Nov 2022 14:08:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otFic-0000ET-LC; Thu, 10 Nov 2022 17:08:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otFia-0000Ba-8b; Thu, 10 Nov 2022 17:08:16 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otFiV-0007ba-E8; Thu, 10 Nov 2022 17:08:16 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id A63A85C00DA; Thu, 10 Nov 2022 17:08:10 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 10 Nov 2022 17:08:10 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 10 Nov 2022 17:08:09 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1668118090; x= 1668204490; bh=w79ngmaa0yVHyMHk4lu7wSgXhqkIB9pDZtu4N99wv3E=; b=q 3wtS8HxtEKs9LxKaWtec96RqDR++wzvMF067hQiHj5Ez5zkANsFRCGqm7d0x5bvG 03PBvy1RexkxLGhYzgEJO2ILeHKZMfzdQ9T5auBmk8uvit97SwRHFbgOEFCu5V0c a77GEZZyLA7RTsO4RdWVleagI0IVmtrYJhJskRgD24Eqt1gU+DhjfXckWGTpNVsi c7owCTQXpAMD5Ffmb+xtQauxsfN0PYc45r4Ucgn2D4R24nsh+6ZoSmv/RDIc+/h9 9ET9WKRJXG96Qqzav8wQf/a/JlOuomMiar6zCisgl5c01nJJuQpHGgazHr6l58Y6 UxYYzEUmYFbc21NmfGr1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1668118090; x= 1668204490; bh=w79ngmaa0yVHyMHk4lu7wSgXhqkIB9pDZtu4N99wv3E=; b=R oCRXmqYngY52g2UJsf+qNP8BAH9FRQaEknnscfaWv75Owtt0Jcwk78ieHxf5jVPQ XwJJP+AO1YKFWRFuoIkoRjB9FZRt/6JVfF0iv2SrGzfmoanmRCa2IbhqTdGKLFJI IBVSIA+S8Nb2s80ewufHabJN0j6PNa0jbfHhLmjNJkZJtKXE74HWjMjCccYPrHpV kFJLlKlopsmGTJ7rLbUxj/YKs0nOPZpnP0U5iohncMFCCaO/nDiKz7d+Rj/XARqf 0um+XmEhbP/aNz/QXriX2AsfSDzTUS1gA+KmCQXSizCkelpM0Uf0YFILWyyVir6E 509tsmFSnY4Ybp25lXaoA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrfeeggdduheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefmlhgr uhhsucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrg htthgvrhhnpeejieejjedviedtgeehieevuefghffgjefhvddtledufedtvddthffhieel keeuleenucffohhmrghinhepqhguvghvrdhiugenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Feedback-ID: idc91472f:Fastmail From: Klaus Jensen To: qemu-devel@nongnu.org Cc: Keith Busch , Klaus Jensen , Markus Armbruster , qemu-block@nongnu.org, Klaus Jensen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/2] hw/nvme: fix incorrect use of errp/local_err Date: Thu, 10 Nov 2022 23:08:04 +0100 Message-Id: <20221110220805.26816-2-its@irrelevant.dk> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110220805.26816-1-its@irrelevant.dk> References: <20221110220805.26816-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=6817; i=k.jensen@samsung.com; h=from:subject; bh=VHs1Ai0dI/NwJg2dqhwDBpUxHt7606UKC+LaQGUmslY=; b=owJ4nAFtAZL+kA0DAAoBTeGvMW1PDekByyZiAGNtdkXu6Xv22Hx1kIAIbEG//2PqtBS5ifLPrMQQ HcwCTh2rhYkBMwQAAQoAHRYhBFIoM6p14tzmokdmwE3hrzFtTw3pBQJjbXZFAAoJEE3hrzFtTw3p3D 4H/1+1jRi6Liz7OdBrK+YxxIj4PWVzubEgtNbO8mZd+hs+5h18ezjngvdffbWfeO6xe0ACs7dvzOmj 8MyI6w1Zn1SS94L+VIUq63cfewJAa8UITJoXSGV15sR6H6xt/Rau/QQgj8x7hOGGJN3Ftao7O7dkrB yANBhik0p5D6/8bGdD9GZ/sSOZObUxAySDW4iNb9rQCSePlULkM+++JFWXpjUGsklKTf8RuWQPIzgG blY6eoTIivZpbik0AwOBZYls50EWfB5Ar7esZSNroHu2FHPQVfvvn/n9xfjzWLw2f+eo3+Gc8cyCJX ELjlvjEBAi0NvHb9QvXj6Ik6Z2c6PEkEgc46u2 X-Developer-Key: i=k.jensen@samsung.com; a=openpgp; fpr=DDCA4D9C9EF931CC3468427263D56FC5E55DA838 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.26; envelope-from=its@irrelevant.dk; helo=out2-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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1668118140462100002 From: Klaus Jensen Remove an unnecessary local Error value in nvme_realize(). In the process, change nvme_check_constraints() into returning a bool. Finally, removing the local Error value also fixes a bug where an error returned from nvme_init_subsys() would be lost. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Klaus Jensen Reviewed-by: Markus Armbruster --- hw/nvme/ctrl.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index ac3885ce5079..a5c0a5fa6ce2 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -7035,7 +7035,7 @@ static const MemoryRegionOps nvme_cmb_ops =3D { }, }; =20 -static void nvme_check_constraints(NvmeCtrl *n, Error **errp) +static bool nvme_check_params(NvmeCtrl *n, Error **errp) { NvmeParams *params =3D &n->params; =20 @@ -7049,38 +7049,38 @@ static void nvme_check_constraints(NvmeCtrl *n, Err= or **errp) if (n->namespace.blkconf.blk && n->subsys) { error_setg(errp, "subsystem support is unavailable with legacy " "namespace ('drive' property)"); - return; + return false; } =20 if (params->max_ioqpairs < 1 || params->max_ioqpairs > NVME_MAX_IOQPAIRS) { error_setg(errp, "max_ioqpairs must be between 1 and %d", NVME_MAX_IOQPAIRS); - return; + return false; } =20 if (params->msix_qsize < 1 || params->msix_qsize > PCI_MSIX_FLAGS_QSIZE + 1) { error_setg(errp, "msix_qsize must be between 1 and %d", PCI_MSIX_FLAGS_QSIZE + 1); - return; + return false; } =20 if (!params->serial) { error_setg(errp, "serial property not set"); - return; + return false; } =20 if (n->pmr.dev) { if (host_memory_backend_is_mapped(n->pmr.dev)) { error_setg(errp, "can't use already busy memdev: %s", object_get_canonical_path_component(OBJECT(n->pmr.d= ev))); - return; + return false; } =20 if (!is_power_of_2(n->pmr.dev->size)) { error_setg(errp, "pmr backend size needs to be power of 2 in s= ize"); - return; + return false; } =20 host_memory_backend_set_mapped(n->pmr.dev, true); @@ -7089,64 +7089,64 @@ static void nvme_check_constraints(NvmeCtrl *n, Err= or **errp) if (n->params.zasl > n->params.mdts) { error_setg(errp, "zoned.zasl (Zone Append Size Limit) must be less= " "than or equal to mdts (Maximum Data Transfer Size)"); - return; + return false; } =20 if (!n->params.vsl) { error_setg(errp, "vsl must be non-zero"); - return; + return false; } =20 if (params->sriov_max_vfs) { if (!n->subsys) { error_setg(errp, "subsystem is required for the use of SR-IOV"= ); - return; + return false; } =20 if (params->sriov_max_vfs > NVME_MAX_VFS) { error_setg(errp, "sriov_max_vfs must be between 0 and %d", NVME_MAX_VFS); - return; + return false; } =20 if (params->cmb_size_mb) { error_setg(errp, "CMB is not supported with SR-IOV"); - return; + return false; } =20 if (n->pmr.dev) { error_setg(errp, "PMR is not supported with SR-IOV"); - return; + return false; } =20 if (!params->sriov_vq_flexible || !params->sriov_vi_flexible) { error_setg(errp, "both sriov_vq_flexible and sriov_vi_flexible" " must be set for the use of SR-IOV"); - return; + return false; } =20 if (params->sriov_vq_flexible < params->sriov_max_vfs * 2) { error_setg(errp, "sriov_vq_flexible must be greater than or eq= ual" " to %d (sriov_max_vfs * 2)", params->sriov_max_vfs= * 2); - return; + return false; } =20 if (params->max_ioqpairs < params->sriov_vq_flexible + 2) { error_setg(errp, "(max_ioqpairs - sriov_vq_flexible) must be" " greater than or equal to 2"); - return; + return false; } =20 if (params->sriov_vi_flexible < params->sriov_max_vfs) { error_setg(errp, "sriov_vi_flexible must be greater than or eq= ual" " to %d (sriov_max_vfs)", params->sriov_max_vfs); - return; + return false; } =20 if (params->msix_qsize < params->sriov_vi_flexible + 1) { error_setg(errp, "(msix_qsize - sriov_vi_flexible) must be" " greater than or equal to 1"); - return; + return false; } =20 if (params->sriov_max_vi_per_vf && @@ -7154,7 +7154,7 @@ static void nvme_check_constraints(NvmeCtrl *n, Error= **errp) error_setg(errp, "sriov_max_vi_per_vf must meet:" " (sriov_max_vi_per_vf - 1) %% %d =3D=3D 0 and" " sriov_max_vi_per_vf >=3D 1", NVME_VF_RES_GRANULAR= ITY); - return; + return false; } =20 if (params->sriov_max_vq_per_vf && @@ -7163,9 +7163,11 @@ static void nvme_check_constraints(NvmeCtrl *n, Erro= r **errp) error_setg(errp, "sriov_max_vq_per_vf must meet:" " (sriov_max_vq_per_vf - 1) %% %d =3D=3D 0 and" " sriov_max_vq_per_vf >=3D 2", NVME_VF_RES_GRANULAR= ITY); - return; + return false; } } + + return true; } =20 static void nvme_init_state(NvmeCtrl *n) @@ -7564,7 +7566,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **= errp) { NvmeCtrl *n =3D NVME(pci_dev); NvmeNamespace *ns; - Error *local_err =3D NULL; NvmeCtrl *pn =3D NVME(pcie_sriov_get_pf(pci_dev)); =20 if (pci_is_vf(pci_dev)) { @@ -7576,9 +7577,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **= errp) n->subsys =3D pn->subsys; } =20 - nvme_check_constraints(n, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (!nvme_check_params(n, errp)) { return; } =20 @@ -7586,7 +7585,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **= errp) &pci_dev->qdev, n->parent_obj.qdev.id); =20 if (nvme_init_subsys(n, errp)) { - error_propagate(errp, local_err); return; } nvme_init_state(n); --=20 2.38.1 From nobody Fri May 17 00:09:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668118139747397.05996337748206; Thu, 10 Nov 2022 14:08:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otFia-0000CG-Qw; Thu, 10 Nov 2022 17:08:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otFiZ-0000B4-7s; Thu, 10 Nov 2022 17:08:15 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otFiX-0007c8-9v; Thu, 10 Nov 2022 17:08:14 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 810A65C00A2; Thu, 10 Nov 2022 17:08:12 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 10 Nov 2022 17:08:12 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 10 Nov 2022 17:08:10 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1668118092; x= 1668204492; bh=eW30KnAabEUNjf3UdDgFBA3DGtsP+pJV6JjbhQYIajk=; b=u vWRizQWEcqzNMM/a48IyHT37l1IQdlDDImV1LTpRlPyXLJ6tQIoFYnh/xQ9MeXve tn/suFmSAfgsB6T3do0TJaCR86NwvgQOhMpyN7Li0QMVxZ0wmFNwaAXqC0BMJP56 KsbGi/kRiVsJAqLRJtXj7Tcn/rsTzBOm/Es/Pt2frN3JDhorLJbl0G8M/2r7RiUe lmrao3ERvPfwiSQnJq+p9FZn+/qPyg+LTARmyPv4osfdq9mgwybkRXsKy8kLnTzQ Eui/cPvQt7iJ6mm/5CTRUhW+7MRISQwzflswK/snk6zTByVjmSFavcJPmN0ULGiY Oxeg3IKA5NNZuWhzF6/gw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1668118092; x=1668204492; bh=eW30KnAabEUNj f3UdDgFBA3DGtsP+pJV6JjbhQYIajk=; b=LQ4US4K6UgBbDR/FrzkxEeJLqtJwc 0ay8nnWLt2hyXeqdmkCWEnFnkUzYVfo0OnH3rPTpA+twfpXV8MYQVINVbmvVeaJ5 qSMMqxEXG7kxkr2AwA3M1sUVEwMZ7z2eeltZ7M0xyUbcN5LmLZzOE0OkS9XEWuC/ 9380lgsDGYa3CRsL2Y/TiBhz1IYc+g8hIBuO/XAEOULabTKAw5U6Lz9qmvz+iUlu y+WMyrZUg6/shIBZX0TyRWfO5eBXdKLCKTeU4HttV/vVBYwJ7TcriAI04+umBiUs VuFoeceVMs5Tt0+TVqIAlWGxPWQM9cGJUb5FyjYahI6n8KnOGWD05y0Cg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrfeeggdduheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepjefgieelgfeiveehkeeuveehheekfeevgeeigfehfefgjeejhefffeegudej udegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepih htshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: Feedback-ID: idc91472f:Fastmail From: Klaus Jensen To: qemu-devel@nongnu.org Cc: Keith Busch , Klaus Jensen , Markus Armbruster , qemu-block@nongnu.org, Klaus Jensen Subject: [PATCH v3 2/2] hw/nvme: cleanup error reporting in nvme_init_pci() Date: Thu, 10 Nov 2022 23:08:05 +0100 Message-Id: <20221110220805.26816-3-its@irrelevant.dk> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110220805.26816-1-its@irrelevant.dk> References: <20221110220805.26816-1-its@irrelevant.dk> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2209; i=k.jensen@samsung.com; h=from:subject; bh=GthvvVhfrW2Vq9nvtXEFnSQddMXTd/AcnTQO8WztkaU=; b=owJ4nAFtAZL+kA0DAAoBTeGvMW1PDekByyZiAGNtdkXO341d1KKAzqLlcAwwXF33NcphP6U3XK/A 2y2wJ6IX5okBMwQAAQoAHRYhBFIoM6p14tzmokdmwE3hrzFtTw3pBQJjbXZFAAoJEE3hrzFtTw3pmC sH/2u63wg++EPUxLxOTNHSOEMHMme16ZD43Nvlb+RETqRun3zRCrhiagIvbQDgdBCcRIsfY7UfVTlW +apVJ4po2PB47S/nXXOAjLEuQKETY5acrT1r0ACSv4rRp0nZW2p1uezkk9jUamLJzPp/HcPl5pwYuV pitu0P68uj1l0VOpR6ABdq5nFNyhghQA9vhzCAfMhHJUzjm3Sv1sBvO1x9YQ2grdeECLf5rfqiOKg6 mh+91jTQO7p3Id3foIabUIu3yi9mV3FlhOiBJat9Z7YaqA/oHp4l3XrhK+N5E+VO2M9YRjC8nsmHkA tB2c7C1NyV1KbGeNwOdP7jc2K2MTlcawxN/69Q X-Developer-Key: i=k.jensen@samsung.com; a=openpgp; fpr=DDCA4D9C9EF931CC3468427263D56FC5E55DA838 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.26; envelope-from=its@irrelevant.dk; helo=out2-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1668118140453100001 Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Replace the local Error variable with errp and ERRP_GUARD() and change the return value to bool. Signed-off-by: Klaus Jensen Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvme/ctrl.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index a5c0a5fa6ce2..7d855523bb93 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -7343,15 +7343,14 @@ static int nvme_add_pm_capability(PCIDevice *pci_de= v, uint8_t offset) return 0; } =20 -static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) +static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) { + ERRP_GUARD(); uint8_t *pci_conf =3D pci_dev->config; uint64_t bar_size; unsigned msix_table_offset, msix_pba_offset; int ret; =20 - Error *err =3D NULL; - pci_conf[PCI_INTERRUPT_PIN] =3D 1; pci_config_set_prog_interface(pci_conf, 0x2); =20 @@ -7388,14 +7387,12 @@ static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pc= i_dev, Error **errp) } ret =3D msix_init(pci_dev, n->params.msix_qsize, &n->bar0, 0, msix_table_offset, - &n->bar0, 0, msix_pba_offset, 0, &err); - if (ret < 0) { - if (ret =3D=3D -ENOTSUP) { - warn_report_err(err); - } else { - error_propagate(errp, err); - return ret; - } + &n->bar0, 0, msix_pba_offset, 0, errp); + if (ret =3D=3D -ENOTSUP) { + warn_report_err(*errp); + *errp =3D NULL; + } else if (ret < 0) { + return false; } =20 nvme_update_msixcap_ts(pci_dev, n->conf_msix_qsize); @@ -7412,7 +7409,7 @@ static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_= dev, Error **errp) nvme_init_sriov(n, pci_dev, 0x120); } =20 - return 0; + return true; } =20 static void nvme_init_subnqn(NvmeCtrl *n) @@ -7588,7 +7585,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **= errp) return; } nvme_init_state(n); - if (nvme_init_pci(n, pci_dev, errp)) { + if (!nvme_init_pci(n, pci_dev, errp)) { return; } nvme_init_ctrl(n, pci_dev); --=20 2.38.1