diff options
author | 2014-11-10 16:28:51 +0000 | |
---|---|---|
committer | 2014-11-10 16:28:51 +0000 | |
commit | 558c2c8ddfb165a36eb95dc93125c04829d68aa7 (patch) | |
tree | 8de95857795c0e90b4e0154b27805231e961fd7b /scripts/switch-timer-api | |
parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141105' into staging (diff) | |
parent | Merge remote-tracking branch 'mreitz/block' into queue-block (diff) | |
download | qemu-558c2c8ddfb165a36eb95dc93125c04829d68aa7.tar.xz qemu-558c2c8ddfb165a36eb95dc93125c04829d68aa7.zip |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches
# gpg: Signature made Mon 10 Nov 2014 09:42:07 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block/vdi: Limit maximum size even futher
qapi: Complete BlkdebugEvent
iotests: Add test for non-existing backing file
block: Propagate error in bdrv_img_create()
qemu-img: Omit error_report() after img_open()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/switch-timer-api')
0 files changed, 0 insertions, 0 deletions