Commit 0bc4207e authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme_spec: fix feature struct definitions 



Several of the 'bits' members were accidentally declared as unions
instead of structs.

Change-Id: Iaaacf79438899794581e3f69c8afb606a244eb1c
Fixes: 8d8f4ac3 ("nvme_spec: define Get/Set Feature structs")
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/404409


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 29e8013d

include/spdk/nvme_spec.h

+8 −8
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_async_event_completion) == 4, "Incorre 
 */

union spdk_nvme_feat_arbitration {

	uint32_t raw;

	union {

	struct {

		/** Arbitration Burst */

		uint32_t ab : 3;
@@ -1913,7 +1913,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_arbitration) == 4, "Incorrect siz 
 */

union spdk_nvme_feat_power_management {

	uint32_t raw;

	union {

	struct {

		/** Power State */

		uint32_t ps : 5;
@@ -1930,7 +1930,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_power_management) == 4, "Incorrec 
 */

union spdk_nvme_feat_lba_range_type {

	uint32_t raw;

	union {

	struct {

		/** Number of LBA Ranges */

		uint32_t num : 6;
@@ -1944,7 +1944,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_lba_range_type) == 4, "Incorrect 
 */

union spdk_nvme_feat_temperature_threshold {

	uint32_t raw;

	union {

	struct {

		/** Temperature Threshold */

		uint32_t tmpth : 16;
@@ -1964,7 +1964,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_temperature_threshold) == 4, "Inc 
 */

union spdk_nvme_feat_error_recovery {

	uint32_t raw;

	union {

	struct {

		/** Time Limited Error Recovery */

		uint32_t tler : 16;
@@ -1981,7 +1981,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_error_recovery) == 4, "Incorrect 
 */

union spdk_nvme_feat_volatile_write_cache {

	uint32_t raw;

	union {

	struct {

		/** Volatile Write Cache Enable */

		uint32_t wce : 1;
@@ -1995,7 +1995,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_volatile_write_cache) == 4, "Inco 
 */

union spdk_nvme_feat_number_of_queues {

	uint32_t raw;

	union {

	struct {

		/** Number of I/O Submission Queues Requested */

		uint32_t nsqr : 16;
@@ -2010,7 +2010,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_number_of_queues) == 4, "Incorrec 
 */

union spdk_nvme_feat_interrupt_vector_configuration {

	uint32_t raw;

	union {

	struct {

		/** Interrupt Vector */

		uint32_t iv : 16;