sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

monitor/QMP: Drop info hpet / query-hpet 

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 <jan.kiszka@siemens.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Jan Kiszka 2010-06-13 14:15:46 +02:00 committed by Blue Swirl
parent 8caa0065b8
commit ea4e78e590
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QMP/vm-info
View File

@ -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__':

22
monitor.c
View File

@ -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",

21
qemu-monitor.hx
View File

@ -2143,27 +2143,6 @@ show virtual to physical memory mappings (i386 only)
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