[PATCH 1/2] kvm tools: remove unused options

[PATCH 1/2] kvm tools: remove unused options

[Liming Wang]

From: walimis <walimisdev@gmail.com>

kvm "--help" and "--version" are not implemented, so remove them to
avoid ambiguous.

Signed-off-by: walimis <walimisdev@gmail.com>
---
 tools/kvm/builtin-help.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/kvm/builtin-help.c b/tools/kvm/builtin-help.c
index e89cd5c..e70044a 100644
--- a/tools/kvm/builtin-help.c
+++ b/tools/kvm/builtin-help.c
@@ -10,7 +10,7 @@
 
 
 const char kvm_usage_string[] =
-	"kvm [--version] [--help] COMMAND [ARGS]";
+	"kvm COMMAND [ARGS]";
 
 const char kvm_more_info_string[] =
 	"See 'kvm help COMMAND' for more information on a specific command.";
-- 
1.7.0.4

[PATCH 2/2] kvm tools: Fix wrong help message for kvm pause

[Liming Wang]

From: walimis <walimisdev@gmail.com>

replace debug with pause for kvm pause.

Signed-off-by: walimis <walimisdev@gmail.com>
---
 tools/kvm/builtin-pause.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/kvm/builtin-pause.c b/tools/kvm/builtin-pause.c
index 0c0010d..827b3b4 100644
--- a/tools/kvm/builtin-pause.c
+++ b/tools/kvm/builtin-pause.c
@@ -17,7 +17,7 @@ int kvm_cmd_pause(int argc, const char **argv, const char *prefix)
 	int pid;
 
 	if (argc != 1)
-		die("Usage: kvm debug [instance name]\n");
+		die("Usage: kvm pause [instance name]\n");
 
 	if (strcmp(argv[0], "all") == 0) {
 		kvm__enumerate_instances(do_pause);
-- 
1.7.0.4

Re: [PATCH 2/2] kvm tools: Fix wrong help message for kvm pause

[Pekka Enberg]

On Tue, 9 Aug 2011, Liming Wang wrote:

> From: walimis <walimisdev@gmail.com>
>
> replace debug with pause for kvm pause.
>
> Signed-off-by: walimis <walimisdev@gmail.com>
> ---
> tools/kvm/builtin-pause.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/kvm/builtin-pause.c b/tools/kvm/builtin-pause.c
> index 0c0010d..827b3b4 100644
> --- a/tools/kvm/builtin-pause.c
> +++ b/tools/kvm/builtin-pause.c
> @@ -17,7 +17,7 @@ int kvm_cmd_pause(int argc, const char **argv, const char *prefix)
> 	int pid;
>
> 	if (argc != 1)
> -		die("Usage: kvm debug [instance name]\n");
> +		die("Usage: kvm pause [instance name]\n");
>
> 	if (strcmp(argv[0], "all") == 0) {
> 		kvm__enumerate_instances(do_pause);

This was already fixed by an earlier patch from Sasha that I just merged 
to master. Thanks for the patch though!

Re: [PATCH 1/2] kvm tools: remove unused options

[Pekka Enberg]

On Tue, 9 Aug 2011, Liming Wang wrote:

> From: walimis <walimisdev@gmail.com>
>
> kvm "--help" and "--version" are not implemented, so remove them to
> avoid ambiguous.
>
> Signed-off-by: walimis <walimisdev@gmail.com>

The patch looks good but unfortunately I have to ask you to resend with 
proper Signed-off-by tag. I was about to fix it myself but noticed that 
you're sending patches from windriver.com but the signoff is for 
gmail.com.

I suppose you've simply forgotten to run git config user.name?

 			Pekka

> ---
> tools/kvm/builtin-help.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/kvm/builtin-help.c b/tools/kvm/builtin-help.c
> index e89cd5c..e70044a 100644
> --- a/tools/kvm/builtin-help.c
> +++ b/tools/kvm/builtin-help.c
> @@ -10,7 +10,7 @@
>
>
> const char kvm_usage_string[] =
> -	"kvm [--version] [--help] COMMAND [ARGS]";
> +	"kvm COMMAND [ARGS]";
>
> const char kvm_more_info_string[] =
> 	"See 'kvm help COMMAND' for more information on a specific command.";
> -- 
> 1.7.0.4
>
>

[PATCH 1/2] kvm tools: remove unused options

[walimis]

kvm "--help" and "--version" are not implemented, so remove them to
avoid ambiguous.

Signed-off-by: walimis <walimisdev@gmail.com>
---
 tools/kvm/builtin-help.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/kvm/builtin-help.c b/tools/kvm/builtin-help.c
index e89cd5c..e70044a 100644
--- a/tools/kvm/builtin-help.c
+++ b/tools/kvm/builtin-help.c
@@ -10,7 +10,7 @@
 
 
 const char kvm_usage_string[] =
-	"kvm [--version] [--help] COMMAND [ARGS]";
+	"kvm COMMAND [ARGS]";
 
 const char kvm_more_info_string[] =
 	"See 'kvm help COMMAND' for more information on a specific command.";
-- 
1.7.0.4

[PATCH 1/2] kvm tools: remove unused options

[walimis]

kvm "--help" and "--version" are not implemented, so remove them to
avoid ambiguous.

Signed-off-by: Liming Wang <walimisdev@gmail.com>
---
 tools/kvm/builtin-help.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/kvm/builtin-help.c b/tools/kvm/builtin-help.c
index e89cd5c..e70044a 100644
--- a/tools/kvm/builtin-help.c
+++ b/tools/kvm/builtin-help.c
@@ -10,7 +10,7 @@
 
 
 const char kvm_usage_string[] =
-	"kvm [--version] [--help] COMMAND [ARGS]";
+	"kvm COMMAND [ARGS]";
 
 const char kvm_more_info_string[] =
 	"See 'kvm help COMMAND' for more information on a specific command.";
-- 
1.7.0.4

Re: [PATCH 1/2] kvm tools: remove unused options

[Ingo Molnar]

* walimis <walimisdev@gmail.com> wrote:

> kvm "--help" and "--version" are not implemented, so remove them to
> avoid ambiguous.

would be nice to implement them: 'kvm --help' should probably map to 
'kvm help', and 'kvm --version' should output something similar to 
what 'perf --version' does:

 $ perf --version
 perf version 3.1.rc1.1356.g57e4aa

which is derived from the base kernel sha1.

Thanks,

	Ingo

Re: [PATCH 1/2] kvm tools: remove unused options

[Pekka Enberg]

On Tue, 9 Aug 2011, Ingo Molnar wrote:
>> kvm "--help" and "--version" are not implemented, so remove them to
>> avoid ambiguous.
>
> would be nice to implement them: 'kvm --help' should probably map to
> 'kvm help', and 'kvm --version' should output something similar to
> what 'perf --version' does:
>
> $ perf --version
> perf version 3.1.rc1.1356.g57e4aa
>
> which is derived from the base kernel sha1.

We already have that :-)

$ ./kvm version
3.0.rc5.755.ge8c28

Re: [PATCH 1/2] kvm tools: remove unused options

[Ingo Molnar]

* Pekka Enberg <penberg@kernel.org> wrote:

> On Tue, 9 Aug 2011, Ingo Molnar wrote:
> >>kvm "--help" and "--version" are not implemented, so remove them to
> >>avoid ambiguous.
> >
> >would be nice to implement them: 'kvm --help' should probably map to
> >'kvm help', and 'kvm --version' should output something similar to
> >what 'perf --version' does:
> >
> >$ perf --version
> >perf version 3.1.rc1.1356.g57e4aa
> >
> >which is derived from the base kernel sha1.
> 
> We already have that :-)
> 
> $ ./kvm version
> 3.0.rc5.755.ge8c28

Yeah - but --version is also a common thing to type. So in perf we 
support both (Git does the same):

 $ perf version
 perf version 3.1.rc1.1356.g57e4aa
 $ perf --version
 perf version 3.1.rc1.1356.g57e4aa
 $ git version
 git version 1.7.6
 $ git --version
 git version 1.7.6
 $

Btw., it might also be better to output:

 kvm version 3.0.1614.geb2e2c

Instead of the current:

 3.0.1614.geb2e2c

Thanks,

	Ingo