From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGbhR-00019H-CK for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGbhM-000132-H0 for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:08 -0500 Received: from [199.232.76.173] (port=44833 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGbhM-00012l-7s for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4804) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NGbhM-0008Of-59 for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:04 -0500 From: Luiz Capitulino Date: Fri, 4 Dec 2009 15:11:27 -0200 Message-Id: <1259946695-15784-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1259946695-15784-1-git-send-email-lcapitulino@redhat.com> References: <1259946695-15784-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 09/17] monitor: Convert do_info_hpet() to QObject List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Return a QString with HPET information. Signed-off-by: Luiz Capitulino --- monitor.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 96fde16..f9a698f 100644 --- a/monitor.c +++ b/monitor.c @@ -548,10 +548,27 @@ static void do_info_commands(Monitor *mon, QObject **ret_data) } #if defined(TARGET_I386) -static void do_info_hpet(Monitor *mon) +static void do_info_hpet_print(Monitor *mon, const QObject *data) { monitor_printf(mon, "HPET is %s by QEMU\n", - (no_hpet) ? "disabled" : "enabled"); + qstring_get_str(qobject_to_qstring(data))); +} + +/** + * do_info_hpet(): Show HPET state + * + * Return a QString with HPET information, which can be: + * + * - "enabled" + * - "disabled" + */ +static void do_info_hpet(Monitor *mon, QObject **ret_data) +{ + if (no_hpet) { + *ret_data = QOBJECT(qstring_from_str("disabled")); + } else { + *ret_data = QOBJECT(qstring_from_str("enabled")); + } } #endif @@ -2296,7 +2313,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show state of HPET", - .mhandler.info = do_info_hpet, + .user_print = do_info_hpet_print, + .mhandler.info_new = do_info_hpet, }, #endif { -- 1.6.6.rc1.5.ge21a85