]> git.proxmox.com Git - mirror_qemu.git/commit - bsd-user/main.c
Polish the version strings containing the package version
authorThomas Huth <thuth@redhat.com>
Thu, 15 Feb 2018 11:06:47 +0000 (12:06 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 12 Mar 2018 15:12:47 +0000 (16:12 +0100)
commit7e563bfb8a5104ff0eed0fff8d13cbe63a25d17c
tree2b315d9dff4c3c393dc6e24f817bb3e9e35012e2
parent8cc436d9c513797291b531bbf06ef306f41e8c9b
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.

Fixes: 67a1de0d195a6185c39b436159c9ffc7720bf979
Buglink: https://bugs.launchpad.net/qemu/+bug/1673373
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1518692807-25859-1-git-send-email-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Makefile
bsd-user/main.c
configure
linux-user/main.c
qemu-img.c
qemu-io.c
qemu-nbd.c
qga/main.c
scsi/qemu-pr-helper.c
ui/cocoa.m
vl.c