[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/20] hw/block/nvme: rename __nvme_zrm_open
From: |
Klaus Jensen |
Subject: |
[PULL 07/20] hw/block/nvme: rename __nvme_zrm_open |
Date: |
Mon, 17 May 2021 11:17:24 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Get rid of the (reserved) double underscore use. Rename the "generic"
zone open function to nvme_zrm_open_flags() and add a generic `int
flags` argument instead which allows more flags to be easily added in
the future. There is at least one TP under standardization that would
add an additional flag.
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
---
hw/block/nvme.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index baba949660f2..9e5ab4cacb06 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1694,8 +1694,12 @@ static void nvme_zrm_auto_transition_zone(NvmeNamespace
*ns)
}
}
-static uint16_t __nvme_zrm_open(NvmeNamespace *ns, NvmeZone *zone,
- bool implicit)
+enum {
+ NVME_ZRM_AUTO = 1 << 0,
+};
+
+static uint16_t nvme_zrm_open_flags(NvmeNamespace *ns, NvmeZone *zone,
+ int flags)
{
int act = 0;
uint16_t status;
@@ -1719,7 +1723,7 @@ static uint16_t __nvme_zrm_open(NvmeNamespace *ns,
NvmeZone *zone,
nvme_aor_inc_open(ns);
- if (implicit) {
+ if (flags & NVME_ZRM_AUTO) {
nvme_assign_zone_state(ns, zone, NVME_ZONE_STATE_IMPLICITLY_OPEN);
return NVME_SUCCESS;
}
@@ -1727,7 +1731,7 @@ static uint16_t __nvme_zrm_open(NvmeNamespace *ns,
NvmeZone *zone,
/* fallthrough */
case NVME_ZONE_STATE_IMPLICITLY_OPEN:
- if (implicit) {
+ if (flags & NVME_ZRM_AUTO) {
return NVME_SUCCESS;
}
@@ -1745,12 +1749,12 @@ static uint16_t __nvme_zrm_open(NvmeNamespace *ns,
NvmeZone *zone,
static inline uint16_t nvme_zrm_auto(NvmeNamespace *ns, NvmeZone *zone)
{
- return __nvme_zrm_open(ns, zone, true);
+ return nvme_zrm_open_flags(ns, zone, NVME_ZRM_AUTO);
}
static inline uint16_t nvme_zrm_open(NvmeNamespace *ns, NvmeZone *zone)
{
- return __nvme_zrm_open(ns, zone, false);
+ return nvme_zrm_open_flags(ns, zone, 0);
}
static void __nvme_advance_zone_wp(NvmeNamespace *ns, NvmeZone *zone,
--
2.31.1
- [PULL 00/20] emulated nvme updates, Klaus Jensen, 2021/05/17
- [PULL 01/20] hw/block/nvme: remove redundant invalid_lba_range trace, Klaus Jensen, 2021/05/17
- [PULL 02/20] hw/block/nvme: rename reserved fields declarations, Klaus Jensen, 2021/05/17
- [PULL 03/20] hw/block/nvme: consider metadata read aio return value in compare, Klaus Jensen, 2021/05/17
- [PULL 04/20] hw/block/nvme: fix io-command set profile feature, Klaus Jensen, 2021/05/17
- [PULL 05/20] hw/block/nvme: function formatting fix, Klaus Jensen, 2021/05/17
- [PULL 06/20] hw/block/nvme: align with existing style, Klaus Jensen, 2021/05/17
- [PULL 07/20] hw/block/nvme: rename __nvme_zrm_open,
Klaus Jensen <=
- [PULL 08/20] hw/block/nvme: rename __nvme_advance_zone_wp, Klaus Jensen, 2021/05/17
- [PULL 09/20] hw/block/nvme: rename __nvme_select_ns_iocs, Klaus Jensen, 2021/05/17
- [PULL 11/20] hw/block/nvme: cleanup includes, Klaus Jensen, 2021/05/17
- [PULL 12/20] hw/block/nvme: remove non-shared defines from header file, Klaus Jensen, 2021/05/17
- [PULL 10/20] hw/block/nvme: consolidate header files, Klaus Jensen, 2021/05/17
- [PULL 13/20] hw/block/nvme: replace nvme_ns_status, Klaus Jensen, 2021/05/17
- [PULL 15/20] hw/block/nvme: add metadata offset helper, Klaus Jensen, 2021/05/17
- [PULL 14/20] hw/block/nvme: cache lba and ms sizes, Klaus Jensen, 2021/05/17
- [PULL 16/20] hw/block/nvme: streamline namespace array indexing, Klaus Jensen, 2021/05/17
- [PULL 17/20] hw/block/nvme: remove num_namespaces member, Klaus Jensen, 2021/05/17