diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-04 12:14:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-11 16:24:53 +0100 |
| commit | d915b7bb4c2956ea3ef223605abe257dc7d7445a (patch) | |
| tree | 3533b3a99ebd790c5aae44d279a2a6ad9e62359a | |
| parent | bea048dcb936816627301cb1744624eb79ac0488 (diff) | |
| download | qemu-d915b7bb4c2956ea3ef223605abe257dc7d7445a.tar.gz qemu-d915b7bb4c2956ea3ef223605abe257dc7d7445a.tar.bz2 qemu-d915b7bb4c2956ea3ef223605abe257dc7d7445a.zip | |
Update ancient copyright string in -version output
Currently the -version command line argument prints a string ending
with "Copyright (c) 2003-2008 Fabrice Bellard". This is now some
eight years out of date; abstract it out of the several places that
print the string and update it to:
Copyright (c) 2003-2016 Fabrice Bellard and the QEMU Project developers
to reflect the work by all the QEMU Project contributors over the
last decade.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1470309276-5012-1-git-send-email-peter.maydell@linaro.org
| -rw-r--r-- | bsd-user/main.c | 3 | ||||
| -rw-r--r-- | include/qemu-common.h | 4 | ||||
| -rw-r--r-- | linux-user/main.c | 2 | ||||
| -rw-r--r-- | qemu-img.c | 2 | ||||
| -rw-r--r-- | vl.c | 3 |
5 files changed, 10 insertions, 4 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c index bbba43f716..b4a0a00c3f 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -667,7 +667,8 @@ void cpu_loop(CPUSPARCState *env) static void usage(void) { - printf("qemu-" TARGET_NAME " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n" + printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION + ", " QEMU_COPYRIGHT "\n" "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n" "BSD CPU emulator (compiled for %s emulation)\n" "\n" diff --git a/include/qemu-common.h b/include/qemu-common.h index 1f2cb94318..9e8b0bd991 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -18,6 +18,10 @@ #include "qemu/option.h" +/* Copyright string for -version arguments, About dialogs, etc */ +#define QEMU_COPYRIGHT "Copyright (c) 2003-2016 " \ + "Fabrice Bellard and the QEMU Project developers" + /* main function, renamed */ #if defined(CONFIG_COCOA) int qemu_main(int argc, char **argv, char **envp); diff --git a/linux-user/main.c b/linux-user/main.c index 462e820469..f2f4d2f05a 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4000,7 +4000,7 @@ static void handle_arg_strace(const char *arg) static void handle_arg_version(const char *arg) { printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION - ", Copyright (c) 2003-2008 Fabrice Bellard\n"); + ", " QEMU_COPYRIGHT "\n"); exit(EXIT_SUCCESS); } diff --git a/qemu-img.c b/qemu-img.c index d2865a589e..f204d04136 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -44,7 +44,7 @@ #include <getopt.h> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ - ", Copyright (c) 2004-2008 Fabrice Bellard\n" + ", " QEMU_COPYRIGHT "\n" typedef struct img_cmd_t { const char *name; @@ -1914,7 +1914,8 @@ static void main_loop(void) static void version(void) { - printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"); + printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ", " + QEMU_COPYRIGHT "\n"); } static void help(int exitcode) |