From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44020 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OiVfV-0001Sw-W3 for qemu-devel@nongnu.org; Mon, 09 Aug 2010 12:57:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OiVfT-0006N9-IR for qemu-devel@nongnu.org; Mon, 09 Aug 2010 12:57:44 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:44542) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OiVfT-0006N2-F7 for qemu-devel@nongnu.org; Mon, 09 Aug 2010 12:57:43 -0400 Received: by ywt2 with SMTP id 2so3844985ywt.4 for ; Mon, 09 Aug 2010 09:57:43 -0700 (PDT) From: Miguel Di Ciurcio Filho Date: Mon, 9 Aug 2010 14:00:56 -0300 Message-Id: <1281373256-602-3-git-send-email-miguel.filho@gmail.com> In-Reply-To: <1281373256-602-1-git-send-email-miguel.filho@gmail.com> References: <1281373256-602-1-git-send-email-miguel.filho@gmail.com> Subject: [Qemu-devel] [PATCH 2/2] QMP/monitor: update do_info_version() to output broken down version string List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Miguel Di Ciurcio Filho , armbru@redhat.com, lcapitulino@redhat.com This code was originally developed by Daniel P. Berrange Signed-off-by: Miguel Di Ciurcio Filho --- monitor.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index c313d5a..e82c48f 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) -- 1.7.1