From: Peter Maydell Date: Mon, 20 May 2019 09:51:42 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=76c759e0335a4976e4c35c85a2a34ac6dab89034;p=qemu.git Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging This fixes the virtfs documentation (LP 1581976), deprecates the -virtfs_synth command line option, along with some assorted cleanups. # gpg: Signature made Fri 17 May 2019 19:29:40 BST # gpg: using RSA key B4828BAF943140CEF2A3491071D4D5E5822F73D6 # gpg: Good signature from "Greg Kurz " [full] # gpg: aka "Gregory Kurz " [full] # gpg: aka "[jpeg image of size 3330]" [full] # Primary key fingerprint: B482 8BAF 9431 40CE F2A3 4910 71D4 D5E5 822F 73D6 * remotes/gkurz/tags/for-upstream: virtfs: Fix documentation of -fsdev and -virtfs vl: Deprecate -virtfs_synth fsdev: Error out when unsupported option is passed fsdev: Move some types definition to qemu-fsdev.c fsdev: Drop unused opaque field fsdev: Drop unused extern declaration Signed-off-by: Peter Maydell # Conflicts: # qemu-deprecated.texi --- 76c759e0335a4976e4c35c85a2a34ac6dab89034 diff --cc qemu-deprecated.texi index ab62dd7c1d,1a821b68f4..90cb677849 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@@ -72,11 -72,11 +72,16 @@@ backend settings instead of environmen the new format, the ``-audiodev-help'' option can be used to convert the current values of the environment variables to ``-audiodev'' options. +@subsection -realtime (since 4.1) + +The @code{-realtime mlock=on|off} argument has been replaced by the +@code{-overcommit mem-lock=on|off} argument. + + @subsection -virtfs_synth (since 4.1) + + The ``-virtfs_synth'' argument is now deprecated. Please use ``-fsdev synth'' + and ``-device virtio-9p-...'' instead. + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)