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 <groug@kaod.org>" [full]
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>" [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 <peter.maydell@linaro.org>
# Conflicts:
#	qemu-deprecated.texi

diff --cc qemu-deprecated.texi
index ab62dd7c1dc779e9cbe0bdb0204ccfd15597c77e,1a821b68f43540c047a0ee017aaadbf2372afec2..90cb677849a4b90c8d99996cfcd139b9bb9c862d
--- 1/qemu-deprecated.texi
--- 2/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)

diff --cc vl.c
Simple merge