On 2019-02-07 14:52, Peter Maydell wrote:
> On Thu, 7 Feb 2019 at 13:15, Thomas Huth <th...@redhat.com> wrote:
>>
>> The two sections have accidentally been added again during the
>> merge of Paolo's and Gerd's trees.
>>
>> Fixes: 3e29da9fd81002a0c03041aaa26dea6d9dd9bd65
>> Signed-off-by: Thomas Huth <th...@redhat.com>
>> ---
>> qemu-deprecated.texi | 12 ------------
>> 1 file changed, 12 deletions(-)
>>
>> diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
>> index 80b0702..90e5860 100644
>> --- a/qemu-deprecated.texi
>> +++ b/qemu-deprecated.texi
>> @@ -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
>> --
>
> This was a mismerge on my part -- particularly egregious since
> I left the >>>>> conflict marker in...
>
> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
>
> 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
