From nobody Tue Jun 18 21:13:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3fd3709mz5NGbm; Tue, 18 Jun 2024 21:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W3fd36DDJz4Lmt; Tue, 18 Jun 2024 21:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718745239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHduoUmx5yZrAkxG4yrIgQaRMa98716n4TT2GVAr1Og=; b=JCWj/mZ6pa2+rUTU/Aveyb+Lq/uJRBQga4nrcnhwzL+npPT5311ewqcJ9ok+lB5hKC05QU qQjkuWHxgJRy9klbAYUGLVZrGBcpLHZGyF+2fHJIUbx5/HR2BUU5YYBSkfQaLzRq2SMhcH FY41fxUOz3g5w2akl4jR6cmQGmhHxD4jy2ZZjFG3CBURUKPwm3de1kxK66t3eHnIEYA2A7 2nxhmhFe6PweVDZ660OpGs0jLbuxRxBVK592UBTeKor/7MalIBKprMr7K/xBqHOQt7RnDL LKdNPbIOKPJE2mWRHek/4g1ag3h4D+uUduq++RfeuFuFyURoLmII3jouEUgaAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718745239; a=rsa-sha256; cv=none; b=NiSOXLOSn1/u8anu66vHZNxOZGpNYvW/M38XqmCzz4wMfr0r12RvB9bjDXZvyObPqkxtJ/ uYlGsItTnufX6Jv6rkpZRoWojj4tOZ/WlUQt8lvhv54geugo90wD2kWbAixjVI3Giiyd+t XlprwiqLmaSncBsc1G2UH26J7AfgD8ZetXhdJBkYKrFrgCh11v3pNkVkwMD0vsTsrbf/qd /YcLvBMmKELixQVm5K8eXJj7XdYLTBUby9NCtwK7+EJvs2pr5XR9n0TO2LLxz8tUItpA27 GSEXwQbqEA4euy1vc1NcIdUS2HoqA8OTDskFmrEPRDTkE00wEIphLSgNlU6xwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718745239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHduoUmx5yZrAkxG4yrIgQaRMa98716n4TT2GVAr1Og=; b=oi+Jy5YF/r/t5lg4xgMAi02JeUbO05ohk1PQOPWBkX8wdBCW3QfCFb0osj9e10xdKEbGCu wQBOA7dPuwtuAWfvDjmHwz8ZlsUp2sS8SqrwV9qrs78+JEQLdbeQRSC571UmtikGXS5k5r om/tol/JSpmGnWWNHS2WrL8dMmjcRviwF8hXK0J3enxSgaVCLMQTTl27OrX6DnOE81Pvd1 ubczVGnpk9w5W1GvQHamjnWthGK8OVnawk85Zbg3G20PaxXAOsT82uZDwJzA4eIi8wKpa4 o1LM9w0mz1zJ032lO96FczP+TNdPatrF14wvZOMhG7mC3Shq90kQvqg4oeIVvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3fd35qnczFcK; Tue, 18 Jun 2024 21:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45ILDx9d030219; Tue, 18 Jun 2024 21:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45ILDx1D030216; Tue, 18 Jun 2024 21:13:59 GMT (envelope-from git) Date: Tue, 18 Jun 2024 21:13:59 GMT Message-Id: <202406182113.45ILDx1D030216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: bb95fbf634b3 - main - ctladm: deprecate the undocumented "port -l" option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb95fbf634b3459363a136899e9b241a2f6c49cd Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=bb95fbf634b3459363a136899e9b241a2f6c49cd commit bb95fbf634b3459363a136899e9b241a2f6c49cd Author: Alan Somers AuthorDate: 2024-06-06 21:09:38 +0000 Commit: Alan Somers CommitDate: 2024-06-18 21:13:44 +0000 ctladm: deprecate the undocumented "port -l" option It was mostly removed from the man page in 9c887a4f86f5fd4f51c23443dc8435e52783a782, but left in the command. Fully remove it from the man page, and warn if anybody uses it. Remove it entirely for FreeBSD 16. PR: 279546 MFC after: 2 weeks Reviewed by: mav Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D45522 --- usr.sbin/ctladm/ctladm.8 | 5 +---- usr.sbin/ctladm/ctladm.c | 29 +++++++++++++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index 72f0162eed54..3da9713accac 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -597,9 +597,7 @@ The serial number is returned when the error is injected. .El .It Ic port Perform one of several CTL frontend port operations. -Either get a list of frontend ports -.Pq Fl l , -create a new frontend port +Either create a new frontend port .Pq Fl c , destroy a frontend port .Pq Fl r , @@ -614,7 +612,6 @@ for a given port. One of .Fl c , .Fl r , -.Fl l , .Fl o , or .Fl w diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 46b7b88547dd..95557406741c 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -184,7 +184,11 @@ static struct ctladm_opts option_table[] = { {"modify", CTLADM_CMD_MODIFY, CTLADM_ARG_NONE, "b:l:o:s:"}, {"nvlist", CTLADM_CMD_NVLIST, CTLADM_ARG_NONE, "vx"}, {"nvterminate", CTLADM_CMD_NVTERMINATE, CTLADM_ARG_NONE, "ac:h:"}, +#if (__FreeBSD_version < 1600000) {"port", CTLADM_CMD_PORT, CTLADM_ARG_NONE, "lo:O:d:crp:qt:w:W:x"}, +#else + {"port", CTLADM_CMD_PORT, CTLADM_ARG_NONE, "o:O:d:crp:t:w:W:"}, +#endif {"portlist", CTLADM_CMD_PORTLIST, CTLADM_ARG_NONE, "f:ilp:qvx"}, {"prin", CTLADM_CMD_PRES_IN, CTLADM_ARG_NEED_TL, "a:"}, {"prout", CTLADM_CMD_PRES_OUT, CTLADM_ARG_NEED_TL, "a:k:r:s:"}, @@ -410,7 +414,9 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) char *driver = NULL; nvlist_t *option_list; ctl_port_type port_type = CTL_PORT_NONE; +#if (__FreeBSD_version < 1600000) int quiet = 0, xml = 0; +#endif option_list = nvlist_create(0); if (option_list == NULL) @@ -418,12 +424,22 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) while ((c = getopt(argc, argv, combinedopt)) != -1) { switch (c) { +#if (__FreeBSD_version < 1600000) case 'l': + warnx("ctladm port -l is deprecated. " + "Use ctladm portlist instead"); if (port_mode != CCTL_PORT_MODE_NONE) goto bailout_badarg; port_mode = CCTL_PORT_MODE_LIST; break; + case 'q': + quiet = 1; + break; + case 'x': + xml = 1; + break; +#endif case 'c': port_mode = CCTL_PORT_MODE_CREATE; break; @@ -483,9 +499,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) case 'p': targ_port = strtol(optarg, NULL, 0); break; - case 'q': - quiet = 1; - break; case 't': { ctladm_optret optret; ctladm_cmdargs argnum; @@ -529,9 +542,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) wwpn = strtoull(optarg, NULL, 0); wwpn_set = 1; break; - case 'x': - xml = 1; - break; } } @@ -563,6 +573,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) entry.targ_port = targ_port; switch (port_mode) { +#if (__FreeBSD_version < 1600000) case CCTL_PORT_MODE_LIST: { char opts[] = "xq"; char argx[] = "-x"; @@ -579,6 +590,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) cctl_portlist(fd, argcx, argvx, opts); break; } +#endif case CCTL_PORT_MODE_REMOVE: /* FALLTHROUGH */ case CCTL_PORT_MODE_CREATE: { @@ -681,7 +693,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) fprintf(stdout, "Front End Ports disabled\n"); break; default: - warnx("%s: one of -l, -o or -w/-W must be specified", __func__); + warnx("%s: one of -c, -r, -o or -w/-W must be specified", __func__); retval = 1; goto bailout; break; @@ -4270,7 +4282,6 @@ usage(int error) "port options:\n" "-c : create new ioctl or iscsi frontend port\n" "-d : specify ioctl or iscsi frontend type\n" -"-l : list frontend ports\n" "-o on|off : turn frontend ports on or off\n" "-O pp|vp : create new frontend port using pp and/or vp\n" "-w wwnn : set WWNN for one frontend\n" @@ -4278,8 +4289,6 @@ usage(int error) "-t port_type : specify fc, scsi, ioctl, internal frontend type\n" "-p targ_port : specify target port number\n" "-r : remove frontend port\n" -"-q : omit header in list output\n" -"-x : output port list in XML format\n" "portlist options:\n" "-f frontend : specify frontend type\n" "-i : report target and initiators addresses\n"