[PATCH 03/10] Correct and consistent .meta files for example

["Oestman, Fredrik" <Fredrik_Oestman at mentor dot com>]

Signed-off-by: Fredrik Östman <fredrik_oestman@mentor.com>
---
 testsuite/systemtap.examples/io/deviceseeks.meta |    2 +-
 testsuite/systemtap.examples/io/disktop.meta     |    2 +-
 testsuite/systemtap.examples/io/io_submit.meta   |    2 +-
 testsuite/systemtap.examples/io/ioblktime.meta   |    2 +-
 testsuite/systemtap.examples/io/iostat-scsi.meta |    2 +-
 testsuite/systemtap.examples/io/iotime.meta      |    4 ++--
 testsuite/systemtap.examples/io/iotop.meta       |    2 +-
 testsuite/systemtap.examples/io/mbrwatch.meta    |    9 ++++++++-
 testsuite/systemtap.examples/io/traceio.meta     |    2 +-
 testsuite/systemtap.examples/io/traceio2.meta    |    2 +-
 testsuite/systemtap.examples/io/ttyspy.meta      |    9 ++++++++-
 11 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/testsuite/systemtap.examples/io/deviceseeks.meta b/testsuite/systemtap.examples/io/deviceseeks.meta
index 32285ec..94c8a69 100644
--- a/testsuite/systemtap.examples/io/deviceseeks.meta
+++ b/testsuite/systemtap.examples/io/deviceseeks.meta
@@ -3,7 +3,7 @@ name: deviceseeks.stp
 version: 1.0
 author: Dominic Duval
 keywords: disk
-subsystem: disk
+subsystem: disk io
 status: production
 exit: user-controlled
 output: histogram
diff --git a/testsuite/systemtap.examples/io/disktop.meta b/testsuite/systemtap.examples/io/disktop.meta
index 1d0ce04..c03362b 100644
--- a/testsuite/systemtap.examples/io/disktop.meta
+++ b/testsuite/systemtap.examples/io/disktop.meta
@@ -3,7 +3,7 @@ name: disktop.stp
 version: 1.0
 author: Oracle
 keywords: disk
-subsystem: disk
+subsystem: disk io
 status: production
 exit: user-controlled
 output: timed
diff --git a/testsuite/systemtap.examples/io/io_submit.meta b/testsuite/systemtap.examples/io/io_submit.meta
index 7bbc33a..2dcb5b4 100644
--- a/testsuite/systemtap.examples/io/io_submit.meta
+++ b/testsuite/systemtap.examples/io/io_submit.meta
@@ -6,7 +6,7 @@ keywords: io backtrace
 subsystem: io
 status: production
 exit: user-controlled
-output: sorted on-exit
+output: sorted-list on-exit
 scope: system-wide
 description: When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.
 test_check: stap -p4 io_submit.stp
diff --git a/testsuite/systemtap.examples/io/ioblktime.meta b/testsuite/systemtap.examples/io/ioblktime.meta
index ff895a3..b17ff8a 100644
--- a/testsuite/systemtap.examples/io/ioblktime.meta
+++ b/testsuite/systemtap.examples/io/ioblktime.meta
@@ -3,7 +3,7 @@ name: ioblktime.stp
 version: 1.0
 author: William Cohen
 keywords: io
-subsystem: kernel
+subsystem: io
 status: production
 exit: user-controlled
 output: sorted-list
diff --git a/testsuite/systemtap.examples/io/iostat-scsi.meta b/testsuite/systemtap.examples/io/iostat-scsi.meta
index 6aa4c5d..5b3121a 100644
--- a/testsuite/systemtap.examples/io/iostat-scsi.meta
+++ b/testsuite/systemtap.examples/io/iostat-scsi.meta
@@ -1,4 +1,4 @@
-title: iostat for SCSI Devices
+title: IO Statistics for SCSI Devices
 name: iostat-scsi.stp
 version: 1.0
 author: anonymous
diff --git a/testsuite/systemtap.examples/io/iotime.meta b/testsuite/systemtap.examples/io/iotime.meta
index 30e0599..9685273 100644
--- a/testsuite/systemtap.examples/io/iotime.meta
+++ b/testsuite/systemtap.examples/io/iotime.meta
@@ -2,8 +2,8 @@ title: Trace Time Spent in Read and Write for Files
 name: iotime.stp
 version: 1.0
 author: Daniel Berrange and Will Cohen
-keywords: syscall read write time io
-subsystem: syscall
+keywords: profiling syscall io file
+subsystem: syscall io
 status: production
 exit: user-controlled
 output: trace
diff --git a/testsuite/systemtap.examples/io/iotop.meta b/testsuite/systemtap.examples/io/iotop.meta
index 52a8e2f..cec03b3 100644
--- a/testsuite/systemtap.examples/io/iotop.meta
+++ b/testsuite/systemtap.examples/io/iotop.meta
@@ -1,4 +1,4 @@
-title: Periodically Print I/O Activity by Process Name
+title: Periodically Print IO Activity by Process Name
 name: iotop.stp
 version: 1.0
 author: anonymous
diff --git a/testsuite/systemtap.examples/io/mbrwatch.meta b/testsuite/systemtap.examples/io/mbrwatch.meta
index 344c951..6a6f0dd 100644
--- a/testsuite/systemtap.examples/io/mbrwatch.meta
+++ b/testsuite/systemtap.examples/io/mbrwatch.meta
@@ -1,6 +1,13 @@
-title: Monitor read/write of MBR (boot sector) area of block devices
+title: Monitor Read/Write of the Boot Sector Area of Block Devices
 name: mbrwatch.stp
+version: 1.0
+author: anonymous
 keywords: io monitoring disk
+subsystem: io
+status: proposed
+exit: user-controlled
+output: trace
+scope: system-wide
 description:  The mbrwatch.stp script reports any attempted reads/writes of the first few sectors of a raw block device.
 test_check: stap -p4 mbrwatch.stp
 test_installcheck: stap mbrwatch.stp -c "dd of=/dev/null count=1 if=/dev/`grep -v major /proc/partitions | grep . | awk '{print $4}' | head -1`"
diff --git a/testsuite/systemtap.examples/io/traceio.meta b/testsuite/systemtap.examples/io/traceio.meta
index 77e7f5d..e6f047f 100644
--- a/testsuite/systemtap.examples/io/traceio.meta
+++ b/testsuite/systemtap.examples/io/traceio.meta
@@ -1,4 +1,4 @@
-title: Track Cumulative I/O Activity by Process Name
+title: Track Cumulative IO Activity by Process Name
 name: traceio.stp
 version: 1.0
 author: Red Hat
diff --git a/testsuite/systemtap.examples/io/traceio2.meta b/testsuite/systemtap.examples/io/traceio2.meta
index 432978c..b9d314a 100644
--- a/testsuite/systemtap.examples/io/traceio2.meta
+++ b/testsuite/systemtap.examples/io/traceio2.meta
@@ -1,4 +1,4 @@
-title: Watch I/O Activity on a Particular Device
+title: Watch IO Activity on a Particular Device
 name: traceio2.stp
 version: 1.0
 author: Red Hat
diff --git a/testsuite/systemtap.examples/io/ttyspy.meta b/testsuite/systemtap.examples/io/ttyspy.meta
index eee5537..febb79c 100644
--- a/testsuite/systemtap.examples/io/ttyspy.meta
+++ b/testsuite/systemtap.examples/io/ttyspy.meta
@@ -1,6 +1,13 @@
-title: Monitor tty typing.
+title: Monitor TTY Typing
 name: ttyspy.stp
+version: 1.0
+author: anonymous
 keywords: io tty monitoring
+subsystem: io
+status: proposed
+exit: user-controlled
+output: trace
+scope: system-wide
 description: The ttyspy.stp script uses tty_audit hooks to monitor recent typing activity on the system, printing a scrolling record of recent keystrokes, on a per-tty basis.
 test_support: stap -l 'kernel.function("tty_audit_add_data")'
 test_check: stap -gp4 ttyspy.stp
-- 
1.7.6.4