From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([209.51.188.92]:56999)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1grm0a-0003Pr-Ir
	for qemu-devel@nongnu.org; Thu, 07 Feb 2019 10:54:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1grm0X-0005mw-Vm
	for qemu-devel@nongnu.org; Thu, 07 Feb 2019 10:54:35 -0500
References: <1549545296-18903-1-git-send-email-thuth@redhat.com>
	<1549545296-18903-2-git-send-email-thuth@redhat.com>
	<CAFEAcA8ROQPX5SXFOTEzpdmx+RQXbQTN_Cj3JcUHZ3RbSGwq=w@mail.gmail.com>
From: Thomas Huth <thuth@redhat.com>
Message-ID: <cbce3539-b9a8-ba2e-30a7-320df437f8e2@redhat.com>
Date: Thu, 7 Feb 2019 16:54:27 +0100
MIME-Version: 1.0
In-Reply-To: <CAFEAcA8ROQPX5SXFOTEzpdmx+RQXbQTN_Cj3JcUHZ3RbSGwq=w@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/2] qemu-deprecated: Remove -virtioconsole
 and -no-frame for good
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Trivial <qemu-trivial@nongnu.org>, Paolo Bonzini <pbonzini@redhat.com>, QEMU Developers <qemu-devel@nongnu.org>

On 2019-02-07 14:52, Peter Maydell wrote:
> On Thu, 7 Feb 2019 at 13:15, Thomas Huth <thuth@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 <thuth@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.maydell@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