Merge remote-tracking branch 'mst/for_anthony' into staging

diff --cc hw/pci.c
Simple merge

diff --cc hw/pci_host.h
Simple merge

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

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

diff --cc net.c
Simple merge