diff options
| -rwxr-xr-x | QMP/vm-info | 2 | ||||
| -rw-r--r-- | monitor.c | 22 | ||||
| -rw-r--r-- | qemu-monitor.hx | 21 |
3 files changed, 1 insertions, 44 deletions
diff --git a/QMP/vm-info b/QMP/vm-info index b150d8240c..8ebaeb38c0 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 15b53b9aaf..14f77bd472 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 f6a94f2b83..9f62b94862 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 |