Merge remote branch 'mst/for_anthony' into staging

diff --cc Makefile.objs
Simple merge

diff --cc hw/pci.c
Simple merge

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