[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/28] aio / timers: De-document -clock
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 28/28] aio / timers: De-document -clock |
Date: |
Mon, 27 Oct 2014 16:13:45 +0100 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
docs/writing-qmp-commands.txt | 2 ++
qemu-options.hx | 12 ++----------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/docs/writing-qmp-commands.txt b/docs/writing-qmp-commands.txt
index 4d86c24..f3df206 100644
--- a/docs/writing-qmp-commands.txt
+++ b/docs/writing-qmp-commands.txt
@@ -365,6 +365,8 @@ documentation for information about the other 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
information about QEMU's timer alarm. For more information about it, please
check the "-clock" command-line option.
diff --git a/qemu-options.hx b/qemu-options.hx
index 22cf3b9..1e7d5b8 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2989,16 +2989,8 @@ Load the contents of @var{file} as an option ROM.
This option is useful to load things like EtherBoot.
ETEXI
-DEF("clock", HAS_ARG, QEMU_OPTION_clock, \
- "-clock force the use of the given methods for timer alarm.\n" \
- " To see what timers are available use '-clock help'\n",
- QEMU_ARCH_ALL)
-STEXI
address@hidden -clock @var{method}
address@hidden -clock
-Force the use of the given methods for timer alarm. To see what timers
-are available use @code{-clock help}.
-ETEXI
+HXCOMM Silently ignored for compatibility
+DEF("clock", HAS_ARG, QEMU_OPTION_clock, "", QEMU_ARCH_ALL)
HXCOMM Options deprecated by -rtc
DEF("localtime", 0, QEMU_OPTION_localtime, "", QEMU_ARCH_ALL)
--
1.8.3.1
- [Qemu-devel] [PULL 20/28] MAINTAINERS: add some tests directories, (continued)
- [Qemu-devel] [PULL 20/28] MAINTAINERS: add some tests directories, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 17/28] MAINTAINERS: add Samuel Thibault as usb-serial.c and baum.c maintainer, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 21/28] MAINTAINERS: avoid M entries that point to mailing lists, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 23/28] get_maintainer.pl: move git loop under "if ($email) {", Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 24/28] get_maintainer.pl: restrict cases where it falls back to --git, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 25/28] target-i386: add Intel AVX-512 support, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 22/28] qtest: fix qtest log fd should be initialized before qtest chardev, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 26/28] virtio-scsi: sense in virtio_scsi_command_complete, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 27/28] hw/scsi/virtio-scsi.c: fix the "type" use error in virtio_scsi_handle_ctrl, Paolo Bonzini, 2014/10/27
- [Qemu-devel] [PULL 28/28] aio / timers: De-document -clock,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/28] Changes for 2014-10-27, Andreas Färber, 2014/10/27
- Re: [Qemu-devel] [PULL 00/28] Changes for 2014-10-27, Peter Maydell, 2014/10/28