[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/56] hw/block/nvme: enum style fix
From: |
Klaus Jensen |
Subject: |
[PULL 24/56] hw/block/nvme: enum style fix |
Date: |
Tue, 9 Feb 2021 08:30:29 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
Align with existing style and use a typedef for header-file enums.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Tested-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
---
hw/block/nvme-ns.h | 4 ++--
include/block/nvme.h | 4 ++--
hw/block/nvme.c | 19 +++++++++----------
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h
index f8f3c28c360b..a0baa5f6d44c 100644
--- a/hw/block/nvme-ns.h
+++ b/hw/block/nvme-ns.h
@@ -102,12 +102,12 @@ static inline size_t nvme_l2b(NvmeNamespace *ns, uint64_t
lba)
typedef struct NvmeCtrl NvmeCtrl;
-static inline enum NvmeZoneState nvme_get_zone_state(NvmeZone *zone)
+static inline NvmeZoneState nvme_get_zone_state(NvmeZone *zone)
{
return zone->d.zs >> 4;
}
-static inline void nvme_set_zone_state(NvmeZone *zone, enum NvmeZoneState
state)
+static inline void nvme_set_zone_state(NvmeZone *zone, NvmeZoneState state)
{
zone->d.zs = state << 4;
}
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 9494246f1f59..45b2678db1f0 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -1212,7 +1212,7 @@ typedef struct QEMU_PACKED NvmeZoneDescr {
uint8_t rsvd32[32];
} NvmeZoneDescr;
-enum NvmeZoneState {
+typedef enum NvmeZoneState {
NVME_ZONE_STATE_RESERVED = 0x00,
NVME_ZONE_STATE_EMPTY = 0x01,
NVME_ZONE_STATE_IMPLICITLY_OPEN = 0x02,
@@ -1221,7 +1221,7 @@ enum NvmeZoneState {
NVME_ZONE_STATE_READ_ONLY = 0x0D,
NVME_ZONE_STATE_FULL = 0x0E,
NVME_ZONE_STATE_OFFLINE = 0x0F,
-};
+} NvmeZoneState;
static inline void _nvme_check_size(void)
{
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index a7245a7e05a1..a5cf798bbbaa 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -198,7 +198,7 @@ static uint16_t nvme_sqid(NvmeRequest *req)
}
static void nvme_assign_zone_state(NvmeNamespace *ns, NvmeZone *zone,
- enum NvmeZoneState state)
+ NvmeZoneState state)
{
if (QTAILQ_IN_USE(zone, entry)) {
switch (nvme_get_zone_state(zone)) {
@@ -1735,8 +1735,7 @@ static uint16_t nvme_get_mgmt_zone_slba_idx(NvmeNamespace
*ns, NvmeCmd *c,
return NVME_SUCCESS;
}
-typedef uint16_t (*op_handler_t)(NvmeNamespace *, NvmeZone *,
- enum NvmeZoneState);
+typedef uint16_t (*op_handler_t)(NvmeNamespace *, NvmeZone *, NvmeZoneState);
enum NvmeZoneProcessingMask {
NVME_PROC_CURRENT_ZONE = 0,
@@ -1747,7 +1746,7 @@ enum NvmeZoneProcessingMask {
};
static uint16_t nvme_open_zone(NvmeNamespace *ns, NvmeZone *zone,
- enum NvmeZoneState state)
+ NvmeZoneState state)
{
uint16_t status;
@@ -1780,7 +1779,7 @@ static uint16_t nvme_open_zone(NvmeNamespace *ns,
NvmeZone *zone,
}
static uint16_t nvme_close_zone(NvmeNamespace *ns, NvmeZone *zone,
- enum NvmeZoneState state)
+ NvmeZoneState state)
{
switch (state) {
case NVME_ZONE_STATE_EXPLICITLY_OPEN:
@@ -1796,7 +1795,7 @@ static uint16_t nvme_close_zone(NvmeNamespace *ns,
NvmeZone *zone,
}
static uint16_t nvme_finish_zone(NvmeNamespace *ns, NvmeZone *zone,
- enum NvmeZoneState state)
+ NvmeZoneState state)
{
switch (state) {
case NVME_ZONE_STATE_EXPLICITLY_OPEN:
@@ -1819,7 +1818,7 @@ static uint16_t nvme_finish_zone(NvmeNamespace *ns,
NvmeZone *zone,
}
static uint16_t nvme_reset_zone(NvmeNamespace *ns, NvmeZone *zone,
- enum NvmeZoneState state)
+ NvmeZoneState state)
{
switch (state) {
case NVME_ZONE_STATE_EXPLICITLY_OPEN:
@@ -1842,7 +1841,7 @@ static uint16_t nvme_reset_zone(NvmeNamespace *ns,
NvmeZone *zone,
}
static uint16_t nvme_offline_zone(NvmeNamespace *ns, NvmeZone *zone,
- enum NvmeZoneState state)
+ NvmeZoneState state)
{
switch (state) {
case NVME_ZONE_STATE_READ_ONLY:
@@ -1879,7 +1878,7 @@ static uint16_t nvme_bulk_proc_zone(NvmeNamespace *ns,
NvmeZone *zone,
op_handler_t op_hndlr)
{
uint16_t status = NVME_SUCCESS;
- enum NvmeZoneState zs = nvme_get_zone_state(zone);
+ NvmeZoneState zs = nvme_get_zone_state(zone);
bool proc_zone;
switch (zs) {
@@ -2077,7 +2076,7 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n,
NvmeRequest *req)
static bool nvme_zone_matches_filter(uint32_t zafs, NvmeZone *zl)
{
- enum NvmeZoneState zs = nvme_get_zone_state(zl);
+ NvmeZoneState zs = nvme_get_zone_state(zl);
switch (zafs) {
case NVME_ZONE_REPORT_ALL:
--
2.30.0
- [PULL 11/56] hw/block/nvme: Combine nvme_write_zeroes() and nvme_write(), (continued)
- [PULL 11/56] hw/block/nvme: Combine nvme_write_zeroes() and nvme_write(), Klaus Jensen, 2021/02/09
- [PULL 12/56] hw/block/nvme: Add Commands Supported and Effects log, Klaus Jensen, 2021/02/09
- [PULL 07/56] hw/block/nvme: fix bad clearing of CAP, Klaus Jensen, 2021/02/09
- [PULL 14/56] hw/block/nvme: Support allocated CNS command variants, Klaus Jensen, 2021/02/09
- [PULL 13/56] hw/block/nvme: Add support for Namespace Types, Klaus Jensen, 2021/02/09
- [PULL 15/56] nvme: Make ZNS-related definitions, Klaus Jensen, 2021/02/09
- [PULL 21/56] hw/block/nvme: conditionally enable DULBE for zoned namespaces, Klaus Jensen, 2021/02/09
- [PULL 18/56] hw/block/nvme: Support Zone Descriptor Extensions, Klaus Jensen, 2021/02/09
- [PULL 19/56] hw/block/nvme: Document zoned parameters in usage text, Klaus Jensen, 2021/02/09
- [PULL 16/56] hw/block/nvme: Support Zoned Namespace Command Set, Klaus Jensen, 2021/02/09
- [PULL 24/56] hw/block/nvme: enum style fix,
Klaus Jensen <=
- [PULL 39/56] hw/block/nvme: fix 64 bit register hi/lo split writes, Klaus Jensen, 2021/02/09
- [PULL 22/56] hw/block/nvme: fix shutdown/reset logic, Klaus Jensen, 2021/02/09
- [PULL 17/56] hw/block/nvme: Introduce max active and open zone limits, Klaus Jensen, 2021/02/09
- [PULL 20/56] hw/block/nvme: fix for non-msix machines, Klaus Jensen, 2021/02/09
- [PULL 23/56] hw/block/nvme: merge implicitly/explicitly opened processing masks, Klaus Jensen, 2021/02/09
- [PULL 28/56] hw/block/nvme: Correct error status for unaligned ZA, Klaus Jensen, 2021/02/09
- [PULL 27/56] hw/block/nvme: remove unnecessary check for append, Klaus Jensen, 2021/02/09
- [PULL 45/56] hw/block/nvme: disable PMR at boot up, Klaus Jensen, 2021/02/09
- [PULL 30/56] hw/block/nvme: open code for volatile write cache, Klaus Jensen, 2021/02/09
- [PULL 31/56] hw/block/nvme: remove unused argument in nvme_ns_init_blk, Klaus Jensen, 2021/02/09