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 <th...@redhat.com>
> ---
> 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 <getopt.h>
>
> #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
