mirror of
https://github.com/qemu/qemu.git
synced 2024-12-15 07:23:52 +08:00
hw/block/nvme: fix potential compilation error
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 262a69f428
("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>
This commit is contained in:
parent
49f0eba8b2
commit
f4f872b532
@ -1246,8 +1246,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:
|
||||
@ -1255,16 +1253,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,
|
||||
|
Loading…
Reference in New Issue
Block a user