diff options
| author | Peter Maydell | 2017-07-18 14:09:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-18 14:09:51 +0200 |
| commit | 718d7f4f9cf772e5784093d8e6085680a235acdb (patch) | |
| tree | e6754e6f1f280fa1530fe3a20a0f30cb6988ab83 /softmmu_template.h | |
| parent | Merge remote-tracking branch 'remotes/aurel/tags/pull-target-mips-20170717' i... (diff) | |
| parent | block: fix shadowed variable in bdrv_co_pdiscard (diff) | |
| download | qemu-718d7f4f9cf772e5784093d8e6085680a235acdb.tar.gz qemu-718d7f4f9cf772e5784093d8e6085680a235acdb.tar.xz qemu-718d7f4f9cf772e5784093d8e6085680a235acdb.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 17 Jul 2017 16:40:18 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
block: fix shadowed variable in bdrv_co_pdiscard
util/aio-win32: Only select on what we are actually waiting for
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu_template.h')
0 files changed, 0 insertions, 0 deletions