[libvirt] [PATCH v2 0/2] QEMU copyright update
Hello, For 1.0 I had brought up the issue that the copyright statement reads 2008. Mentor Graphics have solved this for their Sourcery CodeBench fork by printing: Copyright (c) 2003-2008 Fabrice Bellard, 2008-2011 Mentor Graphics For the QEMU community it's less clear whom to assign the copyright to, thus my proposal is the appendix "and contributors". v2 applies this change to softmmus, linux-user and bsd-user (pointed out by PMM). darwin-user is intentionally left out as there is a pending PULL for its removal. Also included is a change to the bsd-user version banner. CC'ing libvirt since it has been sensitive to changes there in the past. Regards, Andreas Cc: Anthony Liguori <anthony@codemonkey.ws> Cc: Fabrice Bellard <fabrice@bellard.org> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Natalia Portillo <claunia@claunia.com> Cc: libvirt <libvir-list@redhat.com> Andreas Färber (2): Update copyright banners bsd-user: Output package version bsd-user/main.c | 3 ++- linux-user/main.c | 2 +- vl.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) -- 1.7.7
The copyright statements printed by the various executables have not been touched since r3893 / 68d0f70e3c180253b637996f985dd9d248bd910a. So, judging by -version output, a user could get the impression that QEMU was last modified in 2008. We should therefore update it to the current year. However just changing the year seems wrong since Fabrice didn't contribute in recent years. Therefore extend the copyright statement to cover "Fabrice Bellard and contributors" so that it can be updated to the current year. Cc: Fabrice Bellard <fabrice@bellard.org> Signed-off-by: Andreas Färber <afaerber@suse.de> --- bsd-user/main.c | 3 ++- linux-user/main.c | 2 +- vl.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 0689e38..b2b5b69 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -672,7 +672,8 @@ void cpu_loop(CPUSPARCState *env) static void usage(void) { - printf("qemu-" TARGET_ARCH " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n" + printf("qemu-" TARGET_ARCH " version " QEMU_VERSION + ", Copyright (c) 2003-2012 Fabrice Bellard and contributors\n" "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n" "BSD CPU emulator (compiled for %s emulation)\n" "\n" diff --git a/linux-user/main.c b/linux-user/main.c index 191b750..8762075 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3120,7 +3120,7 @@ static void handle_arg_strace(const char *arg) static void handle_arg_version(const char *arg) { printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION - ", Copyright (c) 2003-2008 Fabrice Bellard\n"); + ", Copyright (c) 2003-2012 Fabrice Bellard and contributors\n"); exit(0); } diff --git a/vl.c b/vl.c index ae91a8a..9798f87 100644 --- a/vl.c +++ b/vl.c @@ -1561,7 +1561,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 + ", Copyright (c) 2003-2012 Fabrice Bellard and contributors\n"); } static void help(int exitcode) -- 1.7.7
On Fri, Apr 27, 2012 at 12:08:14PM +0200, Andreas Färber wrote:
The copyright statements printed by the various executables have not been touched since r3893 / 68d0f70e3c180253b637996f985dd9d248bd910a. So, judging by -version output, a user could get the impression that QEMU was last modified in 2008. We should therefore update it to the current year.
However just changing the year seems wrong since Fabrice didn't contribute in recent years. Therefore extend the copyright statement to cover "Fabrice Bellard and contributors" so that it can be updated to the current year.
[snip]
diff --git a/vl.c b/vl.c index ae91a8a..9798f87 100644 --- a/vl.c +++ b/vl.c @@ -1561,7 +1561,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 + ", Copyright (c) 2003-2012 Fabrice Bellard and contributors\n"); }
libvirt doesn't loook at anything after the version numbers, so changing the copyright part should be just fine from our POV. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
Commit 4a19f1eced611e7c3a0fba07d13515cbc73da09f (r7036) added a configure option --with-pkgversion for distributions and forks to label their derived versions. bsd-user was not updated at the time, so fix this while at it. Signed-off-by: Andreas Färber <afaerber@suse.de> --- bsd-user/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index b2b5b69..3434d48 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -672,7 +672,7 @@ void cpu_loop(CPUSPARCState *env) static void usage(void) { - printf("qemu-" TARGET_ARCH " version " QEMU_VERSION + printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2012 Fabrice Bellard and contributors\n" "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n" "BSD CPU emulator (compiled for %s emulation)\n" -- 1.7.7
participants (2)
-
Andreas Färber -
Daniel P. Berrange