summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorCornelia Huck2017-08-08 11:03:38 +0200
committerCornelia Huck2017-08-30 18:23:25 +0200
commit5f8c92e1d50d3629116497dd0a446e8cb28af7f8 (patch)
tree261caab058e2c43bf2913469ae12bc6706de036f /hw
parentconfigure: enable --s390-pgste linker option (diff)
downloadqemu-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 'hw')
-rw-r--r--hw/9pfs/Makefile.objs2
-rw-r--r--hw/Makefile.objs2
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs
index cab5e942ed..fd90b62900 100644
--- a/hw/9pfs/Makefile.objs
+++ b/hw/9pfs/Makefile.objs
@@ -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
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index a2c61f6b09..cf4cb2010b 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,4 +1,4 @@
-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/