[2/2] qemu-options: Remove deprecated option -clock

The option is only a dummy since a long time. We've finally deprecated
it in QEMU v3.0, so it's time to remove it now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qemu-deprecated.texi | 5 -----
 qemu-options.hx      | 3 ---
 vl.c                 | 6 ------
 3 files changed, 14 deletions(-)

On 2/7/19 2:14 PM, Thomas Huth wrote:
> The option is only a dummy since a long time. We've finally deprecated
> it in QEMU v3.0, so it's time to remove it now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  qemu-deprecated.texi | 5 -----
>  qemu-options.hx      | 3 ---
>  vl.c                 | 6 ------
>  3 files changed, 14 deletions(-)
> 
> diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
> index 90e5860..fe90555 100644
> --- a/qemu-deprecated.texi
> +++ b/qemu-deprecated.texi
> @@ -37,11 +37,6 @@ would automatically enable USB support on the machine type.
>  If using the new syntax, USB support must be explicitly
>  enabled via the ``-machine usb=on'' argument.
>  
> -@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.
> -
>  @subsection -drive file=json:@{...@{'driver':'file'@}@} (since 3.0)
>  
>  The 'file' driver for drives is no longer appropriate for character or host
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 06ef1a7..77bd98e 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -3444,9 +3444,6 @@ Load the contents of @var{file} as an option ROM.
>  This option is useful to load things like EtherBoot.
>  ETEXI
>  
> -HXCOMM Silently ignored for compatibility
> -DEF("clock", HAS_ARG, QEMU_OPTION_clock, "", QEMU_ARCH_ALL)
> -
>  DEF("rtc", HAS_ARG, QEMU_OPTION_rtc, \
>      "-rtc [base=utc|localtime|<datetime>][,clock=host|rt|vm][,driftfix=none|slew]\n" \
>      "                set the RTC base and clock, enable drift fix for clock ticks (x86 only)\n",
> diff --git a/vl.c b/vl.c
> index 9e4dba7..90ff233 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3735,12 +3735,6 @@ int main(int argc, char **argv, char **envp)
>              case QEMU_OPTION_old_param:
>                  old_param = 1;
>                  break;
> -            case QEMU_OPTION_clock:
> -                /* 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_rtc:
>                  opts = qemu_opts_parse_noisily(qemu_find_opts("rtc"), optarg,
>                                                 false);
>

On 07/02/2019 14:14, Thomas Huth wrote:
> The option is only a dummy since a long time. We've finally deprecated
> it in QEMU v3.0, so it's time to remove it now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  qemu-deprecated.texi | 5 -----
>  qemu-options.hx      | 3 ---
>  vl.c                 | 6 ------
>  3 files changed, 14 deletions(-)
> 
> diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
> index 90e5860..fe90555 100644
> --- a/qemu-deprecated.texi
> +++ b/qemu-deprecated.texi
> @@ -37,11 +37,6 @@ would automatically enable USB support on the machine type.
>  If using the new syntax, USB support must be explicitly
>  enabled via the ``-machine usb=on'' argument.
>  
> -@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.
> -
>  @subsection -drive file=json:@{...@{'driver':'file'@}@} (since 3.0)
>  
>  The 'file' driver for drives is no longer appropriate for character or host
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 06ef1a7..77bd98e 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -3444,9 +3444,6 @@ Load the contents of @var{file} as an option ROM.
>  This option is useful to load things like EtherBoot.
>  ETEXI
>  
> -HXCOMM Silently ignored for compatibility
> -DEF("clock", HAS_ARG, QEMU_OPTION_clock, "", QEMU_ARCH_ALL)
> -
>  DEF("rtc", HAS_ARG, QEMU_OPTION_rtc, \
>      "-rtc [base=utc|localtime|<datetime>][,clock=host|rt|vm][,driftfix=none|slew]\n" \
>      "                set the RTC base and clock, enable drift fix for clock ticks (x86 only)\n",
> diff --git a/vl.c b/vl.c
> index 9e4dba7..90ff233 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3735,12 +3735,6 @@ int main(int argc, char **argv, char **envp)
>              case QEMU_OPTION_old_param:
>                  old_param = 1;
>                  break;
> -            case QEMU_OPTION_clock:
> -                /* 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_rtc:
>                  opts = qemu_opts_parse_noisily(qemu_find_opts("rtc"), optarg,
>                                                 false);
> 

Applied to my trivial-patches branch.

Thanks,
Laurent