qemu-options: Mark the non-functional -clock option as deprecated

The function is only ignored since QEMU version 1.7.0. Let's mark
it as deprecated, so that we can finally completely remove it soon.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1526990298-17924-1-git-send-email-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/qemu-doc.texi b/qemu-doc.texi
index 0e0e0ae72ba661afd5f156c5e7953306e11d55ec..057a48ec1feecbc3228c06c59d7f2bda1170d79a 100644 (file)
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2922,6 +2922,11 @@ The @code{-startdate} option has been replaced by @code{-rtc base=@var{date}}.
 Option @option{-virtioconsole} has been replaced by
 @option{-device virtconsole}.
 
+@subsection -clock (since 3.0.0)
+
+The @code{-clock} option is ignored since QEMU version 1.7.0. There is no
+replacement since it is not needed anymore.
+
 @section qemu-img command line arguments
 
 @subsection convert -s (since 2.0.0)

diff --git a/vl.c b/vl.c
index 4a0e17833d9ef7c50504aa0f74cee63dcf4e23b5..c70ce25de7afb1b624c416a2cadd5daf91bf2902 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3713,6 +3713,7 @@ int main(int argc, char **argv, char **envp)
                 /* Clock options no longer exist.  Keep this option for
                  * backward compatibility.
                  */
+                warn_report("This option is ignored and will be removed soon");
                 break;
             case QEMU_OPTION_startdate:
                 warn_report("This option is deprecated, use '-rtc base=' instead.");