tree: Remove default port setting for TCP and RDMA ports

When the controller is created, the discovery_ctrl attribute is not
set yet. The caller is supposed to set this after the creation of the
new discovery controller. Thus we can't really set the default port at
this level. This is a bit of a chicken-egg situation.

Move this work up to the caller to provide the correct defaults.

Signed-off-by: Daniel Wagner <[email protected]>

Author: dwsuse

src/nvme/tree.c

@@ -948,25 +948,6 @@ void nvme_free_ctrl(nvme_ctrl_t c)
 	__nvme_free_ctrl(c);
 }
 
-#define ____stringify(x...) #x
-#define __stringify(x...) ____stringify(x)
-
-static void set_default_trsvcid(nvme_ctrl_t c)
-{
-	if (!strcmp(c->transport, "tcp")) {
-		if (c->discovery_ctrl) {
-			/* Default port for NVMe/TCP discovery controllers */
-			c->trsvcid = strdup(__stringify(NVME_DISC_IP_PORT));
-		} else {
-			/* Default port for NVMe/TCP io controllers */
-			c->trsvcid = strdup(__stringify(NVME_RDMA_IP_PORT));
-		}
-	} else if (!strcmp(c->transport, "rdma")) {
-		/* Default port for NVMe/RDMA controllers */
-		c->trsvcid = strdup(__stringify(NVME_RDMA_IP_PORT));
-	}
-}
-
 static bool traddr_is_hostname(const char *transport, const char *traddr)
 {
 	char addrstr[NVMF_TRADDR_SIZE];
@@ -1030,8 +1011,6 @@ struct nvme_ctrl *nvme_create_ctrl(nvme_root_t r,
 		c->cfg.host_iface = strdup(host_iface);
 	if (trsvcid)
 		c->trsvcid = strdup(trsvcid);
-	else
-		set_default_trsvcid(c);
 
 	return c;
 }