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

diff --cc hw/virtio.h
Simple merge

diff --cc nbd.c
Simple merge

diff --cc nbd.h
Simple merge

diff --cc qemu-nbd.c
Simple merge