Merge remote-tracking branch 'kwolf/for-anthony' into staging

diff --cc block/cow.c
Simple merge

diff --cc block/qcow2.c
Simple merge

diff --cc cpus.c
Simple merge

diff --cc qemu-io.c
Simple merge

diff --cc qerror.c
Simple merge

diff --cc qerror.h
Simple merge

diff --cc savevm.c
Simple merge