Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20180618' into...

[qemu.git] / fsdev / Makefile.objs

diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs
index cb1e2500b99ed9daeb333443746233485c57816c..fb38017c0b274948d01fc6484cbb2ce81ab7ba02 100644 (file)
--- a/fsdev/Makefile.objs
+++ b/fsdev/Makefile.objs
@@ -1,9 +1,9 @@
-ifeq ($(CONFIG_REALLY_VIRTFS),y)
-common-obj-y = qemu-fsdev.o virtio-9p-marshal.o
+# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
+# only pull in the actual 9p backend if we also enabled virtio or xen.
+common-obj-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
+common-obj-$(call lnot,$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN)))) = qemu-fsdev-dummy.o
+common-obj-y += qemu-fsdev-opts.o qemu-fsdev-throttle.o

 
 # Toplevel always builds this; targets without virtio will put it in
 # common-obj-y
 
 # Toplevel always builds this; targets without virtio will put it in
 # common-obj-y

-extra-obj-y = qemu-fsdev-dummy.o
-else
-common-obj-y = qemu-fsdev-dummy.o
-endif
+common-obj-$(CONFIG_ALL) += qemu-fsdev-dummy.o