Skip to content

Commit b86c618

Browse files
committed
mi: fix missing braces around initializer warnings
The fix required for the muon build on CentOS. Signed-off-by: Tokunori Ikegami <[email protected]>
1 parent 48ce0ca commit b86c618

5 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/nvme/mi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2385,7 +2385,7 @@ static int aem_sync(nvme_mi_ep_t ep,
23852385

23862386
static int aem_disable_enabled(nvme_mi_ep_t ep)
23872387
{
2388-
struct nvme_mi_aem_enabled_map already_enabled = {false};
2388+
struct nvme_mi_aem_enabled_map already_enabled = {{false}};
23892389
uint8_t response_buffer[4096] = {0};
23902390
size_t response_len = sizeof(response_buffer);
23912391
struct nvme_mi_aem_occ_list_hdr *response =
@@ -2401,7 +2401,7 @@ static int aem_disable_enabled(nvme_mi_ep_t ep)
24012401
int sync_data_count = 0;
24022402

24032403
//Add the enabled items to the list of things to disable
2404-
struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES] = {0};
2404+
struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES] = {{0}};
24052405

24062406
for (int i = 0; i < NUM_ENABLES; i++) {
24072407
if (already_enabled.enabled[i]) {
@@ -2437,7 +2437,7 @@ int nvme_mi_aem_enable(nvme_mi_ep_t ep,
24372437
return rc;
24382438

24392439
int sync_data_count = 0;
2440-
struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES] = {0};
2440+
struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES] = {{0}};
24412441

24422442
uint8_t response_buffer[4096] = {0};
24432443
size_t response_len = sizeof(response_buffer);

src/nvme/mi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ static inline int nvme_mi_aem_ack(nvme_mi_ep_t ep,
13261326
size_t *occ_list_size)
13271327
{
13281328
//An AEM Ack is defined as a SET CONFIG AE with no AE enable items
1329-
struct nvme_mi_aem_enable_list list = {0};
1329+
struct nvme_mi_aem_enable_list list = {{0}};
13301330

13311331
list.hdr.aeelhl = sizeof(struct nvme_mi_aem_enable_list_header);
13321332
list.hdr.aeelver = 0;

test/mi-mctp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ static int aem_rcv_enable_fn(struct test_peer *peer, void *buf, size_t len, int
974974
{
975975
assert(sd == peer->sd[TEST_PEER_SD_COMMANDS_IDX]);
976976

977-
struct nvme_mi_aem_enabled_map expected = {false};
977+
struct nvme_mi_aem_enabled_map expected = {{false}};
978978
//The items in the ep_enabled_map should get disabled
979979
check_aem_sync_message(&fn_data->ep_enabled_map, &expected, fn_data);
980980

test/mi.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -586,8 +586,8 @@ static void test_admin_invalid_formats(nvme_mi_ep_t ep)
586586
struct {
587587
struct nvme_mi_admin_req_hdr hdr;
588588
uint8_t data[4];
589-
} req = { 0 };
590-
struct nvme_mi_admin_resp_hdr resp = { 0 };
589+
} req = {{{ 0 }}};
590+
struct nvme_mi_admin_resp_hdr resp = {{ 0 }};
591591
nvme_mi_ctrl_t ctrl;
592592
size_t len;
593593
int rc;
@@ -638,8 +638,8 @@ static void test_mi_invalid_formats(nvme_mi_ep_t ep)
638638
struct {
639639
struct nvme_mi_mi_req_hdr hdr;
640640
uint8_t data[4];
641-
} req = { 0 };
642-
struct nvme_mi_mi_resp_hdr resp = { 0 };
641+
} req = {{{ 0 }}};
642+
struct nvme_mi_mi_resp_hdr resp = {{ 0 }};
643643
nvme_mi_ctrl_t ctrl;
644644
size_t len;
645645
int rc;
@@ -1084,7 +1084,7 @@ static int test_admin_set_features_cb(struct nvme_mi_ep *ep,
10841084
static void test_set_features(nvme_mi_ep_t ep)
10851085
{
10861086
struct nvme_set_features_args args = { 0 };
1087-
struct nvme_timestamp tstamp = { 0 };
1087+
struct nvme_timestamp tstamp = {{ 0 }};
10881088
nvme_mi_ctrl_t ctrl;
10891089
uint32_t res;
10901090
int rc, i;
@@ -2036,8 +2036,8 @@ static void test_admin_dlen_doff_req(struct nvme_mi_ep *ep)
20362036
struct {
20372037
struct nvme_mi_admin_req_hdr hdr;
20382038
unsigned char data[4096];
2039-
} admin_req = { 0 };
2040-
struct nvme_mi_admin_resp_hdr admin_resp = { 0 };
2039+
} admin_req = {{{ 0 }}};
2040+
struct nvme_mi_admin_resp_hdr admin_resp = {{ 0 }};
20412041
struct req_dlen_doff_data data = { 0 };
20422042
size_t resp_sz = 0;
20432043
nvme_mi_ctrl_t ctrl;
@@ -2064,8 +2064,8 @@ static void test_admin_dlen_doff_resp(struct nvme_mi_ep *ep)
20642064
struct {
20652065
struct nvme_mi_admin_resp_hdr hdr;
20662066
unsigned char data[4096];
2067-
} admin_resp = { 0 };
2068-
struct nvme_mi_admin_req_hdr admin_req = { 0 };
2067+
} admin_resp = {{{ 0 }}};
2068+
struct nvme_mi_admin_req_hdr admin_req = {{ 0 }};
20692069
struct req_dlen_doff_data data = { 0 };
20702070
nvme_mi_ctrl_t ctrl;
20712071
size_t resp_sz;

test/test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ static int test_ctrl(nvme_ctrl_t c)
4343
struct nvme_error_log_page error[64];
4444
struct nvme_smart_log smart = { 0 };
4545
struct nvme_firmware_slot fw = { 0 };
46-
struct nvme_ns_list ns_list = { 0 };
47-
struct nvme_cmd_effects_log cfx = { 0 };
46+
struct nvme_ns_list ns_list = {{ 0 }};
47+
struct nvme_cmd_effects_log cfx = {{ 0 }};
4848
struct nvme_self_test_log st = { 0 };
4949
struct nvme_telemetry_log *telem = (void *)buf;
5050
struct nvme_endurance_group_log eglog = { 0 };
5151
struct nvme_ana_log *analog = (void *)buf;
5252
struct nvme_resv_notification_log resvnotify = { 0 };
5353
struct nvme_sanitize_log_page sanlog = { 0 };
54-
struct nvme_id_uuid_list uuid = { 0 };
54+
struct nvme_id_uuid_list uuid = {{ 0 }};
5555
struct nvme_id_ns_granularity_list gran = { 0 };
5656
struct nvme_secondary_ctrl_list sec = { 0 };
5757
struct nvme_primary_ctrl_cap prim = { 0 };

0 commit comments

Comments
 (0)