Re: [PATCH 13/16] nvme: factor out namespace setup

[Philippe Mathieu-Daudé]

On 4/15/20 12:24 PM, Klaus Jensen wrote:

From: Klaus Jensen <k.jen...@samsung.com>

Signed-off-by: Klaus Jensen <k.jen...@samsung.com>
---
  hw/block/nvme.c | 47 ++++++++++++++++++++++++++---------------------
  1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index f0989cbb4335..08f7ae0a48b3 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1359,13 +1359,35 @@ static int nvme_init_blk(NvmeCtrl *n, Error **errp)
      return 0;
  }

+static int nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)

+{
+    int64_t bs_size;
+    NvmeIdNs *id_ns = &ns->id_ns;
+
+    bs_size = blk_getlength(n->conf.blk);
+    if (bs_size < 0) {
+        error_setg_errno(errp, -bs_size, "could not get backing file size");
+        return -1;
+    }
+
+    n->ns_size = bs_size;
+
+    id_ns->lbaf[0].ds = BDRV_SECTOR_BITS;
+    id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(n, ns));
+
+    /* no thin provisioning */
+    id_ns->ncap = id_ns->nsze;
+    id_ns->nuse = id_ns->ncap;
+
+    return 0;
+}
+
  static void nvme_realize(PCIDevice *pci_dev, Error **errp)
  {
      NvmeCtrl *n = NVME(pci_dev);
      NvmeIdCtrl *id = &n->id_ctrl;

int i;

-    int64_t bs_size;
      uint8_t *pci_conf;

if (nvme_check_constraints(n, errp)) {

@@ -1374,12 +1396,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error 
**errp)

nvme_init_state(n); - bs_size = blk_getlength(n->conf.blk);

-    if (bs_size < 0) {
-        error_setg(errp, "could not get backing file size");
-        return;
-    }
-
      if (nvme_init_blk(n, errp)) {
          return;
      }
@@ -1390,8 +1406,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
      pci_config_set_class(pci_dev->config, PCI_CLASS_STORAGE_EXPRESS);
      pcie_endpoint_cap_init(pci_dev, 0x80);

- n->ns_size = bs_size / (uint64_t)n->num_namespaces;

I'm not sure this line belong to this patch.

-
      memory_region_init_io(&n->iomem, OBJECT(n), &nvme_mmio_ops, n,
                            "nvme", n->reg_size);
      pci_register_bar(pci_dev, 0,
@@ -1455,18 +1469,9 @@ static void nvme_realize(PCIDevice *pci_dev, Error 
**errp)
      }

for (i = 0; i < n->num_namespaces; i++) {

-        NvmeNamespace *ns = &n->namespaces[i];
-        NvmeIdNs *id_ns = &ns->id_ns;
-        id_ns->nsfeat = 0;
-        id_ns->nlbaf = 0;
-        id_ns->flbas = 0;
-        id_ns->mc = 0;
-        id_ns->dpc = 0;
-        id_ns->dps = 0;
-        id_ns->lbaf[0].ds = BDRV_SECTOR_BITS;
-        id_ns->ncap  = id_ns->nuse = id_ns->nsze =
-            cpu_to_le64(n->ns_size >>
-                id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas)].ds);
+        if (nvme_init_namespace(n, &n->namespaces[i], errp)) {
+            return;
+        }
      }
  }