aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-19 17:47:08 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-19 17:47:08 +0000
commit3e5f6234b4f45a11b7c357dde2d6da36641bc6f6 (patch)
treef6770b2c458dbfeedccd2346543107971654b783 /qemu-options.hx
parent33a8d5b72d63fe44f08614408284fa934dee1edd (diff)
parent5b347c541017b9ced10e8e9bce02d25bcf04c7af (diff)
downloadqemu-arm-3e5f6234b4f45a11b7c357dde2d6da36641bc6f6.tar.gz
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.3.0-rc1 # gpg: Signature made Thu Mar 19 15:03:26 2015 GMT using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: block: Fix blockdev-backup not to use funky error class raw-posix: Deprecate aio=threads fallback without O_DIRECT raw-posix: Deprecate host floppy passthrough Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx3
1 files changed, 1 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 16ff72c9e8..319d971260 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -419,8 +419,7 @@ STEXI
@item -fdb @var{file}
@findex -fda
@findex -fdb
-Use @var{file} as floppy disk 0/1 image (@pxref{disk_images}). You can
-use the host floppy by using @file{/dev/fd0} as filename (@pxref{host_drives}).
+Use @var{file} as floppy disk 0/1 image (@pxref{disk_images}).
ETEXI
DEF("hda", HAS_ARG, QEMU_OPTION_hda,