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

diff --cc block-migration.c
Simple merge

diff --cc hw/ide/macio.c
Simple merge

diff --cc hw/ide/microdrive.c
Simple merge

diff --cc hw/qdev.c
Simple merge

diff --cc hw/virtio-blk.c
Simple merge