From 46ac29c38bb45184db71dfbfbf5a31b3c12dbe29 Mon Sep 17 00:00:00 2001 From: Klaus Jensen Date: Mon, 6 Jul 2020 08:12:54 +0200 Subject: [PATCH] hw/block/nvme: move NvmeFeatureVal into hw/block/nvme.h 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 Reviewed-by: Dmitry Fomichev Reviewed-by: Maxim Levitsky Message-Id: <20200706061303.246057-10-its@irrelevant.dk> --- 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 1837233617..b93067c9e4 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 87fa60b8bd..58e0a073f6 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -866,23 +866,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)