block/blkdebug.c | 4 +-- block/mirror.c | 4 +-- block/qcow2-bitmap.c | 2 +- block/qcow2-cluster.c | 20 +++++++----- block/qcow2-refcount.c | 8 ++--- block/qcow2-snapshot.c | 25 +++++++-------- block/qcow2.c | 26 ++++++++-------- block/qcow2.h | 15 ++++----- block/vmdk.c | 2 +- block/vvfat.c | 58 ++++++++++++++++++----------------- hw/9pfs/9p.h | 4 +-- hw/9pfs/codir.c | 6 ++-- nbd/server.c | 48 ++++++++++++++--------------- scsi/qemu-pr-helper.c | 22 ++++++------- tests/unit/test-thread-pool.c | 2 +- 15 files changed, 127 insertions(+), 119 deletions(-)