aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-03-19 15:24:59 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-03-19 15:24:59 +0000
commit8631a430e65ef73b3d8a297128be2ef3c7317b90 (patch)
treeaacaa13dc9879b923b9ea13864742d39b7c3b411 /docs
parent92566947b3ac5ca75f91a34acb188219c455fc71 (diff)
parentbb3c92ed105f0704ffd1cc1dc6031b6d457c829e (diff)
downloadqemu-8631a430e65ef73b3d8a297128be2ef3c7317b90.zip
qemu-8631a430e65ef73b3d8a297128be2ef3c7317b90.tar.gz
qemu-8631a430e65ef73b3d8a297128be2ef3c7317b90.tar.bz2
Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-fdc-2021-03-16-v5' into staging
QOM and fdc patches patches for 2021-03-16 # gpg: Signature made Fri 19 Mar 2021 14:18:47 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qom-fdc-2021-03-16-v5: memory: Drop "qemu:" prefix from QOM memory region type names hw: Replace anti-social QOM type names blockdev: Drop deprecated bogus -drive interface type fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() fdc: Drop deprecated floppy configuration docs/system/deprecated: Fix note on fdc drive properties fuzz: Avoid deprecated misuse of -drive if=sd Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/system/deprecated.rst33
-rw-r--r--docs/system/removed-features.rst57
2 files changed, 57 insertions, 33 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index dfc12ee..67c98dc 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -71,39 +71,6 @@ QEMU 5.1 has three options:
to the user to load all the images they need.
3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmwrae.
-``Configuring floppies with ``-global``
-'''''''''''''''''''''''''''''''''''''''
-
-Use ``-device floppy,...`` instead:
-::
-
- -global isa-fdc.driveA=...
- -global sysbus-fdc.driveA=...
- -global SUNW,fdtwo.drive=...
-
-become
-::
-
- -device floppy,unit=0,drive=...
-
-and
-::
-
- -global isa-fdc.driveB=...
- -global sysbus-fdc.driveB=...
-
-become
-::
-
- -device floppy,unit=1,drive=...
-
-``-drive`` with bogus interface type
-''''''''''''''''''''''''''''''''''''
-
-Drives with interface types other than ``if=none`` are for onboard
-devices. It is possible to use drives the board doesn't pick up with
--device. This usage is now deprecated. Use ``if=none`` instead.
-
Short-form boolean options (since 6.0)
''''''''''''''''''''''''''''''''''''''
diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
index d0244fb..f28387f 100644
--- a/docs/system/removed-features.rst
+++ b/docs/system/removed-features.rst
@@ -64,6 +64,63 @@ The 'file' driver for drives is no longer appropriate for character or host
devices and will only accept regular files (S_IFREG). The correct driver
for these file types is 'host_cdrom' or 'host_device' as appropriate.
+Floppy controllers' drive properties (removed in 6.0)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Use ``-device floppy,...`` instead. When configuring onboard floppy
+controllers
+::
+
+ -global isa-fdc.driveA=...
+ -global sysbus-fdc.driveA=...
+ -global SUNW,fdtwo.drive=...
+
+become
+::
+
+ -device floppy,unit=0,drive=...
+
+and
+::
+
+ -global isa-fdc.driveB=...
+ -global sysbus-fdc.driveB=...
+
+become
+::
+
+ -device floppy,unit=1,drive=...
+
+When plugging in a floppy controller
+::
+
+ -device isa-fdc,...,driveA=...
+
+becomes
+::
+
+ -device isa-fdc,...
+ -device floppy,unit=0,drive=...
+
+and
+::
+
+ -device isa-fdc,...,driveB=...
+
+becomes
+::
+
+ -device isa-fdc,...
+ -device floppy,unit=1,drive=...
+
+``-drive`` with bogus interface type (removed in 6.0)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Drives with interface types other than ``if=none`` are for onboard
+devices. Drives the board doesn't pick up can no longer be used with
+-device. Use ``if=none`` instead.
+
+
QEMU Machine Protocol (QMP) commands
------------------------------------