diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 16:43:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 16:43:19 +0000 |
| commit | 2869653f23c63c400d3791513b507e9feddbc751 (patch) | |
| tree | 40125a1c80d9c82145b55123f58d07d8a4b6d31f /slirp/socket.c | |
| parent | 3c07587d49458341510360557c849e93e9afaf59 (diff) | |
| parent | 4d07c720f44beafd10907cecfd5b8a57622243c1 (diff) | |
| download | qemu-2869653f23c63c400d3791513b507e9feddbc751.zip qemu-2869653f23c63c400d3791513b507e9feddbc751.tar.gz qemu-2869653f23c63c400d3791513b507e9feddbc751.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Wed 11 Nov 2015 16:03:19 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (41 commits)
iotests: Check for quorum support in test 139
qcow2: Fix qcow2_get_cluster_offset() for zero clusters
iotests: Add tests for the x-blockdev-del command
block: Add 'x-blockdev-del' QMP command
block: Add blk_get_refcnt()
mirror: block all operations on the target image during the job
qemu-iotests: fix -valgrind option for check
qemu-iotests: fix cleanup of background processes
qemu-io: Correct error messages
qemu-io: Check for trailing chars
qemu-io: fix cvtnum lval types
block: test 'blockdev-snapshot' using a file BDS as the overlay
block: Remove inner quotation marks in iotest 085
block: Disallow snapshots if the overlay doesn't support backing files
throttle: Use bs->throttle_state instead of bs->io_limits_enabled
throttle: Check for pending requests in throttle_group_unregister_bs()
qemu-img: add check for zero-length job len
qcow2: avoid misaligned 64bit bswap
qemu-iotests: Test the reopening of overlay_bs in 'block-commit'
commit: reopen overlay_bs before base
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/socket.c')
0 files changed, 0 insertions, 0 deletions