From patchwork Thu Feb 14 10:47:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10812437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD38D13B4 for ; Thu, 14 Feb 2019 10:48:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9EFB2D6AD for ; Thu, 14 Feb 2019 10:48:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E3D52D6B0; Thu, 14 Feb 2019 10:48:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EA402D6AD for ; Thu, 14 Feb 2019 10:48:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406726AbfBNKs2 (ORCPT ); Thu, 14 Feb 2019 05:48:28 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:60731 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394331AbfBNKsB (ORCPT ); Thu, 14 Feb 2019 05:48:01 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M5Q2f-1gsqyQ1MRh-001Rxr; Thu, 14 Feb 2019 11:47:35 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini , kvm@vger.kernel.org, libvir-list@redhat.com, "Michael S. Tsirkin" , Eric Blake , Markus Armbruster , Michael Tokarev , "Dr. David Alan Gilbert" , qemu-trivial@nongnu.org, Gerd Hoffmann , Artyom Tarasenko , Kamil Rytarowski , Mark Cave-Ayland , Thomas Huth , Peter Maydell Subject: [PULL 02/14] qemu-deprecated: Remove -virtioconsole and -no-frame for good Date: Thu, 14 Feb 2019 11:47:05 +0100 Message-Id: <20190214104717.3543-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214104717.3543-1-laurent@vivier.eu> References: <20190214104717.3543-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:QF78azORv0wvVxM7jiTEXMMiFSvQ1oiB3VlThMMO6pvauyqaXEv MqBRhELUnAjqOX15TWBaS3ZBeaHB3a0798SV9S2Oip7wobwjm3oRGimoHal3sP9qB7UqraZ 10ardED7BSnq/Hh3Xzs98Ln5Ra+B/eaSw8BrdZvmntLsPVUdEE/TQt9eEZrucKopCCcdZ41 k1kCRLzTeWm3tpXPhcPLA== X-UI-Out-Filterresults: notjunk:1;V03:K0:1c8XzALaI5o=:r4S2hp7pAVFOeMPR93XUon sTKpkfQxSLdWjxl/lcyh+iY+5DcO7p6/OxZZCHcIWc8DiiGP4VSVJQanBpnsANprr5rTuuqT1 DGKzzfb1pBRyfYq5sXAtJK9lux6mXCOnsm8D5kka3HKlHv/PmvFau+gE5sium58R42E2f58Qz uEsp87RiFChChrRGoUuzfieoWIKDhcj62Xt4oB2pXfRm7HK0AtWcausVz2tvlvW61hVSEdHso tt16AX8eGJEGi5394sApf1WWpLL3fKFKVSh7PC5pj7xRyZNW2w5VcIesA9BCNTz6ufGzKyEwx RqW2dwEYe8XTPwjhkHJyPETNXHr8kOIj9LYUXUSZ92N+sywQ1RSIMyAp9w+chqrYdYjuAW4mo MpTIRIyHt1ZSwKJ8aeijES04yFmWC5Pgz5GYPk4AbNsSGfCzLfA8HN5BavFvPz8/MX1cDLbZ3 N88TccAP86eCpkyFiwEmLPNVat56NbXDZ/3RpXgGccstkZ1FFJBsrito/gS0yKPHDKGxl3beS DSncp0bIHav5ZSL0UyvhfuLRZeXMXWqWrl6ZeXjloZki4lu8ZVb6SYHT+0ya1rXxbs5djmNcu nr4DPAKtCzJCy12EbAKpyRSeI3b2Wgu9vpnl5P/LneRPGCjqj+m4GaX7fE2IvHUksuUehToyu ejKJKRx+DcoojLFb4FEMblLTTVYJZWhXuqSfKuoKbcOeirVegrDbPHgpMEvmGEZNcan0y0EQ2 188KHoWqbkfVnCiI4TCFQbEseY+roK/SKC/0rg== Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Huth 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 Reviewed-by: Peter Maydell Message-Id: <1549545296-18903-2-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- qemu-deprecated.texi | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 80b0702ad5b2..90e5860fd1a6 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