From patchwork Sun Jun 13 12:15:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 55425 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 6C0EE1007D1 for ; Sun, 13 Jun 2010 22:33:43 +1000 (EST) Received: from localhost ([127.0.0.1]:50880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONmNg-0007nV-G1 for incoming@patchwork.ozlabs.org; Sun, 13 Jun 2010 08:33:40 -0400 Received: from [140.186.70.92] (port=44679 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONm6b-0001kk-4j for qemu-devel@nongnu.org; Sun, 13 Jun 2010 08:16:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ONm6X-00033t-Oi for qemu-devel@nongnu.org; Sun, 13 Jun 2010 08:16:01 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:59751) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ONm6X-00033Z-Dw for qemu-devel@nongnu.org; Sun, 13 Jun 2010 08:15:57 -0400 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate02.web.de (Postfix) with ESMTP id D49D016664AB8; Sun, 13 Jun 2010 14:15:56 +0200 (CEST) Received: from [92.74.52.35] (helo=localhost.localdomain) by smtp01.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1ONm6W-0004oR-01; Sun, 13 Jun 2010 14:15:56 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel@nongnu.org Date: Sun, 13 Jun 2010 14:15:46 +0200 Message-Id: <415923dc9a55e87fb1660b7d78cb32efccf9a9ca.1276431335.git.jan.kiszka@web.de> 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: V01U2FsdGVkX18Gshg4fELm/SKkZcnQ5/CmV4d0XD8m8h8pjnft Bw5ihpJeZAtpNFPmJ/1ARrcDY90z9BgOi452k5rxIEOKRQd05f CNq/h5G2w= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: blue Swirl , Jan Kiszka , Paul Brook , Gleb Natapov , Juan Quintela Subject: [Qemu-devel] [PATCH v4 13/13] 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 | 22 ---------------------- qemu-monitor.hx | 21 --------------------- 3 files changed, 1 insertions(+), 44 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 15b53b9..14f77bd 100644 --- a/monitor.c +++ b/monitor.c @@ -740,20 +740,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"); -} - -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")); @@ -2509,14 +2495,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", diff --git a/qemu-monitor.hx b/qemu-monitor.hx index f6a94f2..9f62b94 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -2144,27 +2144,6 @@ show the active virtual memory mappings (i386 only) ETEXI STEXI -@item info hpet -show state of HPET (i386 only) -ETEXI -SQMP -query-hpet ----------- - -Show HPET state. - -Return a json-object with the following information: - -- "enabled": true if hpet if enabled, false otherwise (json-bool) - -Example: - --> { "execute": "query-hpet" } -<- { "return": { "enabled": true } } - -EQMP - -STEXI @item info jit show dynamic compiler info @item info kvm