[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 13/13] monitor/QMP: Drop info hpet / query-hpet
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v4 13/13] monitor/QMP: Drop info hpet / query-hpet |
Date: |
Sun, 13 Jun 2010 14:15:46 +0200 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
---
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
address@hidden 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
--
1.6.0.2
- [Qemu-devel] [PATCH v4 03/13] hpet: Silence warning on write to running main counter, (continued)
- [Qemu-devel] [PATCH v4 03/13] hpet: Silence warning on write to running main counter, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 06/13] hpet: Start/stop timer when HPET_TN_ENABLE is modified, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 04/13] hpet: Move static timer field initialization, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 05/13] hpet: Convert to qdev, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 07/13] hpet/rtc: Rework RTC IRQ replacement by HPET, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 01/13] hpet: Catch out-of-bounds timer access, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 08/13] hpet: Drop static state, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 02/13] hpet: Coding style cleanups and some refactorings, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 09/13] hpet: Add support for level-triggered interrupts, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 10/13] vmstate: Add VMSTATE_STRUCT_VARRAY_UINT8, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 13/13] monitor/QMP: Drop info hpet / query-hpet,
Jan Kiszka <=
- [Qemu-devel] [PATCH v4 11/13] hpet: Make number of timers configurable, Jan Kiszka, 2010/06/13
- [Qemu-devel] [PATCH v4 12/13] hpet: Add MSI support, Jan Kiszka, 2010/06/13
- [Qemu-devel] Re: [PATCH v4 00/13] HPET cleanups, fixes, enhancements, Blue Swirl, 2010/06/13