Polish the version strings containing the package version
PATCH 1/1 Polish the version strings containing the package version
Since commit 67a1de0d195a there is no space anymore between the version number and the parentheses when running configure with --with-pkgversion=foo :
$ qemu-system-s390x --version QEMU emulator version 2.11.50(foo)
But the space is included when building without that option when building from a git checkout:
$ qemu-system-s390x --version QEMU emulator version 2.11.50 (v2.11.0-1494-gbec9c64-dirty)
The same confusion exists with the "query-version" QMP command. Let's fix this by introducing a proper QEMU_FULL_VERSION definition that includes the space and parentheses, while the QEMU_PKGVERSION should just cleanly contain the package version string itself. Note that this also changes the behavior of the "query-version" QMP command (the space and parentheses are not included there anymore), but that's supposed to be OK since the strings there are not meant to be parsed by other tools.
--- Makefile | 20 +++++++++++--------- bsd-user/main.c | 2 +- configure | 2 +- linux-user/main.c | 2 +- qemu-img.c | 2 +- qemu-io.c | 2 +- qemu-nbd.c | 2 +- qga/main.c | 2 +- scsi/qemu-pr-helper.c | 2 +- ui/cocoa.m | 2 +- vl.c | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-)
Makefile +11 -9
@@ -367,21 +367,23 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules qemu-version.h: FORCE $(call quiet-command, \ (cd $(SRC_PATH); \ - printf '#define QEMU_PKGVERSION '; \ if test -n "$(PKGVERSION)"; then \ - printf '"$(PKGVERSION)"\n'; \ + pkgvers="$(PKGVERSION)"; \ else \ if test -d .git; then \ - printf '" ('; \ - git describe --match 'v*' 2>/dev/null | tr -d '\n'; \ + pkgvers=$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\ if ! git diff-index --quiet HEAD &>/dev/null; then \ - printf -- '-dirty'; \ + pkgvers="$${pkgvers}-dirty"; \ fi; \ - printf ')"\n'; \ - else \ - printf '""\n'; \ fi; \ - fi) > [email protected]) + fi; \ + printf "#define QEMU_PKGVERSION \"$${pkgvers}\"\n"; \ + if test -n "$${pkgvers}"; then \ + printf '#define QEMU_FULL_VERSION QEMU_VERSION " (" QEMU_PKGVERSION ")"\n'; \ + else \ + printf '#define QEMU_FULL_VERSION QEMU_VERSION\n'; \ + fi; \ + ) > [email protected]) $(call quiet-command, if ! cmp -s $@ [email protected]; then \ mv [email protected] $@; \ else \
bsd-user/main.c +1 -1
@@ -649,7 +649,7 @@ void cpu_loop(CPUSPARCState *env)static void usage (void ) { -printf ("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION +printf ("qemu-" TARGET_NAME " version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n" "BSD CPU emulator (compiled for %s emulation)\n"
configure +1 -1
@@ -1160,7 +1160,7 @@ for opt do ;; --disable-blobs) blobs="no" ;; - --with-pkgversion=*) pkgversion=" ($optarg)" + --with-pkgversion=*) pkgversion="$optarg" ;; --with-coroutine=*) coroutine="$optarg" ;;
linux-user/main.c +1 -1
@@ -4068,7 +4068,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 +printf ("qemu-" TARGET_NAME " version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" );exit (EXIT_SUCCESS ); }
qemu-img.c +1 -1
@@ -46,7 +46,7 @@#include "crypto/init.h" #include "trace/control.h" -#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ +#define QEMU_IMG_VERSION "qemu-img version " QEMU_FULL_VERSION \ "\n" QEMU_COPYRIGHT "\n" typedef struct img_cmd_t {
qemu-io.c +1 -1
@@ -534,7 +534,7 @@ int main(int argc, char **argv) trace_file =trace_opt_parse (optarg);break ;case 'V' : -printf ("%s version " QEMU_VERSION QEMU_PKGVERSION "\n" +printf ("%s version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" , progname);exit (0 );case 'h' :
qemu-nbd.c +1 -1
@@ -130,7 +130,7 @@ QEMU_HELP_BOTTOM "\n"static void version (const char *name) {printf ( -"%s " QEMU_VERSION QEMU_PKGVERSION "\n" +"%s " QEMU_FULL_VERSION "\n" "Written by Anthony Liguori.\n" "\n" QEMU_COPYRIGHT "\n"
qga/main.c +1 -1
@@ -218,7 +218,7 @@ static void usage(const char *cmd) {printf ("Usage: %s [-m <method> -p <path>] [<options>]\n" -"QEMU Guest Agent " QEMU_VERSION QEMU_PKGVERSION "\n" +"QEMU Guest Agent " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" "\n" " -m, --method transport method: one of unix-listen, virtio-serial,\n"
scsi/qemu-pr-helper.c +1 -1
@@ -102,7 +102,7 @@ QEMU_HELP_BOTTOM "\n"static void version (const char *name) {printf ( -"%s " QEMU_VERSION QEMU_PKGVERSION "\n" +"%s " QEMU_FULL_VERSION "\n" "Written by Paolo Bonzini.\n" "\n" QEMU_COPYRIGHT "\n"
ui/cocoa.m +1 -1
@@ -1330,7 +1330,7 @@ QemuCocoaView *cocoaView; /* Create the version string*/ NSString *version_string; version_string = [[NSString alloc] initWithFormat: - @"QEMU emulator version %s%s", QEMU_VERSION, QEMU_PKGVERSION]; + @"QEMU emulator version %s", QEMU_FULL_VERSION]; [version_label setStringValue: version_string]; [superView addSubview: version_label];
vl.c +1 -1
@@ -1942,7 +1942,7 @@ static void main_loop(void)static void version (void ) { -printf ("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION "\n" +printf ("QEMU emulator version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" ); }
Signature · 1 line
1.8.3.1
Quoted 22 lines · Thomas Huth
Since commit
67a1de0d195athere is no space anymore between the version number and the parentheses when running configure with --with-pkgversion=foo :$ qemu-system-s390x --version QEMU emulator version 2.11.50(foo)But the space is included when building without that option when building from a git checkout:
$ qemu-system-s390x --version QEMU emulator version 2.11.50 (v2.11.0-1494-gbec9c64-dirty)The same confusion exists with the "query-version" QMP command. Let's fix this by introducing a proper
QEMU_FULL_VERSIONdefinition that includes the space and parentheses, while theQEMU_PKGVERSIONshould just cleanly contain the package version string itself. Note that this also changes the behavior of the "query-version" QMP command (the space and parentheses are not included there anymore), but that's supposed to be OK since the strings there are not meant to be parsed by other tools.
Quoted 4 lines
Fixes 67a1de0d195a6185c39b436159c9ffc7720bf979Signed-off-by Thomas Huth <[email protected]>---
I like it!
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Quoted 23 lines · Eric Blake
Quoted 22 lines · Thomas Huth
Since commit
67a1de0d195athere is no space anymore between the version number and the parentheses when running configure with --with-pkgversion=foo :$ qemu-system-s390x --version QEMU emulator version 2.11.50(foo)But the space is included when building without that option when building from a git checkout:
$ qemu-system-s390x --version QEMU emulator version 2.11.50 (v2.11.0-1494-gbec9c64-dirty)The same confusion exists with the "query-version" QMP command. Let's fix this by introducing a proper
QEMU_FULL_VERSIONdefinition that includes the space and parentheses, while theQEMU_PKGVERSIONshould just cleanly contain the package version string itself. Note that this also changes the behavior of the "query-version" QMP command (the space and parentheses are not included there anymore), but that's supposed to be OK since the strings there are not meant to be parsed by other tools.
Quoted 8 lines
Quoted 4 lines
Fixes 67a1de0d195a6185c39b436159c9ffc7720bf979Signed-off-by Thomas Huth <[email protected]>---
I like it!
Reviewed-by Eric Blake <[email protected]>
Ping!
Paolo, could you maybe take this through your misc tree?
Thomas
Paolo Bonzini
AppliedQuoted 199 lines · Thomas Huth
Since commit
67a1de0d195athere is no space anymore between the version number and the parentheses when running configure with --with-pkgversion=foo :$ qemu-system-s390x --version QEMU emulator version 2.11.50(foo)But the space is included when building without that option when building from a git checkout:
$ qemu-system-s390x --version QEMU emulator version 2.11.50 (v2.11.0-1494-gbec9c64-dirty)The same confusion exists with the "query-version" QMP command. Let's fix this by introducing a proper
QEMU_FULL_VERSIONdefinition that includes the space and parentheses, while theQEMU_PKGVERSIONshould just cleanly contain the package version string itself. Note that this also changes the behavior of the "query-version" QMP command (the space and parentheses are not included there anymore), but that's supposed to be OK since the strings there are not meant to be parsed by other tools.Fixes 67a1de0d195a6185c39b436159c9ffc7720bf979Signed-off-by Thomas Huth <[email protected]>--- Makefile | 20 +++++++++++--------- bsd-user/main.c | 2 +- configure | 2 +- linux-user/main.c | 2 +- qemu-img.c | 2 +- qemu-io.c | 2 +- qemu-nbd.c | 2 +- qga/main.c | 2 +- scsi/qemu-pr-helper.c | 2 +- ui/cocoa.m | 2 +- vl.c | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-)Makefile +11
-9@@ -367,21 +367,23 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules qemu-version.h: FORCE $(call quiet-command, \ (cd $(SRC_PATH); \ - printf '#define QEMU_PKGVERSION '; \ if test -n "$(PKGVERSION)"; then \ - printf '"$(PKGVERSION)"\n'; \ + pkgvers="$(PKGVERSION)"; \ else \ if test -d .git; then \ - printf '" ('; \ - git describe --match 'v*' 2>/dev/null | tr -d '\n'; \ + pkgvers=$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\ if ! git diff-index --quiet HEAD &>/dev/null; then \ - printf -- '-dirty'; \ + pkgvers="$${pkgvers}-dirty"; \ fi; \ - printf ')"\n'; \ - else \ - printf '""\n'; \ fi; \ - fi) > [email protected]) + fi; \ + printf "#define QEMU_PKGVERSION \"$${pkgvers}\"\n"; \ + if test -n "$${pkgvers}"; then \ + printf '#define QEMU_FULL_VERSION QEMU_VERSION " (" QEMU_PKGVERSION ")"\n'; \ + else \ + printf '#define QEMU_FULL_VERSION QEMU_VERSION\n'; \ + fi; \ + ) > [email protected]) $(call quiet-command, if ! cmp -s $@ [email protected]; then \ mv [email protected] $@; \ else \bsd-user/main.c +1
-1@@ -649,7 +649,7 @@ void cpu_loop(CPUSPARCState *env)static void usage (void ) { -printf ("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION +printf ("qemu-" TARGET_NAME " version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n" "BSD CPU emulator (compiled for %s emulation)\n"configure +1
-1@@ -1160,7 +1160,7 @@ for opt do ;; --disable-blobs) blobs="no" ;; - --with-pkgversion=*) pkgversion=" ($optarg)" + --with-pkgversion=*) pkgversion="$optarg" ;; --with-coroutine=*) coroutine="$optarg" ;;linux-user/main.c +1
-1@@ -4068,7 +4068,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 +printf ("qemu-" TARGET_NAME " version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" );exit (EXIT_SUCCESS ); }qemu-img.c +1
-1@@ -46,7 +46,7 @@#include "crypto/init.h" #include "trace/control.h" -#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ +#define QEMU_IMG_VERSION "qemu-img version " QEMU_FULL_VERSION \ "\n" QEMU_COPYRIGHT "\n" typedef struct img_cmd_t {qemu-io.c +1
-1@@ -534,7 +534,7 @@ int main(int argc, char **argv) trace_file =trace_opt_parse (optarg);break ;case 'V' : -printf ("%s version " QEMU_VERSION QEMU_PKGVERSION "\n" +printf ("%s version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" , progname);exit (0 );case 'h' :qemu-nbd.c +1
-1@@ -130,7 +130,7 @@ QEMU_HELP_BOTTOM "\n"static void version (const char *name) {printf ( -"%s " QEMU_VERSION QEMU_PKGVERSION "\n" +"%s " QEMU_FULL_VERSION "\n" "Written by Anthony Liguori.\n" "\n" QEMU_COPYRIGHT "\n"qga/main.c +1
-1@@ -218,7 +218,7 @@ static void usage(const char *cmd) {printf ("Usage: %s [-m <method> -p <path>] [<options>]\n" -"QEMU Guest Agent " QEMU_VERSION QEMU_PKGVERSION "\n" +"QEMU Guest Agent " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" "\n" " -m, --method transport method: one of unix-listen, virtio-serial,\n"scsi/qemu-pr-helper.c +1
-1@@ -102,7 +102,7 @@ QEMU_HELP_BOTTOM "\n"static void version (const char *name) {printf ( -"%s " QEMU_VERSION QEMU_PKGVERSION "\n" +"%s " QEMU_FULL_VERSION "\n" "Written by Paolo Bonzini.\n" "\n" QEMU_COPYRIGHT "\n"ui/cocoa.m +1
-1@@ -1330,7 +1330,7 @@ QemuCocoaView *cocoaView; /* Create the version string*/ NSString *version_string; version_string = [[NSString alloc] initWithFormat: - @"QEMU emulator version %s%s", QEMU_VERSION, QEMU_PKGVERSION]; + @"QEMU emulator version %s", QEMU_FULL_VERSION]; [version_label setStringValue: version_string]; [superView addSubview: version_label];vl.c +0
-0
vl.c static void main_loop(void) · line 1948
Quoted 8 lines
vl.c +1
-1@@ -1942,7 +1942,7 @@ static void main_loop(void)static void version (void ) { -printf ("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION "\n" +printf ("QEMU emulator version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" ); }
Queued, thanks.
Paolo