From patchwork Thu Jul 28 15:24:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9251427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F0292607D3 for ; Thu, 28 Jul 2016 15:52:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0C5927BFF for ; Thu, 28 Jul 2016 15:52:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3A6E27D5E; Thu, 28 Jul 2016 15:52:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1FEFA27BFF for ; Thu, 28 Jul 2016 15:51:59 +0000 (UTC) Received: from localhost ([::1]:54139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSnbK-0002CQ-Pv for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Jul 2016 11:51:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSnB5-0002Sr-SJ for qemu-devel@nongnu.org; Thu, 28 Jul 2016 11:24:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSnB4-0002EA-Ol for qemu-devel@nongnu.org; Thu, 28 Jul 2016 11:24:51 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:58466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSnB4-0002Dz-HQ for qemu-devel@nongnu.org; Thu, 28 Jul 2016 11:24:50 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bSnB0-0003XD-OH; Thu, 28 Jul 2016 16:24:46 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 28 Jul 2016 16:24:45 +0100 Message-Id: <1469719485-31366-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH] Update ancient copyright string in QEMU -version output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Bellard , Stefan Hajnoczi , patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Stefan Hajnoczi --- The aim here is to (1) update the dates and (2) acknowledge the work of all our contributors. I'm open to suggestions 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. bsd-user/main.c | 3 ++- include/qemu-common.h | 4 ++++ linux-user/main.c | 2 +- vl.c | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 315ba1d..b7524dd 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/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)