From b62b178c37718c988f64660b13c3e4f2c7d71a78 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 23 Mar 2021 11:18:25 +0000 Subject: [PATCH 1/2] hw/block/nvme: remove description for zoned.append_size_limit The description was originally removed in commit 578d914b263c ("hw/block/nvme: align zoned.zasl with mdts") together with the removal of the zoned.append_size_limit parameter itself. However, it was (most likely accidentally), re-added in commit f7dcd31885cb ("hw/block/nvme: add non-mdts command size limit for verify"). Remove the description again, since the parameter it describes, zoned.append_size_limit, no longer exists. Signed-off-by: Niklas Cassel Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index c54ec3c952..08c204d46c 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -91,14 +91,6 @@ * the minimum memory page size (CAP.MPSMIN). The default value is 0 (i.e. * defaulting to the value of `mdts`). * - * - `zoned.append_size_limit` - * The maximum I/O size in bytes that is allowed in Zone Append command. - * The default is 128KiB. Since internally this this value is maintained as - * ZASL = log2( / ), some values assigned - * to this property may be rounded down and result in a lower maximum ZA - * data size being in effect. By setting this property to 0, users can make - * ZASL to be equal to MDTS. This property only affects zoned namespaces. - * * nvme namespace device parameters * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - `subsys` From 498114b37bc99fddcfc24b92bff7f1323fb32672 Mon Sep 17 00:00:00 2001 From: Joelle van Dyne Date: Mon, 22 Mar 2021 01:24:44 -0700 Subject: [PATCH 2/2] hw/block/nvme: expose 'bootindex' property The check for `n->namespace.blkconf.blk` always fails because this is in the initialization function. Signed-off-by: Joelle van Dyne Reviewed-by: Klaus Jensen Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 08c204d46c..7244534a89 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -6328,11 +6328,9 @@ static void nvme_instance_init(Object *obj) { NvmeCtrl *n = NVME(obj); - if (n->namespace.blkconf.blk) { - device_add_bootindex_property(obj, &n->namespace.blkconf.bootindex, - "bootindex", "/namespace@1,0", - DEVICE(obj)); - } + device_add_bootindex_property(obj, &n->namespace.blkconf.bootindex, + "bootindex", "/namespace@1,0", + DEVICE(obj)); object_property_add(obj, "smart_critical_warning", "uint8", nvme_get_smart_warning,