diff options
| author | Peter Maydell | 2016-02-09 18:56:45 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-09 18:56:46 +0100 |
| commit | f075c89f0a9cb31daf38892371d2822177505706 (patch) | |
| tree | 72296f7ce1446b3809c749a2e15f4eb76f1aa61f /io/channel-socket.c | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-02-09' into... (diff) | |
| parent | block: add missing call to bdrv_drain_recurse (diff) | |
| download | qemu-f075c89f0a9cb31daf38892371d2822177505706.tar.gz qemu-f075c89f0a9cb31daf38892371d2822177505706.tar.xz qemu-f075c89f0a9cb31daf38892371d2822177505706.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 09 Feb 2016 15:11:25 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:
block: add missing call to bdrv_drain_recurse
blockjob: Fix hang in block_job_finish_sync
iov: avoid memcpy for "simple" iov_from_buf/iov_to_buf
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/channel-socket.c')
0 files changed, 0 insertions, 0 deletions