Merge branch 'iwj.block-rw-rangecheck'

diff --cc block-qcow.c
Simple merge

diff --cc block-qcow2.c
Simple merge

diff --cc block-raw-posix.c
Simple merge

diff --cc block-raw-win32.c
Simple merge

diff --cc block-vmdk.c
Simple merge

diff --cc block.c
Simple merge

diff --cc block.h
Simple merge

diff --cc block_int.h
Simple merge