From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btXRO-0001d4-N3 for qemu-devel@nongnu.org; Mon, 10 Oct 2016 06:04:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btXRJ-0001m2-Cb for qemu-devel@nongnu.org; Mon, 10 Oct 2016 06:04:13 -0400 References: <1475661284-30153-1-git-send-email-thuth@redhat.com> From: Paolo Bonzini Message-ID: Date: Mon, 10 Oct 2016 12:03:58 +0200 MIME-Version: 1.0 In-Reply-To: <1475661284-30153-1-git-send-email-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Put the copyright information on a separate line List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Riku Voipio On 05/10/2016 11:54, Thomas Huth wrote: > The output string QEMU with "--version" is very long, it does > not fit into a normal line of a terminal window anymore. By > putting the copyright information on a separate line instead, > the output looks much nicer. > > Signed-off-by: Thomas Huth > --- > Note: I'm not sure whether there is a technical or legal reason > that the copyright information has to be on the same line as the > version information, but if there is no such reason, I think > a separate line looks much nicer here. > > bsd-user/main.c | 2 +- > linux-user/main.c | 2 +- > qemu-img.c | 2 +- > vl.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/bsd-user/main.c b/bsd-user/main.c > index d803d3e..cd8ba64 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -651,7 +651,7 @@ void cpu_loop(CPUSPARCState *env) > static void usage(void) > { > printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION > - ", " QEMU_COPYRIGHT "\n" > + "\n" QEMU_COPYRIGHT "\n" > "usage: qemu-" TARGET_NAME " [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 9e4b430..1be24d9 100644 > --- a/linux-user/main.c > +++ b/linux-user/main.c > @@ -3936,7 +3936,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 > - ", " QEMU_COPYRIGHT "\n"); > + "\n" QEMU_COPYRIGHT "\n"); > exit(EXIT_SUCCESS); > } > > diff --git a/qemu-img.c b/qemu-img.c > index ceffefe..7e05349 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -44,7 +44,7 @@ > #include > > #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ > - ", " QEMU_COPYRIGHT "\n" > + "\n" QEMU_COPYRIGHT "\n" > > typedef struct img_cmd_t { > const char *name; > diff --git a/vl.c b/vl.c > index f3abd99..4dd6399 100644 > --- a/vl.c > +++ b/vl.c > @@ -1954,7 +1954,7 @@ static void main_loop(void) > > static void version(void) > { > - printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ", " > + printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION "\n" > QEMU_COPYRIGHT "\n"); > } > > Queued, thanks. Paolo