[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/9] hw/block/nvme: add uuid namespace parameter
From: |
Klaus Jensen |
Subject: |
[PATCH v3 2/9] hw/block/nvme: add uuid namespace parameter |
Date: |
Wed, 14 Oct 2020 13:31:15 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Add the 'uuid' nvme-ns device parameter such that users who requires a
persistent namespace UUID can explicitly specify it.
If not specified, the property will autogenerate an UUID for each QEMU
invocation.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme-ns.h | 1 +
hw/block/nvme-ns.c | 1 +
hw/block/nvme.c | 12 ++++--------
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h
index 44bf6271b744..8951fc5e86b8 100644
--- a/hw/block/nvme-ns.h
+++ b/hw/block/nvme-ns.h
@@ -21,6 +21,7 @@
typedef struct NvmeNamespaceParams {
uint32_t nsid;
+ QemuUUID uuid;
} NvmeNamespaceParams;
typedef struct NvmeNamespace {
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index 475c6fe44084..dff3e308e31b 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -130,6 +130,7 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp)
static Property nvme_ns_props[] = {
DEFINE_BLOCK_PROPERTIES(NvmeNamespace, blkconf),
DEFINE_PROP_UINT32("nsid", NvmeNamespace, params.nsid, 0),
+ DEFINE_PROP_UUID("uuid", NvmeNamespace, params.uuid),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 8d0d96f42e61..aaea0436fd05 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1632,6 +1632,7 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n,
NvmeRequest *req)
NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
uint32_t nsid = le32_to_cpu(c->nsid);
uint8_t list[NVME_IDENTIFY_DATA_SIZE];
+ NvmeNamespace *ns;
struct data {
struct {
@@ -1648,21 +1649,16 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl
*n, NvmeRequest *req)
return NVME_INVALID_NSID | NVME_DNR;
}
- if (unlikely(!nvme_ns(n, nsid))) {
+ ns = nvme_ns(n, nsid);
+ if (unlikely(!ns)) {
return NVME_INVALID_FIELD | NVME_DNR;
}
memset(list, 0x0, sizeof(list));
- /*
- * Because the NGUID and EUI64 fields are 0 in the Identify Namespace data
- * structure, a Namespace UUID (nidt = 0x3) must be reported in the
- * Namespace Identification Descriptor. Add a very basic Namespace UUID
- * here.
- */
ns_descrs->uuid.hdr.nidt = NVME_NIDT_UUID;
ns_descrs->uuid.hdr.nidl = NVME_NIDT_UUID_LEN;
- stl_be_p(&ns_descrs->uuid.v, nsid);
+ memcpy(ns_descrs->uuid.v, ns->params.uuid.data, 16);
return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE,
DMA_DIRECTION_FROM_DEVICE, req);
--
2.28.0
- [PATCH v3 0/9] hw/block/nvme: zoned namespace command set, Klaus Jensen, 2020/10/14
- [PATCH v3 1/9] hw/block/nvme: add commands supported and effects log page, Klaus Jensen, 2020/10/14
- [PATCH v3 2/9] hw/block/nvme: add uuid namespace parameter,
Klaus Jensen <=
- [PATCH v3 4/9] hw/block/nvme: add basic read/write for zoned namespaces, Klaus Jensen, 2020/10/14
- [PATCH v3 6/9] hw/block/nvme: add the zone management send command, Klaus Jensen, 2020/10/14
- [PATCH v3 3/9] hw/block/nvme: support namespace types, Klaus Jensen, 2020/10/14
- [PATCH v3 7/9] hw/block/nvme: add the zone append command, Klaus Jensen, 2020/10/14
- [PATCH v3 5/9] hw/block/nvme: add the zone management receive command, Klaus Jensen, 2020/10/14
- [PATCH v3 8/9] hw/block/nvme: track and enforce zone resources, Klaus Jensen, 2020/10/14
- [PATCH v3 9/9] hw/block/nvme: allow open to close zone transitions by controller, Klaus Jensen, 2020/10/14