Commit d915b7bb authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1470309276-5012-1-git-send-email-peter.maydell@linaro.org
parent bea048dc

bsd-user/main.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

include/qemu-common.h

+4 −0
Original line number Diff line number Diff line
@@ -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);

linux-user/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

qemu-img.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

vl.c

+2 −1
Original line number Diff line number Diff line
@@ -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)