[PULL,1/2] hw/block/nvme: fix legacy namespace registration

Commit Message

Klaus Jensen Feb. 11, 2021, 12:52 p.m. UTC

From: Klaus Jensen <[e-mail]>

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 <[e-mail]>
Cc: Minwoo Im <[e-mail]>
Tested-by: Alexander Graf <[e-mail]>
Signed-off-by: Klaus Jensen <[e-mail]>
---
 hw/block/nvme.c | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

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;
+        }
     }
 }