diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-22 16:12:51 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-22 16:12:51 +0100 |
commit | 33886ebeec0c0ff6253a49253fae0db44c9ed0f3 (patch) | |
tree | 1e666965b66772c0d5e64beb98a7585c08936fd8 /util/path.c | |
parent | 43fe62757b0b90af448e02c9bd55b62960556360 (diff) | |
parent | bd39e6ed0b88a1473c652c97e731a156cccf16e2 (diff) | |
download | qemu-33886ebeec0c0ff6253a49253fae0db44c9ed0f3.zip qemu-33886ebeec0c0ff6253a49253fae0db44c9ed0f3.tar.gz qemu-33886ebeec0c0ff6253a49253fae0db44c9ed0f3.tar.bz2 |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches
# gpg: Signature made Fri 22 Aug 2014 14:47:53 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (29 commits)
qemu-img: Allow cache mode specification for amend
qemu-img: Allow source cache mode specification
vmdk: Use bdrv_nb_sectors() where sectors, not bytes are wanted
blkdebug: Delete BH in bdrv_aio_cancel
qemu-iotests: add test case 101 for short file I/O
raw-posix: fix O_DIRECT short reads
block/iscsi: fix memory corruption on iscsi resize
block/vvfat.c: remove debugging code to reinit stderr if NULL
iotests: Add test for image filename construction
quorum: Implement bdrv_refresh_filename()
nbd: Implement bdrv_refresh_filename()
blkverify: Implement bdrv_refresh_filename()
blkdebug: Implement bdrv_refresh_filename()
block: Add bdrv_refresh_filename()
virtio-blk: fix reference a pointer which might be freed
virtio-blk: allow block_resize with dataplane
block: acquire AioContext in qmp_block_resize()
qemu-iotests: Fix 028 reference output for qed
test-coroutine: test cost introduced by coroutine
iotests: Add test for qcow2's cache options
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/path.c')
0 files changed, 0 insertions, 0 deletions