From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 2984EC433E0 for ; Thu, 11 Feb 2021 13:14:34 +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 BA5FB64DFF for ; Thu, 11 Feb 2021 13:14:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA5FB64DFF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=irrelevant.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lABnk-0002tw-FQ for qemu-devel@archiver.kernel.org; Thu, 11 Feb 2021 08:14:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lABSJ-0001ms-7q; Thu, 11 Feb 2021 07:52:23 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:39901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lABSH-0005K3-4H; Thu, 11 Feb 2021 07:52:22 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 61D035C0159; Thu, 11 Feb 2021 07:52:20 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 11 Feb 2021 07:52:20 -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=jz9vKnW6xcIkE otVS8cqLKVxPFE29fdtqoOOvRMbArk=; b=mkxCoJ9lQuchD95wfddAfHbylIwcV BefsTn1PCwG5l6Nb2T4i5oRcYF9kV2fjs1W7HHmbMFBf66mGjt3Dn0UzXrs6ldfu BvqOsRknlUMSvLO8qL/uh6GiVdKU9hGqpGIP5hGMz6eX/QNXCSwLS1BIa2p9kBvi pWTkXXUs4DmyIC+vqNcmVuVSyQ7SapNdEhXiFJwUN23HqT24QKnlfKSwvSUuC8eX Y6Y6D4d48pxaCpSpO6m3YdHnQk2oVZp8YP76fNqIM0l2uyIuENovxxKiyLS7Owii UCafuHd3pGmkO+PQAiGwpcjF2v6i1efV4su5y03ILl4DEf5cmw7u3C7Jg== 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=jz9vKnW6xcIkEotVS8cqLKVxPFE29fdtqoOOvRMbArk=; b=d4qqg81F A0Ee/aODnkAizPPjSmOTOQmncg/Ij7Ow2GnuT6aQilz3reFit1KU/GZK1YqNSCuW RMNcdZS83I2RMm6ZbyaqA31Wja9Ek5hbhFr/mdqQtHvsLDaBDXj/XbJ6duWHKEe+ dxgpuzqHu8elV1mmIJbsQYQqMb2tPPbqzreQWvY1fLLjrwSaUKdQS3I9YvFoZqWp f/zTU+0S+gB0BvScd/6Bq6G3Ifsambi70zeoVN1jGtU461cgUmb74Tfc+cATBYgZ N+SQU+e/rw1A7lncQRvsM6evB/zYVcpIX44hFIHCcwYml7cz5abU4hvT6LKhPOLy LrFgJTPUydeL6A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheelgdegfecutefuodetggdotefrodftvf 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 A81D0108005B; Thu, 11 Feb 2021 07:52:18 -0500 (EST) From: Klaus Jensen To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 1/2] hw/block/nvme: fix legacy namespace registration Date: Thu, 11 Feb 2021 13:52:14 +0100 Message-Id: <20210211125215.985593-2-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210211125215.985593-1-its@irrelevant.dk> References: <20210211125215.985593-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.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+qemu-devel=archiver.kernel.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 Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 5ce21b7100b3..d36e14fe13e2 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -4507,6 +4507,12 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) 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; + } } } -- 2.30.0