openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Peter Maydell 2016-08-04 12:14:36 +01:00
parent bea048dcb9
commit d915b7bb4c
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bsd-user/main.c
View File

@ -667,7 +667,8 @@ void cpu_loop(CPUSPARCState *env)
static void usage(void) 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" "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n"
"BSD CPU emulator (compiled for %s emulation)\n" "BSD CPU emulator (compiled for %s emulation)\n"
"\n" "\n"

4
include/qemu-common.h
View File

@ -18,6 +18,10 @@
#include "qemu/option.h" #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 */ /* main function, renamed */
#if defined(CONFIG_COCOA) #if defined(CONFIG_COCOA)
int qemu_main(int argc, char **argv, char **envp); int qemu_main(int argc, char **argv, char **envp);

2
linux-user/main.c
View File

@ -4000,7 +4000,7 @@ static void handle_arg_strace(const char *arg)
static void handle_arg_version(const char *arg) static void handle_arg_version(const char *arg)
{ {
printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION
", Copyright (c) 2003-2008 Fabrice Bellard\n"); ", " QEMU_COPYRIGHT "\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }

2
qemu-img.c
View File

@ -44,7 +44,7 @@
#include <getopt.h> #include <getopt.h>
#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ #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 { typedef struct img_cmd_t {
const char *name; const char *name;

3
vl.c
View File

@ -1914,7 +1914,8 @@ static void main_loop(void)
static void version(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) static void help(int exitcode)