The following changes since commit 43771d5d92312504305c19abe29ec5bfabd55f01:
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-05-31' into staging (2017-06-01 16:39:16 +0100) are available in the git repository at: git://github.com/famz/qemu.git tags/docker-and-block-pull-request for you to fetch changes up to 4ab2cbc128f1938355a12970c9b6e419a63fcab6: block: make accounting thread-safe (2017-06-02 15:59:32 +0800) ---------------------------------------------------------------- v2: Fix building on OSX and BSD. ---------------------------------------------------------------- Fam Zheng (4): docker: Run tests with current user docker: Add bzip2 and hostname to fedora image docker: Add libaio to fedora image docker: Add flex and bison to centos6 image Paolo Bonzini (18): block: access copy_on_read with atomic ops block: access quiesce_counter with atomic ops block: access io_limits_disabled with atomic ops block: access serialising_in_flight with atomic ops block: access wakeup with atomic ops block: access io_plugged with atomic ops throttle-groups: only start one coroutine from drained_begin throttle-groups: do not use qemu_co_enter_next throttle-groups: protect throttled requests with a CoMutex util: add stats64 module block: use Stat64 for wr_highest_offset block: access write_gen with atomics block: protect tracked_requests and flush_queue with reqs_lock block: introduce dirty_bitmap_mutex migration/block: reset dirty bitmap before reading block: protect modification of dirty bitmaps with a mutex block: introduce block_account_one_io block: make accounting thread-safe block.c | 9 +- block/accounting.c | 65 ++++++----- block/block-backend.c | 5 +- block/dirty-bitmap.c | 114 +++++++++++++++++-- block/io.c | 51 +++++---- block/mirror.c | 14 ++- block/nfs.c | 4 +- block/qapi.c | 2 +- block/sheepdog.c | 3 +- block/throttle-groups.c | 91 +++++++++++---- blockdev.c | 46 ++------ include/block/accounting.h | 8 +- include/block/block.h | 5 +- include/block/block_int.h | 65 +++++++---- include/block/dirty-bitmap.h | 25 +++-- include/qemu/stats64.h | 193 ++++++++++++++++++++++++++++++++ include/sysemu/block-backend.h | 10 +- migration/block.c | 17 ++- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/centos6.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 4 +- util/Makefile.objs | 1 + util/stats64.c | 137 +++++++++++++++++++++++ 23 files changed, 688 insertions(+), 185 deletions(-) create mode 100644 include/qemu/stats64.h create mode 100644 util/stats64.c -- 2.9.4
