From: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Date: Wed, 21 Apr 2021 12:56:46 +0000 (+0530)
Subject: hw/nvme: add identify namespace flbas/mc enums
X-Git-Tag: v6.1.0-rc0~49^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18de1526baa606789fbe11f17087543ab20a9c49;p=thirdparty%2Fqemu.git

hw/nvme: add identify namespace flbas/mc enums

Add enums for the Identify Namespace FLBAS and MC fields.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
[k.jensen: squashed separate flbas/mc commits into one]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---

diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index 992e5a13f53..8066e311d1a 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -82,10 +82,10 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp)
     ms = ns->params.ms;
 
     if (ns->params.ms) {
-        id_ns->mc = 0x3;
+        id_ns->mc = NVME_ID_NS_MC_EXTENDED | NVME_ID_NS_MC_SEPARATE;
 
         if (ns->params.mset) {
-            id_ns->flbas |= 0x10;
+            id_ns->flbas |= NVME_ID_NS_FLBAS_EXTENDED;
         }
 
         id_ns->dpc = 0x1f;
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 0ff9ce17a99..333affdb853 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -1341,6 +1341,15 @@ enum NvmeIdNsDps {
     NVME_ID_NS_DPS_FIRST_EIGHT = 8,
 };
 
+enum NvmeIdNsFlbas {
+    NVME_ID_NS_FLBAS_EXTENDED = 1 << 4,
+};
+
+enum NvmeIdNsMc {
+    NVME_ID_NS_MC_EXTENDED = 1 << 0,
+    NVME_ID_NS_MC_SEPARATE = 1 << 1,
+};
+
 #define NVME_ID_NS_DPS_TYPE(dps) (dps & NVME_ID_NS_DPS_TYPE_MASK)
 
 typedef struct NvmeDifTuple {