From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbRnc-00047A-Hd for qemu-devel@nongnu.org; Wed, 30 Oct 2013 05:10:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbRnW-0007Rp-VQ for qemu-devel@nongnu.org; Wed, 30 Oct 2013 05:10:48 -0400 Received: from [222.73.24.84] (port=29294 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbRnW-0007OQ-HF for qemu-devel@nongnu.org; Wed, 30 Oct 2013 05:10:42 -0400 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r9U9AQt4002203 for ; Wed, 30 Oct 2013 17:10:27 +0800 Date: Wed, 30 Oct 2013 17:10:29 +0800 From: "Zhou Yuan" Message-ID: <201310301710276996796@cn.fujitsu.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii" Subject: [Qemu-devel] [PATCH] monitor.c : fix the monitor_user_noop function for hmp-commands calling user_print conveniently List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel From: zhouy To: qemu-devel@nongnu.org Date: Wed, 30 Oct 2013 12:37:51 -0400 Subject: [PATCH] fix the monitor_user_noop function for hmp-commands calling user_print conveniently If a new hmp command added,just using the function call "monitor_user_noop" to print the result in the monitor model. The function is alreadly existed but not have been fixed. Cc: Luiz Capitulino Signed-off-by: zhouy --- qemu-master/monitor.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/qemu-master/monitor.c b/qemu-master/monitor.c index 0aeaf6c..8aa24da 100644 --- a/qemu-master/monitor.c +++ b/qemu-master/monitor.c @@ -387,7 +387,28 @@ static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, return 0; } -static void monitor_user_noop(Monitor *mon, const QObject *data) { } +static void monitor_user_noop(Monitor *mon, const QObject *data) +{ + switch ((*data->type).code) { + case QTYPE_QSTRING:{ + const char *result = qstring_get_str(qobject_to_qstring(data)); + monitor_printf(mon, "%s\n", result); + break; + } + case QTYPE_QINT:{ + int result = qint_get_int(qobject_to_qint(data)); + monitor_printf(mon, "%d\n", result); + break; + } + case QTYPE_QFLOAT:{ + double result = qfloat_get_double(qobject_to_qfloat(data)); + monitor_printf(mon, "%.3f\n", result); + break; + } + default: + break; + } +} static inline int handler_is_qobject(const mon_cmd_t *cmd) { -- 1.7.1