From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 24 Aug 2018 17:05:25 +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=746b7907feeba7eced022b96b8effa079bd27a2e;p=qemu.git

Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

Just a build fix that I had queued during soft freeze.

# gpg: Signature made Wed 22 Aug 2018 11:22:56 BST
# gpg:                using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg:                 aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/for-upstream:
  fsdev: fix compilation with VIRTIO but not VIRTIO_9P

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

746b7907feeba7eced022b96b8effa079bd27a2e