[src/trunk]: src/usr.sbin/iostat Remove KVM related options.

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0182b51ed77
branches:  trunk
changeset: 329839:b0182b51ed77
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Jun 11 17:01:04 2014 +0000

description:
Remove KVM related options.

diffstat:

 usr.sbin/iostat/Makefile |   6 +++---
 usr.sbin/iostat/iostat.8 |  20 ++------------------
 usr.sbin/iostat/iostat.c |  19 +++++--------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diffs (135 lines):

diff -r 56ff47aee12a -r b0182b51ed77 usr.sbin/iostat/Makefile
--- a/usr.sbin/iostat/Makefile  Wed Jun 11 16:58:29 2014 +0000
+++ b/usr.sbin/iostat/Makefile  Wed Jun 11 17:01:04 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2011/01/07 03:12:27 jakllsch Exp $
+#      $NetBSD: Makefile,v 1.25 2014/06/11 17:01:04 joerg Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
 
 .include <bsd.own.mk>
@@ -13,7 +13,7 @@
 # drvstats.c pulled in from ../../usr.bin/vmstat
 SRCS=  drvstats.c iostat.c
 
-DPADD= ${LIBKVM} ${LIBM}
-LDADD= -lkvm -lm
+DPADD= ${LIBM}
+LDADD= -lm
 
 .include <bsd.prog.mk>
diff -r 56ff47aee12a -r b0182b51ed77 usr.sbin/iostat/iostat.8
--- a/usr.sbin/iostat/iostat.8  Wed Jun 11 16:58:29 2014 +0000
+++ b/usr.sbin/iostat/iostat.8  Wed Jun 11 17:01:04 2014 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: iostat.8,v 1.22 2003/08/07 11:25:22 agc Exp $
+.\"    $NetBSD: iostat.8,v 1.23 2014/06/11 17:01:04 joerg Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"    from: @(#)iostat.8      8.1 (Berkeley) 6/6/93
 .\"
-.Dd March 1, 2003
+.Dd June 11, 2014
 .Dt IOSTAT 8
 .Os
 .Sh NAME
@@ -41,8 +41,6 @@
 .Nm
 .Op Fl CdDITx
 .Op Fl c Ar count
-.Op Fl M Ar core
-.Op Fl N Ar system
 .Op Fl w Ar wait
 .Op Ar drives
 .Sh DESCRIPTION
@@ -106,13 +104,6 @@
 Use of this flag disables the default display.
 .It Fl I
 Show the running total values, rather than an average.
-.It Fl M Ar core
-Extract values associated with the name list from the specified core
-instead of the default
-.Dq Pa /dev/mem .
-.It Fl N Ar system
-Extract the name list from the specified system instead of the default
-.Dq Pa /netbsd .
 .It Fl T
 Show tty statistics.
 This is enabled by default unless the
@@ -191,13 +182,6 @@
 % of CPU time in idle mode
 .El
 .El
-.Sh FILES
-.Bl -tag -width /dev/mem -compact
-.It Pa /netbsd
-Default kernel namelist.
-.It Pa /dev/mem
-Default memory file.
-.El
 .Sh SEE ALSO
 .Xr fstat 1 ,
 .Xr netstat 1 ,
diff -r 56ff47aee12a -r b0182b51ed77 usr.sbin/iostat/iostat.c
--- a/usr.sbin/iostat/iostat.c  Wed Jun 11 16:58:29 2014 +0000
+++ b/usr.sbin/iostat/iostat.c  Wed Jun 11 17:01:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iostat.c,v 1.60 2011/08/30 19:06:06 joerg Exp $        */
+/*     $NetBSD: iostat.c,v 1.61 2014/06/11 17:01:04 joerg Exp $        */
 
 /*
  * Copyright (c) 1996 John M. Vinopal
@@ -71,7 +71,7 @@
 #if 0
 static char sccsid[] = "@(#)iostat.c   8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: iostat.c,v 1.60 2011/08/30 19:06:06 joerg Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.61 2014/06/11 17:01:04 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -91,9 +91,6 @@
 
 #include "drvstats.h"
 
-/* Namelist and memory files. */
-char   *nlistf, *memf;
-
 int            hz;
 static int     reps, interval;
 static int     todo = 0;
@@ -130,7 +127,7 @@
        struct timespec tv;
        struct ttysize ts;
 
-       while ((ch = getopt(argc, argv, "Cc:dDIM:N:Tw:x")) != -1)
+       while ((ch = getopt(argc, argv, "Cc:dDITw:x")) != -1)
                switch (ch) {
                case 'c':
                        if ((reps = atoi(optarg)) <= 0)
@@ -150,12 +147,6 @@
                case 'I':
                        todo |= SHOW_TOTALS;
                        break;
-               case 'M':
-                       memf = optarg;
-                       break;
-               case 'N':
-                       nlistf = optarg;
-                       break;
                case 'T':
                        todo |= SHOW_TTY;
                        break;
@@ -450,8 +441,8 @@
 usage(void)
 {
 
-       (void)fprintf(stderr, "usage: iostat [-CdDITx] [-c count] [-M core] "
-           "[-N system] [-w wait] [drives]\n");
+       (void)fprintf(stderr, "usage: iostat [-CdDITx] [-c count] "
+           "[-w wait] [drives]\n");
        exit(1);
 }