Commit 5f8c92e1 authored Aug 08, 2017 by Cornelia Huck

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>

parent e9a3591f

fsdev/Makefile.objs

+3 −6

Original line number	Diff line number	Diff line
		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

hw/9pfs/Makefile.objs

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,4 +7,4 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o
		common-obj-y += 9p-proxy.o
		common-obj-$(CONFIG_XEN) += xen-9p-backend.o

		obj-y += virtio-9p-device.o
		obj-$(CONFIG_VIRTIO) += virtio-9p-device.o

hw/Makefile.objs

+1 −1

Original line number	Diff line number	Diff line
		devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/
		devices-dirs-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) += 9pfs/
		devices-dirs-$(CONFIG_SOFTMMU) += acpi/
		devices-dirs-$(CONFIG_SOFTMMU) += adc/
		devices-dirs-$(CONFIG_SOFTMMU) += audio/