From 18de1526baa606789fbe11f17087543ab20a9c49 Mon Sep 17 00:00:00 2001 From: Gollu Appalanaidu Date: Wed, 21 Apr 2021 18:26:46 +0530 Subject: hw/nvme: add identify namespace flbas/mc enums Add enums for the Identify Namespace FLBAS and MC fields. Signed-off-by: Gollu Appalanaidu [k.jensen: squashed separate flbas/mc commits into one] Signed-off-by: Klaus Jensen --- hw/nvme/ns.c | 4 ++-- include/block/nvme.h | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c index 992e5a13f5..8066e311d1 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 0ff9ce17a9..333affdb85 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 { -- cgit v1.2.3