This appears to have regressed in 67a1de0d19. When the configure --with-pkgversion=foo option is used, the output from -version will look like:
QEMU emulator version 2.8.90(foo) Copyright (c) 2003-2017 Fabrice Bellard and the QEMU Project developers After this patch, it will be: QEMU emulator version 2.8.90 (foo) Copyright (c) 2003-2017 Fabrice Bellard and the QEMU Project developers Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: Fam Zheng <f...@redhat.com> Fixes: https://bugs.launchpad.net/bugs/1673373 Cc: 1673...@bugs.launchpad.net Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> --- Makefile | 2 +- configure | 2 +- vl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1c4c04f6f2..c9df119798 100644 --- a/Makefile +++ b/Makefile @@ -289,7 +289,7 @@ qemu-version.h: FORCE printf '"$(PKGVERSION)"\n'; \ else \ if test -d .git; then \ - printf '" ('; \ + printf '"('; \ git describe --match 'v*' 2>/dev/null | tr -d '\n'; \ if ! git diff-index --quiet HEAD &>/dev/null; then \ printf -- '-dirty'; \ diff --git a/configure b/configure index 99d8bece70..e94b06b5fc 100755 --- a/configure +++ b/configure @@ -1004,7 +1004,7 @@ for opt do ;; --disable-blobs) blobs="no" ;; - --with-pkgversion=*) pkgversion=" ($optarg)" + --with-pkgversion=*) pkgversion="($optarg)" ;; --with-coroutine=*) coroutine="$optarg" ;; diff --git a/vl.c b/vl.c index 0b4ed5241c..3e60e61905 100644 --- a/vl.c +++ b/vl.c @@ -1904,7 +1904,7 @@ static void main_loop(void) static void version(void) { - printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION "\n" + printf("QEMU emulator version " QEMU_VERSION " " QEMU_PKGVERSION "\n" QEMU_COPYRIGHT "\n"); } -- 2.11.0
