aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2019-02-07 14:14:55 +0100
committerLaurent Vivier <laurent@vivier.eu>2019-02-14 10:40:12 +0100
commitb5ec7de7b5111f898453f96bdfd095fc1d8f6e18 (patch)
treea2e70c0052e688a95da9ef11571c12c77616a042
parent58823a0b48222b9d9cabf34d5f22a890f1ce3ba0 (diff)
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. Fixes: 3e29da9fd81002a0c03041aaa26dea6d9dd9bd65 Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <1549545296-18903-2-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-rw-r--r--qemu-deprecated.texi12
1 files changed, 0 insertions, 12 deletions
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 80b0702ad5..90e5860fd1 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