Skip to content

Commit

Permalink
Update ancient copyright string in -version output
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pm215 committed Aug 11, 2016
1 parent bea048d commit d915b7b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
3 changes: 2 additions & 1 deletion bsd-user/main.c
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions include/qemu-common.h
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion linux-user/main.c
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion qemu-img.c
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion vl.c
Expand Up @@ -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)
Expand Down

0 comments on commit d915b7b

Please sign in to comment.