svn commit: r295076 - head/sbin/nvmecontrol
Garrett Cooper
ngie at FreeBSD.org
Sat Jan 30 17:10:16 UTC 2016
Author: ngie
Date: Sat Jan 30 17:10:14 2016
New Revision: 295076
URL: https://svnweb.freebsd.org/changeset/base/295076
Log:
Revert r295062 to unbreak buildworld
Some of the structures referenced in power.c (in particular
struct nvme_power_state) are missing from sbin/nvmecontrol/
Pointyhat to: imp
Reported by: Jenkins [*], O. Hartmann <ohartman at zedat.fu-berlin.de>, Outback Dingo <outbackdingo at gmail.com>
Deleted:
head/sbin/nvmecontrol/power.c
Modified:
head/sbin/nvmecontrol/Makefile
head/sbin/nvmecontrol/nvmecontrol.8
head/sbin/nvmecontrol/nvmecontrol.c
head/sbin/nvmecontrol/nvmecontrol.h
Modified: head/sbin/nvmecontrol/Makefile
==============================================================================
--- head/sbin/nvmecontrol/Makefile Sat Jan 30 16:56:39 2016 (r295075)
+++ head/sbin/nvmecontrol/Makefile Sat Jan 30 17:10:14 2016 (r295076)
@@ -2,7 +2,7 @@
PROG= nvmecontrol
SRCS= nvmecontrol.c devlist.c firmware.c identify.c logpage.c \
- perftest.c reset.c nvme_util.c power.c
+ perftest.c reset.c nvme_util.c
MAN= nvmecontrol.8
.PATH: ${.CURDIR}/../../sys/dev/nvme
Modified: head/sbin/nvmecontrol/nvmecontrol.8
==============================================================================
--- head/sbin/nvmecontrol/nvmecontrol.8 Sat Jan 30 16:56:39 2016 (r295075)
+++ head/sbin/nvmecontrol/nvmecontrol.8 Sat Jan 30 17:10:14 2016 (r295076)
@@ -70,11 +70,6 @@
.Op Fl f Ar path_to_firmware
.Op Fl a
.Aq device id
-.Nm
-.Ic power
-.Op Fl l
-.Op Fl p power_state
-.Op fl w workload_hint
.Sh DESCRIPTION
NVM Express (NVMe) is a storage protocol standard, for SSDs and other
high-speed storage devices over PCI Express.
@@ -125,18 +120,6 @@ Activate the firmware in slot 4 of the n
.Pp
Download the firmware image contained in "/tmp/nvme_firmware" to slot 7 of the
nvme0 controller and activate it on the next reset.
-.Pp
-.Dl nvmecontrol power -l nvme0
-.Pp
-List all the current power modes.
-.Pp
-.Dl nvmecontrol power -p 3 nvme0
-.Pp
-Set the current power mode.
-.Pp
-.Dl nvmecontrol power nvme0
-.Pp
-Get the current power mode.
.Sh AUTHORS
.An -nosplit
.Nm
Modified: head/sbin/nvmecontrol/nvmecontrol.c
==============================================================================
--- head/sbin/nvmecontrol/nvmecontrol.c Sat Jan 30 16:56:39 2016 (r295075)
+++ head/sbin/nvmecontrol/nvmecontrol.c Sat Jan 30 17:10:14 2016 (r295076)
@@ -58,7 +58,6 @@ static struct nvme_function {
{"reset", reset, RESET_USAGE},
{"logpage", logpage, LOGPAGE_USAGE},
{"firmware", firmware, FIRMWARE_USAGE},
- {"power", power, POWER_USAGE},
{NULL, NULL, NULL},
};
Modified: head/sbin/nvmecontrol/nvmecontrol.h
==============================================================================
--- head/sbin/nvmecontrol/nvmecontrol.h Sat Jan 30 16:56:39 2016 (r295075)
+++ head/sbin/nvmecontrol/nvmecontrol.h Sat Jan 30 17:10:14 2016 (r295076)
@@ -55,16 +55,12 @@
#define FIRMWARE_USAGE \
" nvmecontrol firmware [-s slot] [-f path_to_firmware] [-a] <controller id>\n"
-#define POWER_USAGE \
-" nvmecontrol power [-l] [-p new-state [-w workload-hint]] <controller id>\n"
-
void devlist(int argc, char *argv[]);
void identify(int argc, char *argv[]);
void perftest(int argc, char *argv[]);
void reset(int argc, char *argv[]);
void logpage(int argc, char *argv[]);
void firmware(int argc, char *argv[]);
-void power(int argc, char *argv[]);
int open_dev(const char *str, int *fd, int show_error, int exit_on_error);
void parse_ns_str(const char *ns_str, char *ctrlr_str, int *nsid);
More information about the svn-src-head
mailing list