From: Thomas Huth <thuth@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org
Cc: "Daniel P. Berrange" <berrange@redhat.com>, qemu-trivial@nongnu.org
Subject: [Qemu-devel] [PATCH 1/2] qemu-deprecated: Remove -virtioconsole and -no-frame for good
Date: Thu, 7 Feb 2019 14:14:55 +0100 [thread overview]
Message-ID: <1549545296-18903-2-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1549545296-18903-1-git-send-email-thuth@redhat.com>
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
--
1.8.3.1
next prev parent reply other threads:[~2019-02-07 13:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 13:14 [Qemu-devel] [PATCH 0/2] Deprecation patches Thomas Huth
2019-02-07 13:14 ` Thomas Huth [this message]
2019-02-07 13:52 ` [Qemu-devel] [PATCH 1/2] qemu-deprecated: Remove -virtioconsole and -no-frame for good Peter Maydell
2019-02-07 15:54 ` Thomas Huth
2019-02-14 9:40 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-02-07 13:14 ` [Qemu-devel] [PATCH 2/2] qemu-options: Remove deprecated option -clock Thomas Huth
2019-02-07 16:23 ` Philippe Mathieu-Daudé
2019-02-14 9:41 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1549545296-18903-2-git-send-email-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).