hw/nvme: add placement handle list ranges
Allow the placement handles to be specified as ranges, i.e. `fdp.ruhs=1:3-5` will attempt to assign ruh 1, 3, 4 and 5 to the namespace. Reviewed-by: Jesper Wendel Devantier <j.devantier@samsung.com> Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
parent
94fa8ca7ee
commit
ce8017736c
40
hw/nvme/ns.c
40
hw/nvme/ns.c
@ -400,8 +400,9 @@ static bool nvme_ns_init_fdp(NvmeNamespace *ns, Error **errp)
|
||||
NvmeRuHandle *ruh;
|
||||
uint8_t lbafi = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas);
|
||||
g_autofree unsigned int *ruhids = NULL;
|
||||
unsigned int *ruhid;
|
||||
char *r, *p, *token;
|
||||
unsigned int n, m, *ruhid;
|
||||
const char *endptr, *token;
|
||||
char *r, *p;
|
||||
uint16_t *ph;
|
||||
|
||||
if (!ns->params.fdp.ruhs) {
|
||||
@ -438,16 +439,39 @@ static bool nvme_ns_init_fdp(NvmeNamespace *ns, Error **errp)
|
||||
|
||||
/* parse the placement handle identifiers */
|
||||
while ((token = qemu_strsep(&p, ";")) != NULL) {
|
||||
if (ns->fdp.nphs++ == endgrp->fdp.nruh) {
|
||||
error_setg(errp, "too many placement handles");
|
||||
if (qemu_strtoui(token, &endptr, 0, &n) < 0) {
|
||||
error_setg(errp, "cannot parse reclaim unit handle identifier");
|
||||
free(r);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (qemu_strtoui(token, NULL, 0, ruhid++) < 0) {
|
||||
error_setg(errp, "cannot parse reclaim unit handle identifier");
|
||||
free(r);
|
||||
return false;
|
||||
m = n;
|
||||
|
||||
/* parse range */
|
||||
if (*endptr == '-') {
|
||||
token = endptr + 1;
|
||||
|
||||
if (qemu_strtoui(token, NULL, 0, &m) < 0) {
|
||||
error_setg(errp, "cannot parse reclaim unit handle identifier");
|
||||
free(r);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m < n) {
|
||||
error_setg(errp, "invalid reclaim unit handle identifier range");
|
||||
free(r);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
for (; n <= m; n++) {
|
||||
if (ns->fdp.nphs++ == endgrp->fdp.nruh) {
|
||||
error_setg(errp, "too many placement handles");
|
||||
free(r);
|
||||
return false;
|
||||
}
|
||||
|
||||
*ruhid++ = n;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user