summary refs log tree commit diff stats
path: root/hw/display/virtio-gpu-pci.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-05-20 10:51:42 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-05-20 10:51:42 +0100
commit76c759e0335a4976e4c35c85a2a34ac6dab89034 (patch)
treeba6e6c17aa85f52f0008bfeb7f7216d8f36a5f4b /hw/display/virtio-gpu-pci.c
parent1b46b4daa6fbf45eddcf77877379a0afac341df9 (diff)
parentb44a6b09705e9e8a3005229b58de36d176020548 (diff)
downloadfocaccia-qemu-76c759e0335a4976e4c35c85a2a34ac6dab89034.tar.gz
focaccia-qemu-76c759e0335a4976e4c35c85a2a34ac6dab89034.zip
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
Diffstat (limited to 'hw/display/virtio-gpu-pci.c')
0 files changed, 0 insertions, 0 deletions