ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: add _subtype to TSAS structures

Browse Source 
Fix the naming to match the spec.

Change-Id: I5e2fba54c796f8d1f11d61fb3d131aabc5c90503
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-07-15 09:46:20 -07:00
parent 70e26ebd6f
commit baf523b5d8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/spdk/nvmf_spec.h
View File

@ -353,7 +353,7 @@ struct spdk_nvmf_discovery_identify_data {
}; };
SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_discovery_identify_data) == 4096, "Incorrect size"); SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_discovery_identify_data) == 4096, "Incorrect size");
struct spdk_nvmf_rdma_transport_specific_address { struct spdk_nvmf_rdma_transport_specific_address_subtype {
uint8_t rdma_qptype; /* see spdk_nvmf_rdma_qp_service_types */ uint8_t rdma_qptype; /* see spdk_nvmf_rdma_qp_service_types */
uint8_t rdma_prtype; /* see spdk_nvmf_rdma_provider_types */ uint8_t rdma_prtype; /* see spdk_nvmf_rdma_provider_types */
uint8_t rdma_cms; /* see spdk_nvmf_rdma_connection_mgmt_service */ uint8_t rdma_cms; /* see spdk_nvmf_rdma_connection_mgmt_service */
@ -361,14 +361,15 @@ struct spdk_nvmf_rdma_transport_specific_address {
uint16_t rdma_pkey; uint16_t rdma_pkey;
uint8_t reserved2[246]; uint8_t reserved2[246];
}; };
SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_rdma_transport_specific_address) == 256, SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_rdma_transport_specific_address_subtype) == 256,
"Incorrect size"); "Incorrect size");
union spdk_nvmf_transport_specific_address { union spdk_nvmf_transport_specific_address_subtype {
uint8_t raw[256]; uint8_t raw[256];
struct spdk_nvmf_rdma_transport_specific_address rdma; struct spdk_nvmf_rdma_transport_specific_address_subtype rdma;
}; };
SPDK_STATIC_ASSERT(sizeof(union spdk_nvmf_transport_specific_address) == 256, "Incorrect size"); SPDK_STATIC_ASSERT(sizeof(union spdk_nvmf_transport_specific_address_subtype) == 256,
"Incorrect size");
struct spdk_nvmf_discovery_log_page_entry { struct spdk_nvmf_discovery_log_page_entry {
uint8_t trtype; /* transport type */ uint8_t trtype; /* transport type */
@ -382,7 +383,7 @@ struct spdk_nvmf_discovery_log_page_entry {
uint8_t reserved1[192]; uint8_t reserved1[192];
uint8_t subnqn[256]; uint8_t subnqn[256];
uint8_t traddr[256]; uint8_t traddr[256];
union spdk_nvmf_transport_specific_address tsas; union spdk_nvmf_transport_specific_address_subtype tsas;
}; };
SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_discovery_log_page_entry) == 1024, "Incorrect size"); SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_discovery_log_page_entry) == 1024, "Incorrect size");

2
lib/nvmf/port.h
View File

@ -70,7 +70,7 @@ struct spdk_nvmf_fabric_intf {
struct spdk_nvmf_port { struct spdk_nvmf_port {
int tag; int tag;
enum group_state state; enum group_state state;
union spdk_nvmf_transport_specific_address tsas; union spdk_nvmf_transport_specific_address_subtype tsas;
TAILQ_HEAD(, spdk_nvmf_fabric_intf) head; TAILQ_HEAD(, spdk_nvmf_fabric_intf) head;
TAILQ_ENTRY(spdk_nvmf_port) tailq; TAILQ_ENTRY(spdk_nvmf_port) tailq;
}; };