diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-04-05 22:15:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-05 22:15:38 +0100 |
| commit | 109918d24a3bb9ed3d05beb34ea4ac6be443c138 (patch) | |
| tree | deb3e2f92241faf4a48096da3eaa379d1c4768c5 | |
| parent | ee82c086baaa534d1af26cb8b86e86fb047af918 (diff) | |
| parent | 498114b37bc99fddcfc24b92bff7f1323fb32672 (diff) | |
Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging
emulated nvme fixes
# gpg: Signature made Mon 05 Apr 2021 18:33:34 BST
# gpg: using RSA key 522833AA75E2DCE6A24766C04DE1AF316D4F0DE9
# gpg: Good signature from "Klaus Jensen <its@irrelevant.dk>" [unknown]
# gpg: aka "Klaus Jensen <k.jensen@samsung.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DDCA 4D9C 9EF9 31CC 3468 4272 63D5 6FC5 E55D A838
# Subkey fingerprint: 5228 33AA 75E2 DCE6 A247 66C0 4DE1 AF31 6D4F 0DE9
* remotes/nvme/tags/nvme-fixes-for-6.0-pull-request:
hw/block/nvme: expose 'bootindex' property
hw/block/nvme: remove description for zoned.append_size_limit
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/block/nvme.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index c54ec3c952..7244534a89 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(<maximum append size> / <page size>), 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` @@ -6336,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, |