diff options
| author | Avi Kivity <avi@redhat.com> | 2010-06-21 17:43:34 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-06-21 17:43:34 +0300 |
| commit | 89b856958254ad91cd90c173dfc5cbc246ac1e0f (patch) | |
| tree | 08e9d8c22f6abed94fab25dc6ebea0f2d562a0fa /qemu-monitor.hx | |
| parent | 55cbee9e738bfe7434081967f884209f1a9c994c (diff) | |
| parent | a4673e276248ada38f40d39191a197e7e35d3f8b (diff) | |
Merge commit 'a4673e276248ada38f40d39191a197e7e35d3f8b' into upstream-merge
* commit 'a4673e276248ada38f40d39191a197e7e35d3f8b': (24 commits)
OHCI address decoding fix
Move stdbool.h
monitor/QMP: Drop info hpet / query-hpet
hpet: Add MSI support
hpet: Make number of timers configurable
vmstate: Add VMSTATE_STRUCT_VARRAY_UINT8
hpet: Add support for level-triggered interrupts
hpet: Drop static state
hpet/rtc: Rework RTC IRQ replacement by HPET
hpet: Start/stop timer when HPET_TN_ENABLE is modified
hpet: Convert to qdev
hpet: Move static timer field initialization
hpet: Silence warning on write to running main counter
hxtool: Fix line number reporting on SQMP/EQMP errors
remove unnecessary lookaheads
implement optional lookahead in json lexer
add some tests for invalid JSON
json-streamer: Don't use qdict_put_obj()
json-lexer: Drop 'buf'
check-qjson: Add more escape tests
...
Conflicts:
hw/hpet.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index a1fc88b66..f7e46c463 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -2157,27 +2157,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 |