[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/38] hw/block/nvme: fix potential compilation error
From: |
Klaus Jensen |
Subject: |
[PULL 22/38] hw/block/nvme: fix potential compilation error |
Date: |
Mon, 8 Mar 2021 13:22:57 +0100 |
From: Gollu Appalanaidu <anaidu.gollu@samsung.com>
assert may be compiled to a noop and we could end up returning an
uninitialized status.
Fix this by always returning Internal Device Error as a fallback.
Note that, as pointed out by Philippe, per commit 262a69f4282 ("osdep.h:
Prohibit disabling assert() in supported builds") this shouldn't be
possible. But clean it up so we don't worry about it again.
Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
[k.jensen: split commit]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 478168de6eab..7b4adb906fb4 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1237,8 +1237,6 @@ static uint16_t nvme_check_zone_write(NvmeNamespace *ns,
NvmeZone *zone,
static uint16_t nvme_check_zone_state_for_read(NvmeZone *zone)
{
- uint16_t status;
-
switch (nvme_get_zone_state(zone)) {
case NVME_ZONE_STATE_EMPTY:
case NVME_ZONE_STATE_IMPLICITLY_OPEN:
@@ -1246,16 +1244,14 @@ static uint16_t nvme_check_zone_state_for_read(NvmeZone
*zone)
case NVME_ZONE_STATE_FULL:
case NVME_ZONE_STATE_CLOSED:
case NVME_ZONE_STATE_READ_ONLY:
- status = NVME_SUCCESS;
- break;
+ return NVME_SUCCESS;
case NVME_ZONE_STATE_OFFLINE:
- status = NVME_ZONE_OFFLINE;
- break;
+ return NVME_ZONE_OFFLINE;
default:
assert(false);
}
- return status;
+ return NVME_INTERNAL_DEV_ERROR;
}
static uint16_t nvme_check_zone_read(NvmeNamespace *ns, uint64_t slba,
--
2.30.1
- [PULL 17/38] hw/block/nvme: document 'mdts' nvme device parameter, (continued)
- [PULL 17/38] hw/block/nvme: document 'mdts' nvme device parameter, Klaus Jensen, 2021/03/08
- [PULL 18/38] hw/block/nvme: deduplicate bad mdts trace event, Klaus Jensen, 2021/03/08
- [PULL 20/38] hw/block/nvme: remove unnecessary endian conversion, Klaus Jensen, 2021/03/08
- [PULL 19/38] hw/block/nvme: align zoned.zasl with mdts, Klaus Jensen, 2021/03/08
- [PULL 28/38] hw/block/nvme: try to deal with the iov/qsg duality, Klaus Jensen, 2021/03/08
- [PULL 29/38] hw/block/nvme: remove the req dependency in map functions, Klaus Jensen, 2021/03/08
- [PULL 30/38] hw/block/nvme: refactor nvme_dma, Klaus Jensen, 2021/03/08
- [PULL 21/38] hw/block/nvme: add identify trace event, Klaus Jensen, 2021/03/08
- [PULL 24/38] hw/block/nvme: report non-mdts command size limit for dsm, Klaus Jensen, 2021/03/08
- [PULL 25/38] hw/block/nvme: remove redundant len member in compare context, Klaus Jensen, 2021/03/08
- [PULL 22/38] hw/block/nvme: fix potential compilation error,
Klaus Jensen <=
- [PULL 26/38] hw/block/nvme: remove block accounting for write zeroes, Klaus Jensen, 2021/03/08
- [PULL 23/38] hw/block/nvme: add trace event for zone read check, Klaus Jensen, 2021/03/08
- [PULL 31/38] hw/block/nvme: support namespace detach, Klaus Jensen, 2021/03/08
- [PULL 32/38] hw/block/nvme: fix namespaces array to 1-based, Klaus Jensen, 2021/03/08
- [PULL 27/38] hw/block/nvme: fix strerror printing, Klaus Jensen, 2021/03/08
- [PULL 33/38] hw/block/nvme: fix allocated namespace list to 256, Klaus Jensen, 2021/03/08
- [PULL 35/38] hw/block/nvme: refactor nvme_select_ns_iocs, Klaus Jensen, 2021/03/08
- [PULL 34/38] hw/block/nvme: support allocated namespace type, Klaus Jensen, 2021/03/08
- [PULL 37/38] hw/block/nvme: support changed namespace asynchronous event, Klaus Jensen, 2021/03/08
- [PULL 38/38] hw/block/nvme: support Identify NS Attached Controller List, Klaus Jensen, 2021/03/08