[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/14] hw/block/nvme: remove non-shared defines from header file
From: |
Klaus Jensen |
Subject: |
[PATCH 06/14] hw/block/nvme: remove non-shared defines from header file |
Date: |
Mon, 19 Apr 2021 21:27:53 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Remove non-shared defines from the shared header.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.h | 2 --
hw/block/nvme-ns.c | 1 +
hw/block/nvme.c | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index d9374d3e33e0..2c4e7b90fa54 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -24,8 +24,6 @@
#include "block/nvme.h"
-#define NVME_DEFAULT_ZONE_SIZE (128 * MiB)
-#define NVME_DEFAULT_MAX_ZA_SIZE (128 * KiB)
#define NVME_MAX_CONTROLLERS 32
#define NVME_MAX_NAMESPACES 256
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index aae06987e49a..35c146633223 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -23,6 +23,7 @@
#include "trace.h"
#define MIN_DISCARD_GRANULARITY (4 * KiB)
+#define NVME_DEFAULT_ZONE_SIZE (128 * MiB)
void nvme_ns_init_format(NvmeNamespace *ns)
{
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index f7c5e83e6800..2c0af579e7a8 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -159,6 +159,7 @@
#define NVME_TEMPERATURE_WARNING 0x157
#define NVME_TEMPERATURE_CRITICAL 0x175
#define NVME_NUM_FW_SLOTS 1
+#define NVME_DEFAULT_MAX_ZA_SIZE (128 * KiB)
#define NVME_GUEST_ERR(trace, fmt, ...) \
do { \
--
2.31.1
- [PATCH 01/14] hw/block/nvme: rename __nvme_zrm_open, (continued)
- [PATCH 01/14] hw/block/nvme: rename __nvme_zrm_open, Klaus Jensen, 2021/04/19
- [PATCH 02/14] hw/block/nvme: rename __nvme_advance_zone_wp, Klaus Jensen, 2021/04/19
- [PATCH 03/14] hw/block/nvme: rename __nvme_select_ns_iocs, Klaus Jensen, 2021/04/19
- [PATCH 07/14] hw/block/nvme: replace nvme_ns_status, Klaus Jensen, 2021/04/19
- [PATCH 05/14] hw/block/nvme: cleanup includes, Klaus Jensen, 2021/04/19
- [PATCH 04/14] hw/block/nvme: consolidate header files, Klaus Jensen, 2021/04/19
- [PATCH 06/14] hw/block/nvme: remove non-shared defines from header file,
Klaus Jensen <=
- [PATCH 10/14] hw/block/nvme: streamline namespace array indexing, Klaus Jensen, 2021/04/19
- [PATCH 08/14] hw/block/nvme: cache lba and ms sizes, Klaus Jensen, 2021/04/19
- [PATCH 12/14] hw/block/nvme: remove irrelevant zone resource checks, Klaus Jensen, 2021/04/19
- [PATCH 11/14] hw/block/nvme: remove num_namespaces member, Klaus Jensen, 2021/04/19
- [PATCH 13/14] hw/block/nvme: move zoned constraints checks, Klaus Jensen, 2021/04/19
- [PATCH 09/14] hw/block/nvme: add metadata offset helper, Klaus Jensen, 2021/04/19
- [PATCH 14/14] hw/nvme: move nvme emulation out of hw/block, Klaus Jensen, 2021/04/19
- Re: [PATCH 00/14] hw(/block/)nvme: spring cleaning, Keith Busch, 2021/04/20
- Re: [PATCH 00/14] hw(/block/)nvme: spring cleaning, Klaus Jensen, 2021/04/26