Documentation: Change the binary name from *kvm* to *lkvm*, since commit ad3efb18 already called the binary *lkvm* and with a alias name *vm*. Signed-off-by: Wanlong Gao <gaowanlong@xxxxxxxxxxxxxx> --- tools/kvm/Documentation/kernel-debugging.txt | 2 +- tools/kvm/Documentation/kvm-balloon.txt | 8 ++++---- tools/kvm/Documentation/kvm-debug.txt | 8 ++++---- tools/kvm/Documentation/kvm-list.txt | 8 ++++---- tools/kvm/Documentation/kvm-pause.txt | 8 ++++---- tools/kvm/Documentation/kvm-resume.txt | 8 ++++---- tools/kvm/Documentation/kvm-run.txt | 6 +++--- tools/kvm/Documentation/kvm-sandbox.txt | 6 +++--- tools/kvm/Documentation/kvm-setup.txt | 6 +++--- tools/kvm/Documentation/kvm-stat.txt | 8 ++++---- tools/kvm/Documentation/kvm-stop.txt | 8 ++++---- tools/kvm/Documentation/kvm-version.txt | 6 +++--- tools/kvm/command-list.txt | 22 +++++++++++----------- tools/kvm/util/generate-cmdlist.sh | 4 ++-- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tools/kvm/Documentation/kernel-debugging.txt b/tools/kvm/Documentation/kernel-debugging.txt index 7feeb30..98b9438 100644 --- a/tools/kvm/Documentation/kernel-debugging.txt +++ b/tools/kvm/Documentation/kernel-debugging.txt @@ -1,7 +1,7 @@ This document explains how to debug a guests' kernel using KGDB. 1. Run the guest: - 'kvm run -k [vmlinuz] -p "kgdboc=ttyS1 kgdbwait" --tty 1' + 'lkvm run -k [vmlinuz] -p "kgdboc=ttyS1 kgdbwait" --tty 1' And see which PTY got assigned to ttyS1 (you'll see: ' Info: Assigned terminal 1 to pty /dev/pts/X'). diff --git a/tools/kvm/Documentation/kvm-balloon.txt b/tools/kvm/Documentation/kvm-balloon.txt index a29a201..efc0a87 100644 --- a/tools/kvm/Documentation/kvm-balloon.txt +++ b/tools/kvm/Documentation/kvm-balloon.txt @@ -1,20 +1,20 @@ -kvm-balloon(1) +lkvm-balloon(1) ================ NAME ---- -kvm-balloon - Inflate or deflate the virtio balloon +lkvm-balloon - Inflate or deflate the virtio balloon SYNOPSIS -------- [verse] -'kvm balloon [command] [size] [instance]' +'lkvm balloon [command] [size] [instance]' DESCRIPTION ----------- The command inflates or deflates the virtio balloon located in the specified instance. -For a list of running instances see 'kvm list'. +For a list of running instances see 'lkvm list'. Command can be either 'inflate' or 'deflate'. Inflate increases the size of the balloon, thus decreasing the amount of virtual RAM available diff --git a/tools/kvm/Documentation/kvm-debug.txt b/tools/kvm/Documentation/kvm-debug.txt index 273af15..a8eb2c0 100644 --- a/tools/kvm/Documentation/kvm-debug.txt +++ b/tools/kvm/Documentation/kvm-debug.txt @@ -1,16 +1,16 @@ -kvm-debug(1) +lkvm-debug(1) ================ NAME ---- -kvm-debug - Print debug information from a running instance +lkvm-debug - Print debug information from a running instance SYNOPSIS -------- [verse] -'kvm debug [instance]' +'lkvm debug [instance]' DESCRIPTION ----------- The command prints debug information from a running instance. -For a list of running instances see 'kvm list'. +For a list of running instances see 'lkvm list'. diff --git a/tools/kvm/Documentation/kvm-list.txt b/tools/kvm/Documentation/kvm-list.txt index 121e45c..a245607 100644 --- a/tools/kvm/Documentation/kvm-list.txt +++ b/tools/kvm/Documentation/kvm-list.txt @@ -1,16 +1,16 @@ -kvm-list(1) +lkvm-list(1) ================ NAME ---- -kvm-list - Print a list of running instances on the host. +lkvm-list - Print a list of running instances on the host. SYNOPSIS -------- [verse] -'kvm list' +'lkvm list' DESCRIPTION ----------- This command prints a list of running instances on the host which -belong to the user who currently ran 'kvm list'. +belong to the user who currently ran 'lkvm list'. diff --git a/tools/kvm/Documentation/kvm-pause.txt b/tools/kvm/Documentation/kvm-pause.txt index 770bcfe..1ea2a23 100644 --- a/tools/kvm/Documentation/kvm-pause.txt +++ b/tools/kvm/Documentation/kvm-pause.txt @@ -1,16 +1,16 @@ -kvm-pause(1) +lkvm-pause(1) ================ NAME ---- -kvm-pause - Pause the virtual machine +lkvm-pause - Pause the virtual machine SYNOPSIS -------- [verse] -'kvm pause [instance]' +'lkvm pause [instance]' DESCRIPTION ----------- The command pauses a virtual machine. -For a list of running instances see 'kvm list'. +For a list of running instances see 'lkvm list'. diff --git a/tools/kvm/Documentation/kvm-resume.txt b/tools/kvm/Documentation/kvm-resume.txt index 918648e..a36c4df 100644 --- a/tools/kvm/Documentation/kvm-resume.txt +++ b/tools/kvm/Documentation/kvm-resume.txt @@ -1,16 +1,16 @@ -kvm-resume(1) +lkvm-resume(1) ================ NAME ---- -kvm-resume - Resume the virtual machine +lkvm-resume - Resume the virtual machine SYNOPSIS -------- [verse] -'kvm resume [instance]' +'lkvm resume [instance]' DESCRIPTION ----------- The command resumes a virtual machine. -For a list of running instances see 'kvm list'. +For a list of running instances see 'lkvm list'. diff --git a/tools/kvm/Documentation/kvm-run.txt b/tools/kvm/Documentation/kvm-run.txt index 6513427..8ddf470 100644 --- a/tools/kvm/Documentation/kvm-run.txt +++ b/tools/kvm/Documentation/kvm-run.txt @@ -1,14 +1,14 @@ -kvm-run(1) +lkvm-run(1) ================ NAME ---- -kvm-run - Start the virtual machine +lkvm-run - Start the virtual machine SYNOPSIS -------- [verse] -'kvm run' [-k <kernel image> | --kernel <kernel image>] +'lkvm run' [-k <kernel image> | --kernel <kernel image>] DESCRIPTION ----------- diff --git a/tools/kvm/Documentation/kvm-sandbox.txt b/tools/kvm/Documentation/kvm-sandbox.txt index 8f24fc7..2d7f558 100644 --- a/tools/kvm/Documentation/kvm-sandbox.txt +++ b/tools/kvm/Documentation/kvm-sandbox.txt @@ -1,14 +1,14 @@ -kvm-sandbox(1) +lkvm-sandbox(1) ================ NAME ---- -kvm-sandbox - Run a command in a sandboxed guest +lkvm-sandbox - Run a command in a sandboxed guest SYNOPSIS -------- [verse] -'kvm sandbox ['kvm run' arguments] -- [sandboxed command]' +'lkvm sandbox ['lkvm run' arguments] -- [sandboxed command]' DESCRIPTION ----------- diff --git a/tools/kvm/Documentation/kvm-setup.txt b/tools/kvm/Documentation/kvm-setup.txt index c845d171..4b6e331 100644 --- a/tools/kvm/Documentation/kvm-setup.txt +++ b/tools/kvm/Documentation/kvm-setup.txt @@ -1,14 +1,14 @@ -kvm-setup(1) +lkvm-setup(1) ================ NAME ---- -kvm-setup - Setup a new virtual machine +lkvm-setup - Setup a new virtual machine SYNOPSIS -------- [verse] -'kvm setup <name>' +'lkvm setup <name>' DESCRIPTION ----------- diff --git a/tools/kvm/Documentation/kvm-stat.txt b/tools/kvm/Documentation/kvm-stat.txt index ce5ab54..101ce7a 100644 --- a/tools/kvm/Documentation/kvm-stat.txt +++ b/tools/kvm/Documentation/kvm-stat.txt @@ -1,19 +1,19 @@ -kvm-stat(1) +lkvm-stat(1) ================ NAME ---- -kvm-stat - Print statistics about a running instance +lkvm-stat - Print statistics about a running instance SYNOPSIS -------- [verse] -'kvm [command] [-n instance] [-p instance pid] [--all]' +'lkvm [command] [-n instance] [-p instance pid] [--all]' DESCRIPTION ----------- The command prints statistics about a running instance. -For a list of running instances see 'kvm list'. +For a list of running instances see 'lkvm list'. Commands: --memory, -m Display memory statistics diff --git a/tools/kvm/Documentation/kvm-stop.txt b/tools/kvm/Documentation/kvm-stop.txt index 5267081..6e4bc83 100644 --- a/tools/kvm/Documentation/kvm-stop.txt +++ b/tools/kvm/Documentation/kvm-stop.txt @@ -1,16 +1,16 @@ -kvm-stop(1) +lkvm-stop(1) ================ NAME ---- -kvm-stop - Stop a running instance +lkvm-stop - Stop a running instance SYNOPSIS -------- [verse] -'kvm stop [instance]' +'lkvm stop [instance]' DESCRIPTION ----------- The command stops a running instance. -For a list of running instances see 'kvm list'. +For a list of running instances see 'lkvm list'. diff --git a/tools/kvm/Documentation/kvm-version.txt b/tools/kvm/Documentation/kvm-version.txt index bf51540..41003d2 100644 --- a/tools/kvm/Documentation/kvm-version.txt +++ b/tools/kvm/Documentation/kvm-version.txt @@ -1,15 +1,15 @@ -kvm-version(1) +lkvm-version(1) ================ NAME ---- -kvm-version - Print the version of the kernel tree kvm tools +lkvm-version - Print the version of the kernel tree kvm tools was built on. SYNOPSIS -------- [verse] -'kvm version' +'lkvm version' DESCRIPTION ----------- diff --git a/tools/kvm/command-list.txt b/tools/kvm/command-list.txt index 53469ab..d93597d 100644 --- a/tools/kvm/command-list.txt +++ b/tools/kvm/command-list.txt @@ -2,14 +2,14 @@ # List of known perf commands. # command name category [deprecated] [common] # -kvm-run mainporcelain common -kvm-setup mainporcelain common -kvm-pause common -kvm-resume common -kvm-version common -kvm-list common -kvm-debug common -kvm-balloon common -kvm-stop common -kvm-stat common -kvm-sandbox common +lkvm-run mainporcelain common +lkvm-setup mainporcelain common +lkvm-pause common +lkvm-resume common +lkvm-version common +lkvm-list common +lkvm-debug common +lkvm-balloon common +lkvm-stop common +lkvm-stat common +lkvm-sandbox common diff --git a/tools/kvm/util/generate-cmdlist.sh b/tools/kvm/util/generate-cmdlist.sh index fe0178e..c8be0bd 100755 --- a/tools/kvm/util/generate-cmdlist.sh +++ b/tools/kvm/util/generate-cmdlist.sh @@ -9,11 +9,11 @@ struct cmdname_help static struct cmdname_help common_cmds[] = {" -sed -n 's/^kvm-\([^ \t]*\).*common/\1/p' command-list.txt | +sed -n 's/^lkvm-\([^ \t]*\).*common/\1/p' command-list.txt | while read cmd do # TODO following sed command should be fixed - sed -n '/^NAME/,/^kvm-'"$cmd"'/ { + sed -n '/^NAME/,/^lkvm-'"$cmd"'/ { /NAME/d /--/d s/.*kvm-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/ -- 1.7.8 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html