From patchwork Mon May 24 20:13:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 53461 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 077FCB7D7E for ; Tue, 25 May 2010 06:26:57 +1000 (EST) Received: from localhost ([127.0.0.1]:58766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGeEf-0008P6-Pd for incoming@patchwork.ozlabs.org; Mon, 24 May 2010 16:26:53 -0400 Received: from [140.186.70.92] (port=40947 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGe2g-0001HJ-B3 for qemu-devel@nongnu.org; Mon, 24 May 2010 16:14:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGe2C-0000Dx-6A for qemu-devel@nongnu.org; Mon, 24 May 2010 16:14:30 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:46594) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGe2B-0000DO-Q0 for qemu-devel@nongnu.org; Mon, 24 May 2010 16:14:00 -0400 Received: from smtp05.web.de ( [172.20.4.166]) by fmmailgate02.web.de (Postfix) with ESMTP id 42CB41627129A; Mon, 24 May 2010 22:13:59 +0200 (CEST) Received: from [88.65.39.229] (helo=localhost.localdomain) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1OGe2B-0004UY-00; Mon, 24 May 2010 22:13:59 +0200 From: Jan Kiszka To: qemu-devel@nongnu.org Date: Mon, 24 May 2010 22:13:48 +0200 Message-Id: X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX19EoGfOx6exbmI3jgacQK3gy0GaPWN8k2R8bKlR 2xEeNvZXIZghSLQSm/NDsvOC0cHaejrSZ5lAgx3ezfbSGrTCB9 cIQPgm5Q0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: blue Swirl , Jan Kiszka , Juan Quintela Subject: [Qemu-devel] [RFT][PATCH 15/15] monitor/QMP: Drop info hpet / query-hpet 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: Jan Kiszka This command was of minimal use before, now it is useless as the hpet become a qdev device and is thus easily discoverable. We should definitely not set query-hpet in QMP's stone, and there is also no good reason to keep it for the interactive monitor. Signed-off-by: Jan Kiszka --- QMP/vm-info | 2 +- monitor.c | 33 --------------------------------- 2 files changed, 1 insertions(+), 34 deletions(-) diff --git a/QMP/vm-info b/QMP/vm-info index b150d82..8ebaeb3 100755 --- a/QMP/vm-info +++ b/QMP/vm-info @@ -25,7 +25,7 @@ def main(): qemu = qmp.QEMUMonitorProtocol(argv[1]) qemu.connect() - for cmd in [ 'version', 'hpet', 'kvm', 'status', 'uuid', 'balloon' ]: + for cmd in [ 'version', 'kvm', 'status', 'uuid', 'balloon' ]: print cmd + ': ' + str(qemu.send('query-' + cmd)) if __name__ == '__main__': diff --git a/monitor.c b/monitor.c index ad50f12..d2abf07 100644 --- a/monitor.c +++ b/monitor.c @@ -777,31 +777,6 @@ static void do_info_commands(Monitor *mon, QObject **ret_data) *ret_data = QOBJECT(cmd_list); } -#if defined(TARGET_I386) -static void do_info_hpet_print(Monitor *mon, const QObject *data) -{ - monitor_printf(mon, "HPET is %s by QEMU\n", - qdict_get_bool(qobject_to_qdict(data), "enabled") ? - "enabled" : "disabled"); -} - -/** - * do_info_hpet(): Show HPET state - * - * Return a QDict with the following information: - * - * - "enabled": true if hpet if enabled, false otherwise - * - * Example: - * - * { "enabled": true } - */ -static void do_info_hpet(Monitor *mon, QObject **ret_data) -{ - *ret_data = qobject_from_jsonf("{ 'enabled': %i }", !no_hpet); -} -#endif - static void do_info_uuid_print(Monitor *mon, const QObject *data) { monitor_printf(mon, "%s\n", qdict_get_str(qobject_to_qdict(data), "UUID")); @@ -2611,14 +2586,6 @@ static const mon_cmd_t info_cmds[] = { .help = "show the active virtual memory mappings", .mhandler.info = mem_info, }, - { - .name = "hpet", - .args_type = "", - .params = "", - .help = "show state of HPET", - .user_print = do_info_hpet_print, - .mhandler.info_new = do_info_hpet, - }, #endif { .name = "jit",