| Message ID | 1409329803-20744-1-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 29 August 2014 17:29, Stefan Hajnoczi <stefanha@redhat.com> wrote: > The following changes since commit a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-08-28 17:08:13 +0100) > > are available in the git repository at: > > > git://github.com/stefanha/qemu.git tags/block-pull-request > > for you to fetch changes up to 8df3abfceef557551f00adac1618ddd6fe46f85c: > > quorum: Fix leak of opts in quorum_open (2014-08-29 17:10:18 +0100) > > ---------------------------------------------------------------- > Block pull request Applied, thanks. -- PMM
The following changes since commit a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-08-28 17:08:13 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 8df3abfceef557551f00adac1618ddd6fe46f85c: quorum: Fix leak of opts in quorum_open (2014-08-29 17:10:18 +0100) ---------------------------------------------------------------- Block pull request ---------------------------------------------------------------- Daniel Henrique Barboza (1): block.curl: adding 'timeout' option Fam Zheng (4): coroutine: Drop co_sleep_ns nfs: Fix leak of opts in nfs_file_open blkverify: Fix leak of opts in blkverify_open quorum: Fix leak of opts in quorum_open Hitoshi Mitake (2): sheepdog: adopting protocol update for VDI locking sheepdog: improve error handling for a case of failed lock Liu Yuan (3): qapi: add read-pattern enum for quorum block/quorum: add simple read pattern support sheepdog: fix a core dump while do auto-reconnecting Markus Armbruster (1): ide: Fix bootindex for bus_id > 9 Max Reitz (3): nbd: Drop nbd_can_read() block: Add AIO context notifiers nbd: Follow the BDS' AIO context Paolo Bonzini (10): AioContext: take bottom halves into account when computing aio_poll timeout aio-win32: Evaluate timers after handles aio-win32: Factor out duplicate code into aio_dispatch_handlers AioContext: run bottom halves after polling AioContext: export and use aio_dispatch test-aio: test timers on Windows too aio-win32: add aio_set_dispatching optimization AioContext: introduce aio_prepare qemu-coroutine-io: fix for Win32 aio-win32: add support for sockets Richard W.M. Jones (2): curl: Allow a cookie or cookies to be sent with http/https requests. curl: Don't deref NULL pointer in call to aio_poll. Stefan Hajnoczi (9): qemu-img: fix img_commit() error return value qemu-img: fix img_compare() flags error path qemu-img: always goto out in img_snapshot() error paths blockdev: fix drive-mirror 'granularity' error message block: fix overlapping multiwrite requests qemu-iotests: add multiwrite test cases linux-aio: avoid deadlock in nested aio_poll() calls block: acquire AioContext in do_drive_del() virtio-blk: allow drive_del with dataplane aio-posix.c | 58 +++------ aio-win32.c | 262 ++++++++++++++++++++++++++++++---------- async.c | 39 +++--- block.c | 62 ++++++++++ block/Makefile.objs | 2 - block/blkverify.c | 1 + block/curl.c | 37 +++++- block/linux-aio.c | 71 ++++++++--- block/nfs.c | 10 +- block/quorum.c | 180 +++++++++++++++++++-------- block/sheepdog.c | 12 +- blockdev.c | 12 +- blockjob.c | 2 +- hw/block/dataplane/virtio-blk.c | 1 + hw/ide/qdev.c | 2 +- include/block/aio.h | 25 +++- include/block/block_int.h | 41 +++++++ include/block/coroutine.h | 8 -- nbd.c | 105 +++++++++++++--- qapi/block-core.json | 20 ++- qemu-coroutine-io.c | 4 +- qemu-coroutine-sleep.c | 12 -- qemu-img.c | 23 ++-- qemu-options.hx | 15 ++- tests/qemu-iotests/100 | 134 ++++++++++++++++++++ tests/qemu-iotests/100.out | 89 ++++++++++++++ tests/qemu-iotests/group | 1 + tests/test-aio.c | 48 ++------ 28 files changed, 979 insertions(+), 297 deletions(-) create mode 100755 tests/qemu-iotests/100 create mode 100644 tests/qemu-iotests/100.out