From de482d1fad184d142433b939cdff9681f5cfc668 Mon Sep 17 00:00:00 2001 From: Klaus Jensen Date: Wed, 14 Apr 2021 20:42:27 +0200 Subject: [PATCH] hw/block/nvme: remove non-shared defines from header file Remove non-shared defines from the shared header. Signed-off-by: Klaus Jensen Reviewed-by: Keith Busch --- hw/block/nvme-ns.c | 1 + hw/block/nvme.c | 1 + hw/block/nvme.h | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index d91bf7bbbb..93aaf6de02 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 e152c61adb..e7bd22b8b2 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -168,6 +168,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 { \ diff --git a/hw/block/nvme.h b/hw/block/nvme.h index d9374d3e33..2c4e7b90fa 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