Re: [PATCH 12/16] nvme: add namespace helpers

[Philippe Mathieu-Daudé]

On 4/15/20 12:24 PM, Klaus Jensen wrote:
From: Klaus Jensen <k.jen...@samsung.com>
Introduce some small helpers to make the next patches easier on the eye.

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

diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index ad1786953be9..d9900bed957c 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -67,6 +67,17 @@ typedef struct NvmeNamespace {
      NvmeIdNs        id_ns;
  } NvmeNamespace;
  
+static inline NvmeLBAF *nvme_ns_lbaf(NvmeNamespace *ns)
+{
+    NvmeIdNs *id_ns = &ns->id_ns;
+    return &id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX(id_ns->flbas)];
+}
+
+static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns)
+{
+    return nvme_ns_lbaf(ns)->ds;
+}
+
  #define TYPE_NVME "nvme"
  #define NVME(obj) \
          OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)
@@ -101,4 +112,9 @@ typedef struct NvmeCtrl {
      NvmeIdCtrl      id_ctrl;
  } NvmeCtrl;
  
+static inline uint64_t nvme_ns_nlbas(NvmeCtrl *n, NvmeNamespace *ns)
+{
+    return n->ns_size >> nvme_ns_lbads(ns);
+}
+
  #endif /* HW_NVME_H */


Personally I'd use it directly in the same patch, this is one more hunk:

@@ -1455,18 +1469,9 @@ static void nvme_realize(PCIDevice *pci_dev, 
Error **errp)
[...]
-        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);
+            cpu_to_le64(nvme_ns_nlbas(n, ns));