Commit d4914dee authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

ut/iscsi: Initialize struct to zero by not memset but "={}" in tgt_node_ut.c 



Using "={}" at definition is clearer and saves lines.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I75a99583f1ecc84d4c47cacd9ce58034edb4e756
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477413


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ce3b8472

test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c

+27 −54
Original line number Diff line number Diff line
@@ -102,15 +102,12 @@ spdk_scsi_dev_add_lun(struct spdk_scsi_dev *dev, const char *bdev_name, int lun_ 
static void

add_lun_test_cases(void)

{

	struct spdk_iscsi_tgt_node tgtnode;

	struct spdk_iscsi_tgt_node tgtnode = {};

	int lun_id = 0;

	char *bdev_name = NULL;

	struct spdk_scsi_dev scsi_dev;

	struct spdk_scsi_dev scsi_dev = {};

	int rc;



	memset(&tgtnode, 0, sizeof(struct spdk_iscsi_tgt_node));

	memset(&scsi_dev, 0, sizeof(struct spdk_scsi_dev));



	/* case 1 */

	tgtnode.num_active_conns = 1;
@@ -344,24 +341,22 @@ allow_ipv4_invalid(void) 
static void

node_access_allowed(void)

{

	struct spdk_iscsi_tgt_node tgtnode;

	struct spdk_iscsi_portal_grp pg;

	struct spdk_iscsi_init_grp ig;

	struct spdk_iscsi_conn conn;

	struct spdk_iscsi_portal portal;

	struct spdk_iscsi_initiator_name iname;

	struct spdk_iscsi_initiator_netmask imask;

	struct spdk_scsi_dev scsi_dev;

	struct spdk_iscsi_tgt_node tgtnode = {};

	struct spdk_iscsi_portal_grp pg = {};

	struct spdk_iscsi_init_grp ig = {};

	struct spdk_iscsi_conn conn = {};

	struct spdk_iscsi_portal portal = {};

	struct spdk_iscsi_initiator_name iname = {};

	struct spdk_iscsi_initiator_netmask imask = {};

	struct spdk_scsi_dev scsi_dev = {};

	struct spdk_iscsi_pg_map *pg_map;

	char *iqn, *addr;

	bool result;



	/* portal group initialization */

	memset(&pg, 0, sizeof(struct spdk_iscsi_portal_grp));

	pg.tag = 1;



	/* initiator group initialization */

	memset(&ig, 0, sizeof(struct spdk_iscsi_init_grp));

	ig.tag = 1;



	ig.ninitiators = 1;
@@ -375,11 +370,9 @@ node_access_allowed(void) 
	TAILQ_INSERT_TAIL(&ig.netmask_head, &imask, tailq);



	/* target initialization */

	memset(&tgtnode, 0, sizeof(struct spdk_iscsi_tgt_node));

	snprintf(tgtnode.name, sizeof(tgtnode.name), "iqn.2017-10.spdk.io:0001");

	TAILQ_INIT(&tgtnode.pg_map_head);



	memset(&scsi_dev, 0, sizeof(struct spdk_scsi_dev));

	snprintf(scsi_dev.name, sizeof(scsi_dev.name), "iqn.2017-10.spdk.io:0001");

	tgtnode.dev = &scsi_dev;
@@ -387,13 +380,11 @@ node_access_allowed(void) 
	iscsi_pg_map_add_ig_map(pg_map, &ig);



	/* portal initialization */

	memset(&portal, 0, sizeof(struct spdk_iscsi_portal));

	portal.group = &pg;

	snprintf(portal.host, sizeof(portal.host), "192.168.2.0");

	snprintf(portal.port, sizeof(portal.port), "3260");



	/* input for UT */

	memset(&conn, 0, sizeof(struct spdk_iscsi_conn));

	conn.portal = &portal;



	iqn = "iqn.2017-10.spdk.io:0001";
@@ -409,23 +400,21 @@ node_access_allowed(void) 
static void

node_access_denied_by_empty_netmask(void)

{

	struct spdk_iscsi_tgt_node tgtnode;

	struct spdk_iscsi_portal_grp pg;

	struct spdk_iscsi_init_grp ig;

	struct spdk_iscsi_conn conn;

	struct spdk_iscsi_portal portal;

	struct spdk_iscsi_initiator_name iname;

	struct spdk_scsi_dev scsi_dev;

	struct spdk_iscsi_tgt_node tgtnode = {};

	struct spdk_iscsi_portal_grp pg = {};

	struct spdk_iscsi_init_grp ig = {};

	struct spdk_iscsi_conn conn = {};

	struct spdk_iscsi_portal portal = {};

	struct spdk_iscsi_initiator_name iname = {};

	struct spdk_scsi_dev scsi_dev = {};

	struct spdk_iscsi_pg_map *pg_map;

	char *iqn, *addr;

	bool result;



	/* portal group initialization */

	memset(&pg, 0, sizeof(struct spdk_iscsi_portal_grp));

	pg.tag = 1;



	/* initiator group initialization */

	memset(&ig, 0, sizeof(struct spdk_iscsi_init_grp));

	ig.tag = 1;



	ig.ninitiators = 1;
@@ -437,11 +426,9 @@ node_access_denied_by_empty_netmask(void) 
	TAILQ_INIT(&ig.netmask_head);



	/* target initialization */

	memset(&tgtnode, 0, sizeof(struct spdk_iscsi_tgt_node));

	snprintf(tgtnode.name, sizeof(tgtnode.name), "iqn.2017-10.spdk.io:0001");

	TAILQ_INIT(&tgtnode.pg_map_head);



	memset(&scsi_dev, 0, sizeof(struct spdk_scsi_dev));

	snprintf(scsi_dev.name, sizeof(scsi_dev.name), "iqn.2017-10.spdk.io:0001");

	tgtnode.dev = &scsi_dev;
@@ -449,13 +436,11 @@ node_access_denied_by_empty_netmask(void) 
	iscsi_pg_map_add_ig_map(pg_map, &ig);



	/* portal initialization */

	memset(&portal, 0, sizeof(struct spdk_iscsi_portal));

	portal.group = &pg;

	snprintf(portal.host, sizeof(portal.host), "192.168.2.0");

	snprintf(portal.port, sizeof(portal.port), "3260");



	/* input for UT */

	memset(&conn, 0, sizeof(struct spdk_iscsi_conn));

	conn.portal = &portal;



	iqn = "iqn.2017-10.spdk.io:0001";
@@ -477,29 +462,26 @@ node_access_denied_by_empty_netmask(void) 
static void

node_access_multi_initiator_groups_cases(void)

{

	struct spdk_iscsi_tgt_node tgtnode;

	struct spdk_iscsi_conn conn;

	struct spdk_iscsi_portal_grp pg;

	struct spdk_iscsi_portal portal;

	struct spdk_iscsi_init_grp ig1, ig2;

	struct spdk_iscsi_tgt_node tgtnode = {};

	struct spdk_iscsi_conn conn = {};

	struct spdk_iscsi_portal_grp pg = {};

	struct spdk_iscsi_portal portal = {};

	struct spdk_iscsi_init_grp ig1 = {}, ig2 = {};

	struct spdk_iscsi_initiator_name iname1 = {}, iname2 = {};

	struct spdk_iscsi_initiator_netmask imask1 = {}, imask2 = {};

	struct spdk_scsi_dev scsi_dev;

	struct spdk_scsi_dev scsi_dev = {};

	struct spdk_iscsi_pg_map *pg_map;

	char *iqn, *addr;

	bool result;



	/* target initialization */

	memset(&tgtnode, 0, sizeof(struct spdk_iscsi_tgt_node));

	snprintf(tgtnode.name, sizeof(tgtnode.name), IQN1);

	TAILQ_INIT(&tgtnode.pg_map_head);



	memset(&scsi_dev, 0, sizeof(struct spdk_scsi_dev));

	snprintf(scsi_dev.name, sizeof(scsi_dev.name), IQN1);

	tgtnode.dev = &scsi_dev;



	/* initiator group initialization */

	memset(&ig1, 0, sizeof(struct spdk_iscsi_init_grp));

	ig1.tag = 1;

	TAILQ_INIT(&ig1.initiator_head);

	TAILQ_INIT(&ig1.netmask_head);
@@ -510,7 +492,6 @@ node_access_multi_initiator_groups_cases(void) 
	ig1.nnetmasks = 1;

	TAILQ_INSERT_TAIL(&ig1.netmask_head, &imask1, tailq);



	memset(&ig2, 0, sizeof(struct spdk_iscsi_init_grp));

	ig2.tag = 2;

	TAILQ_INIT(&ig2.initiator_head);

	TAILQ_INIT(&ig2.netmask_head);
@@ -522,7 +503,6 @@ node_access_multi_initiator_groups_cases(void) 
	TAILQ_INSERT_TAIL(&ig2.netmask_head, &imask2, tailq);



	/* portal group initialization */

	memset(&pg, 0, sizeof(struct spdk_iscsi_portal_grp));

	pg.tag = 1;



	pg_map = iscsi_tgt_node_add_pg_map(&tgtnode, &pg);
@@ -530,13 +510,11 @@ node_access_multi_initiator_groups_cases(void) 
	iscsi_pg_map_add_ig_map(pg_map, &ig2);



	/* portal initialization */

	memset(&portal, 0, sizeof(struct spdk_iscsi_portal));

	portal.group = &pg;

	snprintf(portal.host, sizeof(portal.host), IP1);

	snprintf(portal.port, sizeof(portal.port), "3260");



	/* connection initialization */

	memset(&conn, 0, sizeof(struct spdk_iscsi_conn));

	conn.portal = &portal;



	iqn = IQN1;
@@ -727,34 +705,29 @@ node_access_multi_initiator_groups_cases(void) 
static void

allow_iscsi_name_multi_maps_case(void)

{

	struct spdk_iscsi_tgt_node tgtnode;

	struct spdk_iscsi_portal_grp pg1, pg2;

	struct spdk_iscsi_init_grp ig;

	struct spdk_iscsi_tgt_node tgtnode = {};

	struct spdk_iscsi_portal_grp pg1 = {}, pg2 = {};

	struct spdk_iscsi_init_grp ig = {};

	struct spdk_iscsi_initiator_name iname = {};

	struct spdk_iscsi_pg_map *pg_map1, *pg_map2;

	struct spdk_scsi_dev scsi_dev;

	struct spdk_scsi_dev scsi_dev = {};

	char *iqn;

	bool result;



	/* target initialization */

	memset(&tgtnode, 0, sizeof(struct spdk_iscsi_tgt_node));

	TAILQ_INIT(&tgtnode.pg_map_head);



	memset(&scsi_dev, 0, sizeof(struct spdk_scsi_dev));

	snprintf(scsi_dev.name, sizeof(scsi_dev.name), IQN1);

	tgtnode.dev = &scsi_dev;



	/* initiator group initialization */

	memset(&ig, 0, sizeof(struct spdk_iscsi_init_grp));

	TAILQ_INIT(&ig.initiator_head);



	ig.ninitiators = 1;

	TAILQ_INSERT_TAIL(&ig.initiator_head, &iname, tailq);



	/* portal group initialization */

	memset(&pg1, 0, sizeof(struct spdk_iscsi_portal_grp));

	pg1.tag = 1;

	memset(&pg2, 0, sizeof(struct spdk_iscsi_portal_grp));

	pg2.tag = 1;



	pg_map1 = iscsi_tgt_node_add_pg_map(&tgtnode, &pg1);