From patchwork Tue Nov 17 20:32:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 38696 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 2895EB6F14 for ; Wed, 18 Nov 2009 10:35:19 +1100 (EST) Received: from localhost ([127.0.0.1]:34292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAUxM-0002jp-II for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 15:47:20 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAUjQ-0004TL-Et for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAUjL-0004Pz-GQ for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:55 -0500 Received: from [199.232.76.173] (port=34685 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAUjL-0004Ps-3h for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36462) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAUjK-00088C-DX for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:50 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHKWnVJ020820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 15:32:49 -0500 Received: from localhost (vpn-11-203.rdu.redhat.com [10.11.11.203]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAHKWmma027264 for ; Tue, 17 Nov 2009 15:32:49 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 18:32:15 -0200 Message-Id: <1258489944-12159-9-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1258489944-12159-1-git-send-email-lcapitulino@redhat.com> References: <1258489944-12159-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 08/17] monitor: Convert do_info_hpet() to QObject 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 The returned QObject is a QString. Signed-off-by: Luiz Capitulino --- monitor.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 5140198..9ecf5ff 100644 --- a/monitor.c +++ b/monitor.c @@ -361,10 +361,27 @@ static void do_info_name(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 @@ -2096,7 +2113,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 {