From patchwork Wed May 12 20:29:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 52440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30445B7E0F for ; Thu, 13 May 2010 14:47:18 +1000 (EST) Received: from localhost ([127.0.0.1]:51890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCQKI-0008Gc-QT for incoming@patchwork.ozlabs.org; Thu, 13 May 2010 00:47:15 -0400 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 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4CKSs25018614 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 12 May 2010 16:28:54 -0400 Received: from localhost.localdomain (dhcp-100-19-163.bos.redhat.com [10.16.19.163]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4CKSqVa004412; Wed, 12 May 2010 16:28:52 -0400 From: Cole Robinson To: qemu-devel@nongnu.org Date: Wed, 12 May 2010 16:29:21 -0400 Message-Id: <1273696161-14332-1-git-send-email-crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jes.Sorensen@redhat.com, aliguori@us.ibm.com, clalance@redhat.com, Cole Robinson Subject: [Qemu-devel] [PATCH] Revive -version 'QEMU PC Emulator...' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)