hw/block/nvme: Generate namespace UUIDs
In NVMe 1.4, a namespace must report an ID descriptor of UUID type if it doesn't support EUI64 or NGUID. Add a new namespace property, "uuid", that provides the user the option to either specify the UUID explicitly or have a UUID generated automatically every time a namespace is initialized. Suggested-by: Klaus Jensen <k.jensen@samsung.com> Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> Reviewed-by: Keith Busch <kbusch@kernel.org> Reviewed-by: Niklas Cassel <Niklas.Cassel@wdc.com> Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
parent
ba69f22481
commit
b52f26cd1f
@ -151,6 +151,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(),
|
||||
};
|
||||
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
typedef struct NvmeNamespaceParams {
|
||||
uint32_t nsid;
|
||||
QemuUUID uuid;
|
||||
} NvmeNamespaceParams;
|
||||
|
||||
typedef struct NvmeNamespace {
|
||||
|
@ -1765,6 +1765,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req)
|
||||
|
||||
static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req)
|
||||
{
|
||||
NvmeNamespace *ns;
|
||||
NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
|
||||
uint32_t nsid = le32_to_cpu(c->nsid);
|
||||
uint8_t list[NVME_IDENTIFY_DATA_SIZE];
|
||||
@ -1784,7 +1785,8 @@ 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;
|
||||
}
|
||||
|
||||
@ -1793,12 +1795,11 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req)
|
||||
/*
|
||||
* 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.
|
||||
* Namespace Identification Descriptor. Add the 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, NVME_NIDT_UUID_LEN);
|
||||
|
||||
return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE,
|
||||
DMA_DIRECTION_FROM_DEVICE, req);
|
||||
|
Loading…
Reference in New Issue
Block a user