[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/18] hw/block/nvme: move NvmeFeatureVal into hw/block/nvme.h
From: |
Klaus Jensen |
Subject: |
[PATCH v2 08/18] hw/block/nvme: move NvmeFeatureVal into hw/block/nvme.h |
Date: |
Fri, 3 Jul 2020 08:34:10 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
The NvmeFeatureVal does not belong with the spec-related data structures
in include/block/nvme.h that is shared between the block-level nvme
driver and the emulated nvme device.
Move it into the nvme device specific header file as it is the only
user of the structure. Also, remove the unused members.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
---
hw/block/nvme.h | 8 ++++++++
include/block/nvme.h | 17 -----------------
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index 1f64a0e94035..f8940435f9ef 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -79,6 +79,14 @@ static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns)
#define NVME(obj) \
OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)
+typedef struct NvmeFeatureVal {
+ struct {
+ uint16_t temp_thresh_hi;
+ uint16_t temp_thresh_low;
+ };
+ uint32_t async_config;
+} NvmeFeatureVal;
+
typedef struct NvmeCtrl {
PCIDevice parent_obj;
MemoryRegion iomem;
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 2101292ed5e8..0dce15af6bcf 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -865,23 +865,6 @@ enum NvmeIdCtrlLpa {
#define NVME_CTRL_SGLS_MPTR_SGL (0x1 << 19)
#define NVME_CTRL_SGLS_ADDR_OFFSET (0x1 << 20)
-typedef struct NvmeFeatureVal {
- uint32_t arbitration;
- uint32_t power_mgmt;
- struct {
- uint16_t temp_thresh_hi;
- uint16_t temp_thresh_low;
- };
- uint32_t err_rec;
- uint32_t volatile_wc;
- uint32_t num_queues;
- uint32_t int_coalescing;
- uint32_t *int_vector_config;
- uint32_t write_atomicity;
- uint32_t async_config;
- uint32_t sw_prog_marker;
-} NvmeFeatureVal;
-
#define NVME_ARB_AB(arb) (arb & 0x7)
#define NVME_ARB_LPW(arb) ((arb >> 8) & 0xff)
#define NVME_ARB_MPW(arb) ((arb >> 16) & 0xff)
--
2.27.0
- [PATCH v2 00/18] hw/block/nvme: bump to v1.3, Klaus Jensen, 2020/07/03
- [PATCH v2 04/18] hw/block/nvme: add temperature threshold feature, Klaus Jensen, 2020/07/03
- [PATCH v2 01/18] hw/block/nvme: bump spec data structures to v1.3, Klaus Jensen, 2020/07/03
- [PATCH v2 02/18] hw/block/nvme: additional tracing, Klaus Jensen, 2020/07/03
- [PATCH v2 08/18] hw/block/nvme: move NvmeFeatureVal into hw/block/nvme.h,
Klaus Jensen <=
- [PATCH v2 03/18] hw/block/nvme: add support for the abort command, Klaus Jensen, 2020/07/03
- [PATCH v2 05/18] hw/block/nvme: mark fw slot 1 as read-only, Klaus Jensen, 2020/07/03
- [PATCH v2 06/18] hw/block/nvme: add support for the get log page command, Klaus Jensen, 2020/07/03
- [PATCH v2 07/18] hw/block/nvme: add support for the asynchronous event request command, Klaus Jensen, 2020/07/03
- [PATCH v2 10/18] hw/block/nvme: fix missing endian conversion, Klaus Jensen, 2020/07/03
- [PATCH v2 12/18] hw/block/nvme: support the get/set features select and save fields, Klaus Jensen, 2020/07/03
- [PATCH v2 09/18] hw/block/nvme: flush write cache when disabled, Klaus Jensen, 2020/07/03
- [PATCH v2 13/18] hw/block/nvme: make sure ncqr and nsqr is valid, Klaus Jensen, 2020/07/03