[Qemu-devel] [PATCH v2 for-2.7] Update ancient copyright string in -version output

[Qemu-devel] [PATCH v2 for-2.7] Update ancient copyright string in -version output

[Peter Maydell]

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>
---
The aim here is to (1) update the dates and (2) acknowledge
the work of all our contributors. I'm open to bikeshedding
on the exact wording (or on which header file we should
put the #define in...)

I only pulled out the copyright string proper into the #define
because a GUI About box is going to want just that, with no
leading ',' or trailing newline.

Fabrice: I have cc'd you since this is proposing an update
to your copyright info.

v1->v2 changes: add the qemu-img.c string.
---
 bsd-user/main.c       | 3 ++-
 include/qemu-common.h | 4 ++++
 linux-user/main.c     | 2 +-
 qemu-img.c            | 2 +-
 vl.c                  | 3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bsd-user/main.c b/bsd-user/main.c
index bbba43f..b4a0a00 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 1f2cb94..9e8b0bd 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 462e820..f2f4d2f 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 2e40e1f..def9f96 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;
diff --git a/vl.c b/vl.c
index e7c2c62..57f34d0 100644
--- a/vl.c
+++ b/vl.c
@@ -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)
-- 
1.9.1

Re: [Qemu-devel] [PATCH v2 for-2.7] Update ancient copyright string in -version output

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 2117 bytes --]

On 08/04/2016 05:14 AM, Peter Maydell wrote:
> 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>

> The aim here is to (1) update the dates and (2) acknowledge
> the work of all our contributors. I'm open to bikeshedding
> on the exact wording (or on which header file we should
> put the #define in...)
> 
> I only pulled out the copyright string proper into the #define
> because a GUI About box is going to want just that, with no
> leading ',' or trailing newline.
> 
> Fabrice: I have cc'd you since this is proposing an update
> to your copyright info.
> 
> v1->v2 changes: add the qemu-img.c string.
> ---
>  bsd-user/main.c       | 3 ++-
>  include/qemu-common.h | 4 ++++
>  linux-user/main.c     | 2 +-
>  qemu-img.c            | 2 +-
>  vl.c                  | 3 ++-
>  5 files changed, 10 insertions(+), 4 deletions(-)

qemu-io has a --version option that probably ought to output copyright
information, but as it currently does not do so, this patch need not be
the one that tweaks it.

qemu-nbd has a --version option, where the copyright info is currently:
Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>.

I don't know if we want to rework that one in light of this patch, or if
we can just blindly use this code.  Anthony?

> +/* Copyright string for -version arguments, About dialogs, etc */
> +#define QEMU_COPYRIGHT "Copyright (c) 2003-2016 " \
> +    "Fabrice Bellard and the QEMU Project developers"
> +

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH v2 for-2.7] Update ancient copyright string in -version output

[Peter Maydell]

On 4 August 2016 at 12:14, Peter Maydell <peter.maydell@linaro.org> wrote:
> 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>
> ---
> The aim here is to (1) update the dates and (2) acknowledge
> the work of all our contributors. I'm open to bikeshedding
> on the exact wording (or on which header file we should
> put the #define in...)
>
> I only pulled out the copyright string proper into the #define
> because a GUI About box is going to want just that, with no
> leading ',' or trailing newline.
>
> Fabrice: I have cc'd you since this is proposing an update
> to your copyright info.
>
> v1->v2 changes: add the qemu-img.c string.

Applied to master, thanks.

-- PMM