From patchwork Fri Aug 20 19:42:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 62309 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 CCF4FB70DE for ; Sat, 21 Aug 2010 05:44:43 +1000 (EST) Received: from localhost ([127.0.0.1]:59372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmXW2-0002Nz-06 for incoming@patchwork.ozlabs.org; Fri, 20 Aug 2010 15:44:38 -0400 Received: from [140.186.70.92] (port=38777 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmXUX-0002Al-A9 for qemu-devel@nongnu.org; Fri, 20 Aug 2010 15:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OmXUE-0007v8-Pa for qemu-devel@nongnu.org; Fri, 20 Aug 2010 15:42:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11919) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OmXUE-0007v3-IB for qemu-devel@nongnu.org; Fri, 20 Aug 2010 15:42:46 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7KJgjk4014492 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 Aug 2010 15:42:45 -0400 Received: from localhost (ovpn-113-57.phx2.redhat.com [10.3.113.57]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7KJgiqO027643; Fri, 20 Aug 2010 15:42:45 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 20 Aug 2010 16:42:30 -0300 Message-Id: <1282333352-4152-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1282333352-4152-1-git-send-email-lcapitulino@redhat.com> References: <1282333352-4152-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 2/4] QMP/monitor: update do_info_version() to output broken down version string 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 From: Miguel Di Ciurcio Filho This code was originally developed by Daniel P. Berrange Signed-off-by: Miguel Di Ciurcio Filho Signed-off-by: Luiz Capitulino --- monitor.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index c313d5a..e27f8d8 100644 --- a/monitor.c +++ b/monitor.c @@ -669,17 +669,32 @@ help: static void do_info_version_print(Monitor *mon, const QObject *data) { QDict *qdict; + QDict *qemu; qdict = qobject_to_qdict(data); + qemu = qdict_get_qdict(qdict, "qemu"); - monitor_printf(mon, "%s%s\n", qdict_get_str(qdict, "qemu"), - qdict_get_str(qdict, "package")); + monitor_printf(mon, "%" PRId64 ".%" PRId64 ".%" PRId64 "%s\n", + qdict_get_int(qemu, "major"), + qdict_get_int(qemu, "minor"), + qdict_get_int(qemu, "micro"), + qdict_get_str(qdict, "package")); } static void do_info_version(Monitor *mon, QObject **ret_data) { - *ret_data = qobject_from_jsonf("{ 'qemu': %s, 'package': %s }", - QEMU_VERSION, QEMU_PKGVERSION); + const char *version = QEMU_VERSION; + int major = 0, minor = 0, micro = 0; + char *tmp; + + major = strtol(version, &tmp, 10); + tmp++; + minor = strtol(tmp, &tmp, 10); + tmp++; + micro = strtol(tmp, &tmp, 10); + + *ret_data = qobject_from_jsonf("{ 'qemu': { 'major': %d, 'minor': %d, \ + 'micro': %d }, 'package': %s }", major, minor, micro, QEMU_PKGVERSION); } static void do_info_name_print(Monitor *mon, const QObject *data)