Re: [Qemu-devel] [PATCH] Remove deprecated -enable-hax option

[Thomas Huth]

On 2018-12-14 13:21, Thomas Huth wrote:
> Our command line interface is really quite overcrowded, we should avoid
> duplicated options that do the same thing in just a slightly different
> way. "-accel hax" is shorter and more generic that "-enable-hax", so
> there is really no real usage for the latter option. "-enable-hax" has
> been deprecated since two releases, and nobody complained so far, so
> it's time to remove this now.
> 
> Signed-off-by: Thomas Huth <address@hidden>
> ---
>  qemu-deprecated.texi |  5 -----
>  qemu-options.hx      | 11 -----------
>  vl.c                 |  5 -----
>  3 files changed, 21 deletions(-)
> 
> diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
> index 5cc18b4..f3a1184 100644
> --- a/qemu-deprecated.texi
> +++ b/qemu-deprecated.texi
> @@ -65,11 +65,6 @@ removed together with SDL 1.2 support.
>  The @code{-clock} option is ignored since QEMU version 1.7.0. There is no
>  replacement since it is not needed anymore.
>  
> address@hidden -enable-hax (since 3.0.0)
> -
> -The @option{-enable-hax} option has been replaced by @option{-accel hax}.
> -Both options have been introduced in QEMU version 2.9.0.
> -
>  @subsection -drive file=json:@address@hidden'driver':'file'@address@hidden 
> (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 5330603..c4e9690 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -3381,17 +3381,6 @@ Enable KVM full virtualization support. This option is 
> only available
>  if KVM support is enabled when compiling.
>  ETEXI
>  
> -DEF("enable-hax", 0, QEMU_OPTION_enable_hax, \
> -    "-enable-hax     enable HAX virtualization support\n", QEMU_ARCH_I386)
> -STEXI
> address@hidden -enable-hax
> address@hidden -enable-hax
> -Enable HAX (Hardware-based Acceleration eXecution) support. This option
> -is only available if HAX support is enabled when compiling. HAX is only
> -applicable to MAC and Windows platform, and thus does not conflict with
> -KVM. This option is deprecated, use @option{-accel hax} instead.
> -ETEXI
> -
>  DEF("xen-domid", HAS_ARG, QEMU_OPTION_xen_domid,
>      "-xen-domid id   specify xen guest domain id\n", QEMU_ARCH_ALL)
>  DEF("xen-create", 0, QEMU_OPTION_xen_create,
> diff --git a/vl.c b/vl.c
> index 52881be..5093764 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3579,11 +3579,6 @@ int main(int argc, char **argv, char **envp)
>                  olist = qemu_find_opts("machine");
>                  qemu_opts_parse_noisily(olist, "accel=kvm", false);
>                  break;
> -            case QEMU_OPTION_enable_hax:
> -                warn_report("Option is deprecated, use '-accel hax' 
> instead");
> -                olist = qemu_find_opts("machine");
> -                qemu_opts_parse_noisily(olist, "accel=hax", false);
> -                break;
>              case QEMU_OPTION_M:
>              case QEMU_OPTION_machine:
>                  olist = qemu_find_opts("machine");
> 

Ping!

Paolo, I think this counts as "main loop" patch ... could you take it
through your tree?

 Thomas