Re: [Qemu-devel] [PULL 07/34] Document --rtc-td-hack, --localtime and --startdate as deprecated

[Thomas Huth <thuth@redhat.com>]

On 06.03.2018 14:19, Paolo Bonzini wrote:
> From: Thomas Huth <thuth@redhat.com>
> 
> These options have been marked in a comment in qemu-options.hx as
> deprecated in 2009 already (see commit 1ed2fc1fa35fadc0d6), but we
> never informed the users about these deprecations. Let's catch up
> on that omission now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> Message-Id: <1519138892-12836-1-git-send-email-thuth@redhat.com>
> [Fix messages. - Paolo]
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  qemu-doc.texi | 16 +++++++++++-----
>  vl.c          |  5 +++++
>  2 files changed, 16 insertions(+), 5 deletions(-)
> 
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index fb6fac5..589519a 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2723,12 +2723,18 @@ filesystem test suite. Also it requires the CAP_DAC_READ_SEARCH capability,
>  which is not the recommended way to run QEMU. This backend should not be
>  used and it will be removed with no replacement.
>  
> -@subsection -no-frame (since 2.12.0)
> +@subsection -rtc-td-hack (since 2.12.0)
>  
> -The ``-no-frame'' argument works with SDL 1.2 only.  SDL 2.0 lacks
> -support for frameless windows, and the other user interfaces never
> -implemented this in the first place.  So this will be removed together
> -with SDL 1.2 support.

No, this should not be removed. Looks like an accident when resolving a
conflict?

 Thomas