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

diff --cc Makefile.objs
Simple merge

diff --cc Makefile.target
index 85480d89c4290eae642e7b02db128e79053efbc3,99ff3bae467811ee26c7ec05d8f28ce76613cd0b..f7cb17de80197839e1d4186749e5a4e498866325
--- 1/Makefile.target
--- 2/Makefile.target
+++ b/Makefile.target
@@@ -190,9 -191,10 +190,9 @@@ obj-y = arch_init.o cpus.o monitor.o ma
  # need to fix this properly
  obj-$(CONFIG_NO_PCI) += pci-stub.o
  obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
 -obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
  obj-y += vhost_net.o
  obj-$(CONFIG_VHOST_NET) += vhost.o
- obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o
+ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o
  obj-y += rwhandler.o
  obj-$(CONFIG_KVM) += kvm.o kvm-all.o
  obj-$(CONFIG_NO_KVM) += kvm-stub.o

diff --cc hw/9pfs/virtio-9p.c
Simple merge