diff options
| author | Peter Maydell | 2018-08-24 19:05:25 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-08-24 19:05:25 +0200 |
| commit | 746b7907feeba7eced022b96b8effa079bd27a2e (patch) | |
| tree | 2dc26ddf0afc97a777ac2b0b0786e7990e954009 /qga/main.c | |
| parent | Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180822-1'... (diff) | |
| parent | fsdev: fix compilation with VIRTIO but not VIRTIO_9P (diff) | |
| download | qemu-746b7907feeba7eced022b96b8effa079bd27a2e.tar.gz qemu-746b7907feeba7eced022b96b8effa079bd27a2e.tar.xz qemu-746b7907feeba7eced022b96b8effa079bd27a2e.zip | |
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>
Diffstat (limited to 'qga/main.c')
0 files changed, 0 insertions, 0 deletions