mi: fix missing braces around initializer warnings

The fix required for the muon build on CentOS.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

src/nvme/mi.c

@@ -2385,14 +2385,18 @@ static int aem_sync(nvme_mi_ep_t ep,
 
 static int aem_disable_enabled(nvme_mi_ep_t ep)
 {
-	struct nvme_mi_aem_enabled_map already_enabled = {false};
+	struct nvme_mi_aem_enabled_map already_enabled;
 	uint8_t response_buffer[4096] = {0};
 	size_t response_len = sizeof(response_buffer);
 	struct nvme_mi_aem_occ_list_hdr *response =
 		(struct nvme_mi_aem_occ_list_hdr *)response_buffer;
+	struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES];
+
+	memset(&already_enabled, 0, sizeof(already_enabled));
+	memset(sync_data, 0, sizeof(sync_data));
 
 	// First, let's figure out if anything is already enabled that we need to
-    // disable
+	// disable
 	int rc = nvme_mi_aem_get_enabled(ep, &already_enabled);
 
 	if (rc)
@@ -2401,8 +2405,6 @@ static int aem_disable_enabled(nvme_mi_ep_t ep)
 	int sync_data_count = 0;
 
 	//Add the enabled items to the list of things to disable
-	struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES] = {0};
-
 	for (int i = 0; i < NUM_ENABLES; i++) {
 		if (already_enabled.enabled[i]) {
 			nvme_mi_aem_aeei_set_aeeid(&sync_data[sync_data_count], i);
@@ -2428,6 +2430,10 @@ int nvme_mi_aem_enable(nvme_mi_ep_t ep,
 	struct nvme_mi_aem_config *config,
 	void *userdata)
 {
+	struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES];
+
+	memset(sync_data, 0, sizeof(sync_data));
+
 	if (!ep || !config || !config->aem_handler)
 		return -1;
 
@@ -2437,7 +2443,6 @@ int nvme_mi_aem_enable(nvme_mi_ep_t ep,
 		return rc;
 
 	int sync_data_count = 0;
-	struct nvme_mi_aem_enable_item sync_data[NUM_ENABLES] = {0};
 
 	uint8_t response_buffer[4096] = {0};
 	size_t response_len = sizeof(response_buffer);

src/nvme/mi.h

@@ -86,6 +86,7 @@
 
 #include <endian.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <nvme/types.h>
 #include <nvme/tree.h>
@@ -1326,7 +1327,9 @@ static inline int nvme_mi_aem_ack(nvme_mi_ep_t ep,
 				size_t *occ_list_size)
 {
 	//An AEM Ack is defined as a SET CONFIG AE with no AE enable items
-	struct nvme_mi_aem_enable_list list = {0};
+	struct nvme_mi_aem_enable_list list;
+
+	memset(&list, 0, sizeof(list));
 
 	list.hdr.aeelhl = sizeof(struct nvme_mi_aem_enable_list_header);
 	list.hdr.aeelver = 0;

test/mi-mctp.c

@@ -913,6 +913,9 @@ static int aem_rcv_enable_fn(struct test_peer *peer, void *buf, size_t len, int
 {
 	struct aem_rcv_enable_fn_data *fn_data = peer->tx_data;
 	struct nvme_mi_mi_resp_hdr *tx_hdr = (struct nvme_mi_mi_resp_hdr *)peer->tx_buf;
+	struct nvme_mi_aem_enabled_map expected;
+
+	memset(&expected, 0, sizeof(expected));
 
 	/* set up a few default response fields; caller may have
 	 * initialised the rest of the response
@@ -974,7 +977,6 @@ static int aem_rcv_enable_fn(struct test_peer *peer, void *buf, size_t len, int
 	{
 		assert(sd == peer->sd[TEST_PEER_SD_COMMANDS_IDX]);
 
-		struct nvme_mi_aem_enabled_map expected = {false};
 		//The items in the ep_enabled_map should get disabled
 		check_aem_sync_message(&fn_data->ep_enabled_map, &expected, fn_data);
 

test/mi.c

@@ -586,12 +586,15 @@ static void test_admin_invalid_formats(nvme_mi_ep_t ep)
 	struct {
 		struct nvme_mi_admin_req_hdr hdr;
 		uint8_t data[4];
-	} req = { 0 };
-	struct nvme_mi_admin_resp_hdr resp = { 0 };
+	} req;
+	struct nvme_mi_admin_resp_hdr resp;
 	nvme_mi_ctrl_t ctrl;
 	size_t len;
 	int rc;
 
+	memset(&req, 0, sizeof(req));
+	memset(&resp, 0, sizeof(resp));
+
 	test_set_transport_callback(ep, test_rejected_command_cb, NULL);
 
 	ctrl = nvme_mi_init_ctrl(ep, 1);
@@ -638,12 +641,15 @@ static void test_mi_invalid_formats(nvme_mi_ep_t ep)
 	struct {
 		struct nvme_mi_mi_req_hdr hdr;
 		uint8_t data[4];
-	} req = { 0 };
-	struct nvme_mi_mi_resp_hdr resp = { 0 };
+	} req;
+	struct nvme_mi_mi_resp_hdr resp;
 	nvme_mi_ctrl_t ctrl;
 	size_t len;
 	int rc;
 
+	memset(&req, 0, sizeof(req));
+	memset(&resp, 0, sizeof(resp));
+
 	test_set_transport_callback(ep, test_rejected_command_cb, NULL);
 
 	ctrl = nvme_mi_init_ctrl(ep, 1);
@@ -1084,11 +1090,13 @@ static int test_admin_set_features_cb(struct nvme_mi_ep *ep,
 static void test_set_features(nvme_mi_ep_t ep)
 {
 	struct nvme_set_features_args args = { 0 };
-	struct nvme_timestamp tstamp = { 0 };
+	struct nvme_timestamp tstamp;
 	nvme_mi_ctrl_t ctrl;
 	uint32_t res;
 	int rc, i;
 
+	memset(&tstamp, 0, sizeof(tstamp));
+
 	test_set_transport_callback(ep, test_admin_set_features_cb, NULL);
 
 	ctrl = nvme_mi_init_ctrl(ep, 5);
@@ -2036,13 +2044,16 @@ static void test_admin_dlen_doff_req(struct nvme_mi_ep *ep)
 	struct {
 		struct nvme_mi_admin_req_hdr	hdr;
 		unsigned char			data[4096];
-	} admin_req = { 0 };
-	struct nvme_mi_admin_resp_hdr admin_resp = { 0 };
+	} admin_req;
+	struct nvme_mi_admin_resp_hdr admin_resp;
 	struct req_dlen_doff_data data = { 0 };
 	size_t resp_sz = 0;
 	nvme_mi_ctrl_t ctrl;
 	int rc;
 
+	memset(&admin_req, 0, sizeof(admin_req));
+	memset(&admin_resp, 0, sizeof(admin_resp));
+
 	data.direction = DATA_DIR_OUT;
 	data.req_len = sizeof(admin_req.data);
 
@@ -2064,13 +2075,16 @@ static void test_admin_dlen_doff_resp(struct nvme_mi_ep *ep)
 	struct {
 		struct nvme_mi_admin_resp_hdr	hdr;
 		unsigned char			data[4096];
-	} admin_resp = { 0 };
-	struct nvme_mi_admin_req_hdr admin_req = { 0 };
+	} admin_resp;
+	struct nvme_mi_admin_req_hdr admin_req;
 	struct req_dlen_doff_data data = { 0 };
 	nvme_mi_ctrl_t ctrl;
 	size_t resp_sz;
 	int rc;
 
+	memset(&admin_resp, 0, sizeof(admin_resp));
+	memset(&admin_req, 0, sizeof(admin_req));
+
 	data.direction = DATA_DIR_IN;
 	data.resp_len = sizeof(admin_resp.data);
 	resp_sz = sizeof(admin_resp.data);

test/test.c

@@ -43,15 +43,15 @@ static int test_ctrl(nvme_ctrl_t c)
 	struct nvme_error_log_page error[64]; 
 	struct nvme_smart_log smart = { 0 };
 	struct nvme_firmware_slot fw =  { 0 };
-	struct nvme_ns_list ns_list = { 0 };
-	struct nvme_cmd_effects_log cfx = { 0 };
+	struct nvme_ns_list ns_list;
+	struct nvme_cmd_effects_log cfx;
 	struct nvme_self_test_log st = { 0 };
 	struct nvme_telemetry_log *telem = (void *)buf;
 	struct nvme_endurance_group_log eglog = { 0 };
 	struct nvme_ana_log *analog = (void *)buf;
 	struct nvme_resv_notification_log resvnotify = { 0 };
 	struct nvme_sanitize_log_page sanlog = { 0 };
-	struct nvme_id_uuid_list uuid = { 0 };
+	struct nvme_id_uuid_list uuid;
 	struct nvme_id_ns_granularity_list gran = { 0 };
 	struct nvme_secondary_ctrl_list sec = { 0 };
 	struct nvme_primary_ctrl_cap prim = { 0 };
@@ -60,6 +60,10 @@ static int test_ctrl(nvme_ctrl_t c)
 
 	__u32 result;
 
+	memset(&ns_list, 0, sizeof(ns_list));
+	memset(&cfx, 0, sizeof(cfx));
+	memset(&uuid, 0, sizeof(uuid));
+
 	ret = nvme_ctrl_identify(c, &id);
 	if (ret) {
 		printf("ERROR: no identify for:%s\n", nvme_ctrl_get_name(c));