Deprecation patches
cover Deprecation patches
A fix for a wrongly resolved merge conflict in qemu-deprecated.texi, and the removal of the deprecated -clock option.
Thomas Huth (2):
qemu-deprecated: Remove -virtioconsole and -no-frame for good
qemu-options: Remove deprecated option -clock
qemu-deprecated.texi | 17 ----------------- qemu-options.hx | 3 --- vl.c | 6 ------ 3 files changed, 26 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/2 qemu-deprecated: Remove -virtioconsole and -no-frame for good
The two sections have accidentally been added again during the merge of Paolo's and Gerd's trees.
--- qemu-deprecated.texi | 12 ------------ 1 file changed, 12 deletions(-)
qemu-deprecated.texi +0 -12
@@ -37,18 +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 -virtioconsole (since 3.0.0) - -Option @option{-virtioconsole} has been replaced by -@option{-device virtconsole}. - -@subsection -no-frame (since 2.12.0) - -The @code{--no-frame} argument works with SDL 1.2 only. The other user -interfaces never implemented this in the first place. So this will be -removed together with SDL 1.2 support. ->>>>>>> remotes/bonzini/tags/for-upstream - @subsection -clock (since 3.0.0) The @code{-clock} option is ignored since QEMU version 1.7.0. There is no
Signature · 1 line
1.8.3.1
PATCH 2/2 qemu-options: Remove deprecated option -clock
In reply to Thomas HuthThe 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.
--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 3 --- vl.c | 6 ------ 3 files changed, 14 deletions(-)
qemu-deprecated.texi +0 -5
@@ -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
qemu-options.hx +0 -3
@@ -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",
vl.c +0 -6
@@ -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);
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 1/2] qemu-deprecated: Remove -virtioconsole and -no-frame for good
In reply to Thomas HuthQuoted 24 lines · Thomas Huth
The two sections have accidentally been added again during the merge of Paolo's and Gerd's trees.
Fixes 3e29da9fd81002a0c03041aaa26dea6d9dd9bd65Signed-off-by Thomas Huth <[email protected]>--- qemu-deprecated.texi | 12 ------------ 1 file changed, 12 deletions(-)qemu-deprecated.texi +0
-6@@ -37,18 +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 -virtioconsole (since 3.0.0) - -Option @option{-virtioconsole} has been replaced by -@option{-device virtconsole}. - -@subsection -no-frame (since 2.12.0)
qemu-deprecated.texi would automatically enable USB support on the machine type.
Quoted 10 lines
qemu-deprecated.texi +0
-7- -The @code{--no-frame} argument works with SDL 1.2 only. The other user -interfaces never implemented this in the first place. So this will be -removed together with SDL 1.2 support. ->>>>>>> remotes/bonzini/tags/for-upstream - @subsection -clock (since 3.0.0) The @code{-clock} option is ignored since QEMU version 1.7.0. There is no --
This was a mismerge on my part -- particularly egregious since I left the >>>>> conflict marker in...
PS: do we have a document where we list the options that have entirely gone away, so that when a user of QEMU 4.1 tries "-virtioconsole" and it doesn't work they know what the replacement is ?
thanks
-- PMM
Re: [Qemu-devel] [PATCH 1/2] qemu-deprecated: Remove -virtioconsole and -no-frame for good
Quoted 39 lines · Peter Maydell
Quoted 24 lines · Thomas Huth
The two sections have accidentally been added again during the merge of Paolo's and Gerd's trees.
Fixes 3e29da9fd81002a0c03041aaa26dea6d9dd9bd65Signed-off-by Thomas Huth <[email protected]>--- qemu-deprecated.texi | 12 ------------ 1 file changed, 12 deletions(-)qemu-deprecated.texi +0
-6@@ -37,18 +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 -virtioconsole (since 3.0.0) - -Option @option{-virtioconsole} has been replaced by -@option{-device virtconsole}. - -@subsection -no-frame (since 2.12.0)qemu-deprecated.texi would automatically enable USB support on the machine type.
Quoted 10 lines
qemu-deprecated.texi +0
-7- -The @code{--no-frame} argument works with SDL 1.2 only. The other user -interfaces never implemented this in the first place. So this will be -removed together with SDL 1.2 support. ->>>>>>> remotes/bonzini/tags/for-upstream - @subsection -clock (since 3.0.0) The @code{-clock} option is ignored since QEMU version 1.7.0. There is no --This was a mismerge on my part -- particularly egregious since I left the >>>>> conflict marker in...
Quoted 5 lines
Reviewed-by Peter Maydell <[email protected]>PS: do we have a document where we list the options that have entirely gone away, so that when a user of QEMU 4.1 tries "-virtioconsole" and it doesn't work they know what the replacement is ?
No, we only put it into the ChangeLog so far, so people who search for the options should be able to find them.
Most of the deprecated options like -virtioconsole are also rather hardly used, so I don't think it's worth the effort to maintain a separate document for this.
Thomas
Re: [Qemu-devel] [PATCH 2/2] qemu-options: Remove deprecated option -clock
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
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 <[email protected]>
Quoted 54 lines
--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 3 --- vl.c | 6 ------ 3 files changed, 14 deletions(-)qemu-deprecated.texi +0
-5@@ -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 hostqemu-options.hx +0
-3@@ -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",vl.c +0
-6@@ -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);
Laurent Vivier
AppliedRe: [Qemu-devel] [Qemu-trivial] [PATCH 1/2] qemu-deprecated: Remove -virtioconsole and -no-frame for good
In reply to Thomas HuthQuoted 23 lines · Thomas Huth
The two sections have accidentally been added again during the merge of Paolo's and Gerd's trees.
Fixes 3e29da9fd81002a0c03041aaa26dea6d9dd9bd65Signed-off-by Thomas Huth <[email protected]>--- qemu-deprecated.texi | 12 ------------ 1 file changed, 12 deletions(-)qemu-deprecated.texi +0
-5@@ -37,18 +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 -virtioconsole (since 3.0.0) - -Option @option{-virtioconsole} has been replaced by -@option{-device virtconsole}. -
qemu-deprecated.texi would automatically enable USB support on the machine type. · line 42
Quoted 10 lines
qemu-deprecated.texi +0
-7-@subsection -no-frame (since 2.12.0) - -The @code{--no-frame} argument works with SDL 1.2 only. The other user -interfaces never implemented this in the first place. So this will be -removed together with SDL 1.2 support. ->>>>>>> remotes/bonzini/tags/for-upstream - @subsection -clock (since 3.0.0) The @code{-clock} option is ignored since QEMU version 1.7.0. There is no
Applied to my trivial-patches branch.
Thanks,
Laurent
Laurent Vivier
AppliedRe: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] qemu-options: Remove deprecated option -clock
In reply to Thomas HuthQuoted 48 lines · Thomas Huth
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 <[email protected]>--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 3 --- vl.c | 6 ------ 3 files changed, 14 deletions(-)qemu-deprecated.texi +0
-5@@ -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 hostqemu-options.hx +0
-3@@ -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",vl.c +0
-0@@ -3735,12 +3735,6 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_old_param: old_param =1 ;
vl.c int main(int argc, char **argv, char **envp) · line 3740
Quoted 10 lines
vl.c +0
-6break ; -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