Patchwork linux-user: Add support for -version option

login
register
mail settings
Submitter Peter Maydell
Date Jan. 20, 2011, 3:28 a.m.
Message ID <1295494082-3275-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/79635/
State New
Headers show

Comments

Peter Maydell - Jan. 20, 2011, 3:28 a.m.
Add support to the linux-user qemu for the -version command line
option, bringing it into line with the system emulation qemu.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 linux-user/main.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
Peter Maydell - Feb. 7, 2011, 3:47 p.m.
Ping?

On 20 January 2011 03:28, Peter Maydell <peter.maydell@linaro.org> wrote:
> Add support to the linux-user qemu for the -version command line
> option, bringing it into line with the system emulation qemu.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  linux-user/main.c |   17 +++++++++++++----
>  1 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 0d627d6..e651bfd 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -2624,14 +2624,21 @@ void cpu_loop (CPUState *env)
>  }
>  #endif /* TARGET_ALPHA */
>
> +static void version(void)
> +{
> +    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION
> +           ", Copyright (c) 2003-2008 Fabrice Bellard\n");
> +}
> +
>  static void usage(void)
>  {
> -    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
> -           "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
> +    version();
> +    printf("usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
>            "Linux CPU emulator (compiled for %s emulation)\n"
>            "\n"
>            "Standard options:\n"
>            "-h                print this help\n"
> +           "-version          display version information and exit\n"
>            "-g port           wait gdb connection to port\n"
>            "-L path           set the elf interpreter prefix (default=%s)\n"
>            "-s size           set the stack size in bytes (default=%ld)\n"
> @@ -2886,8 +2893,10 @@ int main(int argc, char **argv, char **envp)
>             singlestep = 1;
>         } else if (!strcmp(r, "strace")) {
>             do_strace = 1;
> -        } else
> -        {
> +        } else if (!strcmp(r, "version")) {
> +            version();
> +            exit(0);
> +        } else {
>             usage();
>         }
>     }
> --
> 1.6.3.3
>
>
>

Patch

diff --git a/linux-user/main.c b/linux-user/main.c
index 0d627d6..e651bfd 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2624,14 +2624,21 @@  void cpu_loop (CPUState *env)
 }
 #endif /* TARGET_ALPHA */
 
+static void version(void)
+{
+    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION
+           ", Copyright (c) 2003-2008 Fabrice Bellard\n");
+}
+
 static void usage(void)
 {
-    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
-           "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
+    version();
+    printf("usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
            "Linux CPU emulator (compiled for %s emulation)\n"
            "\n"
            "Standard options:\n"
            "-h                print this help\n"
+           "-version          display version information and exit\n"
            "-g port           wait gdb connection to port\n"
            "-L path           set the elf interpreter prefix (default=%s)\n"
            "-s size           set the stack size in bytes (default=%ld)\n"
@@ -2886,8 +2893,10 @@  int main(int argc, char **argv, char **envp)
             singlestep = 1;
         } else if (!strcmp(r, "strace")) {
             do_strace = 1;
-        } else
-        {
+        } else if (!strcmp(r, "version")) {
+            version();
+            exit(0);
+        } else {
             usage();
         }
     }