| Message ID | 1475661284-30153-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 05.10.2016 um 11:54 hat Thomas Huth geschrieben: > 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 <thuth@redhat.com> Acked-by: Kevin Wolf <kwolf@redhat.com> Is this something for qemu-trivial? Kevin
On 10/05/2016 04:54 AM, 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 <thuth@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. There's precedent for separate lines of information (to wit, 'ls --version' is the first thing I compared against), so I doubt there's any legal reason (at any rate, if legality were an issue, I'm sure that more programs would have run into that reason and adjusted to be single-line output). The only technical reason for a long line would be for machine parsing, but we recommend (and libvirt uses) QMP for machine-parseable version number information, rather than scraping --version. So I'm in favor of this. Reviewed-by: Eric Blake <eblake@redhat.com>
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 <thuth@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
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"); }
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 <thuth@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(-)