diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-15 17:35:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-15 17:35:22 +0100 |
| commit | f2bcdc8de018d33ecf93da7a94f327956ecf76ea (patch) | |
| tree | 6f5d4706132e29c5c95b8a829e6eb335c9657166 /ui/sdl2.c | |
| parent | 16ab5046c4a607dddabc8086d4454293af59fc9f (diff) | |
| parent | 0e4271b711a8ea766d29824c844e268b91ac3ae5 (diff) | |
| download | focaccia-qemu-f2bcdc8de018d33ecf93da7a94f327956ecf76ea.tar.gz focaccia-qemu-f2bcdc8de018d33ecf93da7a94f327956ecf76ea.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches # gpg: Signature made Fri 12 Sep 2014 16:09:43 BST using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: (22 commits) qcow2: Add falloc and full preallocation option raw-posix: Add falloc and full preallocation option qapi: introduce PreallocMode and new PreallocModes full and falloc. block: don't convert file size to sector size block: round up file size to nearest sector iotests: Send the correct fd in socket_scm_helper blockdev: Refuse to drive_del something added with blockdev-add block: extend BLOCK_IO_ERROR with reason string dataplane: fix virtio_blk_data_plane_create() op blocker error path qemu-iotests: Run 025 for Archipelago block driver block/archipelago: Implement bdrv_truncate() block: Make the block accounting functions operate on BlockAcctStats block: rename BlockAcctType members to start with BLOCK_ instead of BDRV_ block: Extract the block accounting code block: Extract the BlockAcctStats structure IDE: MMIO IDE device control should be little endian thread-pool: Drop unnecessary includes xen: Drop redundant bdrv_close() from pci_piix3_xen_ide_unplug() xen_disk: Plug memory leak on error path qemu-io: Clean up openfile() after commit 2e40134 ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2.c')
0 files changed, 0 insertions, 0 deletions