Remove deprecated -enable-hax option
PATCH 1/1 Remove deprecated -enable-hax option
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 <[email protected]>
--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 11 ----------- vl.c | 5 ----- 3 files changed, 21 deletions(-)
qemu-deprecated.texi +0 -5
@@ -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. -@subsection -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:@{...@{'driver':'file'@}@} (since 3.0) The 'file' driver for drives is no longer appropriate for character or host
qemu-options.hx +0 -11
@@ -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 -@item -enable-hax -@findex -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,
vl.c +0 -5
@@ -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" );
Signature · 1 line
1.8.3.1
Quoted 8 lines · Thomas Huth
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 <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 61 lines
--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 11 ----------- vl.c | 5 ----- 3 files changed, 21 deletions(-)qemu-deprecated.texi +0
-5@@ -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. -@subsection -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:@{...@{'driver':'file'@}@} (since 3.0) The 'file' driver for drives is no longer appropriate for character or hostqemu-options.hx +0
-11@@ -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 -@item -enable-hax -@findex -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,vl.c +0
-5@@ -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" );
Quoted 59 lines · Thomas Huth
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 <[email protected]>--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 11 ----------- vl.c | 5 ----- 3 files changed, 21 deletions(-)qemu-deprecated.texi +0
-5@@ -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. -@subsection -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:@{...@{'driver':'file'@}@} (since 3.0) The 'file' driver for drives is no longer appropriate for character or hostqemu-options.hx +0
-11@@ -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 -@item -enable-hax -@findex -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,vl.c +0
-0@@ -3579,11 +3579,6 @@ int main(int argc, char **argv, char **envp) olist =qemu_find_opts ("machine" );
vl.c int main(int argc, char **argv, char **envp) · line 3584
Quoted 10 lines
vl.c +0
-5qemu_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
Paolo Bonzini
AppliedQuoted 8 lines · Thomas Huth
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 <[email protected]>
Queued, thanks.
Paolo
Quoted 61 lines
--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 11 ----------- vl.c | 5 ----- 3 files changed, 21 deletions(-)qemu-deprecated.texi +0
-5@@ -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. -@subsection -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:@{...@{'driver':'file'@}@} (since 3.0) The 'file' driver for drives is no longer appropriate for character or hostqemu-options.hx +0
-11@@ -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 -@item -enable-hax -@findex -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,vl.c +0
-5@@ -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" );