From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40951 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCPAz-0008Gw-2S for qemu-devel@nongnu.org; Wed, 12 May 2010 23:33:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCKF6-0000Sx-2w for qemu-devel@nongnu.org; Wed, 12 May 2010 18:17:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1025) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCKF5-0000SB-Ri for qemu-devel@nongnu.org; Wed, 12 May 2010 18:17:28 -0400 From: Cole Robinson Date: Wed, 12 May 2010 16:29:21 -0400 Message-Id: <1273696161-14332-1-git-send-email-crobinso@redhat.com> Subject: [Qemu-devel] [PATCH] Revive -version 'QEMU PC Emulator...' List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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) -- 1.6.6.1