diff options
| author | Peter Maydell | 2014-12-12 18:10:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-12-12 18:10:44 +0100 |
| commit | e0d3795654b7eb5b91b478bc7e6b717b192a8bce (patch) | |
| tree | 7be4908dfc8a445a28a622ecd514f81ea31619bb /ui/sdl2.c | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-12-1... (diff) | |
| parent | linux-aio: simplify removal of completed iocbs from the list (diff) | |
| download | qemu-e0d3795654b7eb5b91b478bc7e6b717b192a8bce.tar.gz qemu-e0d3795654b7eb5b91b478bc7e6b717b192a8bce.tar.xz qemu-e0d3795654b7eb5b91b478bc7e6b717b192a8bce.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Fri 12 Dec 2014 17:09:56 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
linux-aio: simplify removal of completed iocbs from the list
linux-aio: drop return code from laio_io_unplug and ioq_submit
linux-aio: rename LaioQueue idx field to "n"
linux-aio: track whether the queue is blocked
linux-aio: queue requests that cannot be submitted
block: drop unused bdrv_clear_incoming_migration_all() prototype
block: Don't add trailing space in "Formating..." message
qemu-iotests: Remove traling whitespaces in *.out
block: vhdx - set .bdrv_has_zero_init to bdrv_has_zero_init_1
iotests: Fix test 039
iotests: Filter for "Killed" in qemu-io output
qemu-io: Add sigraise command
block: vhdx - change .vhdx_create default block state to ZERO
block: vhdx - update PAYLOAD_BLOCK_UNMAPPED value to match 1.00 spec
block: vhdx - remove redundant comments
block/rbd: fix memory leak
iotests: Add test for vmdk JSON file names
vmdk: Fix error for JSON descriptor file names
block migration: fix return value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2.c')
0 files changed, 0 insertions, 0 deletions