From patchwork Wed May 12 20:29:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Revive -version 'QEMU PC Emulator...' Date: Wed, 12 May 2010 10:29:21 -0000 From: Cole Robinson X-Patchwork-Id: 52440 Message-Id: <1273696161-14332-1-git-send-email-crobinso@redhat.com> To: qemu-devel@nongnu.org Cc: Jes.Sorensen@redhat.com, aliguori@us.ibm.com, clalance@redhat.com, Cole Robinson Commit f75ca1ae205f24dae296c82d534c37746f87232f changed the version string from: QEMU PC Emulator version x.yy.z to QEMU Emulator version x.yy.z libvirt is overly sensitive to the format of this string, and barfs when trying to parse qemu -help output. While libvirt should certainly be more robust here, changing the output format of -version for cosmetic reasons doesn't seem like the best idea, so let's revert the change and add a comment explaining the issue. Signed-off-by: Cole Robinson --- vl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index 85bcc84..8592949 100644 --- a/vl.c +++ b/vl.c @@ -2012,7 +2012,9 @@ static void main_loop(void) static void version(void) { - printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"); + /* Change with care, at least libvirt parses this string and is + * historically sensitive to its format */ + printf("QEMU PC emulator version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"); } static void help(int exitcode)