From: Klaus Jensen <k.jensen@samsung.com>
Date: Wed, 14 Apr 2021 18:42:27 +0000 (+0200)
Subject: hw/block/nvme: remove non-shared defines from header file
X-Git-Tag: v6.1.0-rc0~117^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de482d1fad184d142433b939cdff9681f5cfc668;p=thirdparty%2Fqemu.git

hw/block/nvme: remove non-shared defines from header file

Remove non-shared defines from the shared header.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
---

diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index d91bf7bbbbb..93aaf6de02a 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 e152c61adb7..e7bd22b8b2e 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 d9374d3e33e..2c4e7b90fa5 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