diff options
| author | Cornelia Huck | 2017-08-08 11:03:38 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2017-08-30 18:23:25 +0200 |
| commit | 5f8c92e1d50d3629116497dd0a446e8cb28af7f8 (patch) | |
| tree | 261caab058e2c43bf2913469ae12bc6706de036f /fsdev | |
| parent | configure: enable --s390-pgste linker option (diff) | |
| download | qemu-5f8c92e1d50d3629116497dd0a446e8cb28af7f8.tar.gz qemu-5f8c92e1d50d3629116497dd0a446e8cb28af7f8.tar.xz qemu-5f8c92e1d50d3629116497dd0a446e8cb28af7f8.zip | |
9pfs: fix dependencies
Nothing in fsdev/ or hw/9pfs/ depends on pci; it should rather depend
on CONFIG_VIRTFS and CONFIG_VIRTIO/CONFIG_XEN only.
Acked-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'fsdev')
| -rw-r--r-- | fsdev/Makefile.objs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs index 659df6e187..fb38017c0b 100644 --- a/fsdev/Makefile.objs +++ b/fsdev/Makefile.objs @@ -1,10 +1,7 @@ -ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. -# only pull in the actual virtio-9p device if we also enabled virtio. -common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o -else -common-obj-y = qemu-fsdev-dummy.o -endif +# 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 |