On Thu, 25 Jul 2019 at 11:18, Paolo Bonzini <[email protected]> wrote: > > Express the complex conditions in Kconfig rather than Makefiles, since Kconfig > is better suited at expressing dependencies and detecting contradictions. > > Cc: Marc-André Lureau <[email protected]> > Signed-off-by: Paolo Bonzini <[email protected]> > --- > Kconfig.host | 1 + > fsdev/Makefile.objs | 2 +- > hw/9pfs/Kconfig | 5 +++++ > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Kconfig.host b/Kconfig.host > index aec95365ff..bb6e116e2a 100644 > --- a/Kconfig.host > +++ b/Kconfig.host > @@ -28,6 +28,7 @@ config VHOST_USER > > config XEN > bool > + select FSDEV_9P if VIRTFS > > config VIRTFS > bool > diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs > index 24bbb3e75c..42cd70c367 100644 > --- a/fsdev/Makefile.objs > +++ b/fsdev/Makefile.objs > @@ -1,6 +1,6 @@ > # 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. > -ifeq ($(call land,$(CONFIG_VIRTFS),$(call > lor,$(CONFIG_VIRTIO_9P),$(CONFIG_XEN))),y) > +ifeq ($(CONFIG_FSDEV_9P),y) > common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o > else > common-obj-y = qemu-fsdev-dummy.o
Maybe we should update the comment here somehow too now? Patch definitely looks like a good idea, though -- those nested land/lor calls are pretty ugly :-) thanks -- PMM
