david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aio / timers: De-document -clock

Browse Source 
Commit 6d32717 "aio / timers: Remove alarm timers" has issues:

1. It silently ignores -clock for backward compatibility.
Incompatible change: -clock help no longer terminates the program.
Tolerable.

2. Failed to update option documentation.  In particular, -help still
advises users to try -clock help for available timers.  Drop all
documentation on -clock.

3. The 'query-alarm-clock' example in docs/writing-commands.txt no
longer works, and needs to be redone.  Can't do that right now, so I
just stick in a FIXME.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Markus Armbruster 2014-10-06 16:19:07 +02:00 committed by Paolo Bonzini
parent 024d9adc79
commit e218052f92
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/writing-qmp-commands.txt
View File

@ -365,6 +365,8 @@ documentation for information about the other types.
=== User Defined Types === === User Defined Types ===
FIXME This example needs to be redone after commit 6d32717
For this example we will write the query-alarm-clock command, which returns For this example we will write the query-alarm-clock command, which returns
information about QEMU's timer alarm. For more information about it, please information about QEMU's timer alarm. For more information about it, please
check the "-clock" command-line option. check the "-clock" command-line option.

12
qemu-options.hx
View File

@ -2989,16 +2989,8 @@ Load the contents of @var{file} as an option ROM.
This option is useful to load things like EtherBoot. This option is useful to load things like EtherBoot.
ETEXI ETEXI
DEF("clock", HAS_ARG, QEMU_OPTION_clock, \ HXCOMM Silently ignored for compatibility
"-clock force the use of the given methods for timer alarm.\n" \ DEF("clock", HAS_ARG, QEMU_OPTION_clock, "", QEMU_ARCH_ALL)
" To see what timers are available use '-clock help'\n",
QEMU_ARCH_ALL)
STEXI
@item -clock @var{method}
@findex -clock
Force the use of the given methods for timer alarm. To see what timers
are available use @code{-clock help}.
ETEXI
HXCOMM Options deprecated by -rtc HXCOMM Options deprecated by -rtc
DEF("localtime", 0, QEMU_OPTION_localtime, "", QEMU_ARCH_ALL) DEF("localtime", 0, QEMU_OPTION_localtime, "", QEMU_ARCH_ALL)