From: Klaus Jensen <k.jensen@samsung.com>
Date: Thu, 1 Oct 2020 21:37:20 +0000 (+0200)
Subject: hw/block/nvme: update nsid when registered
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b20804946bce7545ec9758d82806ee30a21b6211;p=qemu.git

hw/block/nvme: update nsid when registered

If the user does not specify an nsid parameter on the nvme-ns device,
nvme_register_namespace will find the first free namespace id and assign
that.

This fix makes sure the assigned id is saved.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
---

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 5768a6804f..2225b944f9 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -2578,7 +2578,7 @@ int nvme_register_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)
         for (int i = 1; i <= n->num_namespaces; i++) {
             NvmeNamespace *ns = nvme_ns(n, i);
             if (!ns) {
-                nsid = i;
+                nsid = ns->params.nsid = i;
                 break;
             }
         }