[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/44] 9pfs: fix dependencies
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 13/44] 9pfs: fix dependencies |
Date: |
Wed, 30 Aug 2017 18:52:21 +0200 |
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
fsdev/Makefile.objs | 9 +++------
hw/9pfs/Makefile.objs | 2 +-
hw/Makefile.objs | 2 +-
3 files changed, 5 insertions(+), 8 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
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/
--
2.13.5
- [Qemu-devel] [PULL 03/44] s390x: introduce 2.11 compat machine, (continued)
- [Qemu-devel] [PULL 03/44] s390x: introduce 2.11 compat machine, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 04/44] s390x/ipl: The s390-ipl device is not hot-pluggable, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 05/44] tests/boot-sector: Do not overwrite the x86 buffer on other architectures, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 06/44] tests/pxe: Check virtio-net-ccw on s390x, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 07/44] tests: Run filter-redirector and -mirror test only on POSIX systems, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 08/44] tests: Add network filter tests to the check-qtest-s390x list, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 10/44] watchdog/wdt_diag288: Mark diag288 watchdog as non-hotpluggable, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 09/44] s390x/tcg: specification exception for unknown diag, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 11/44] s390x: wire up diag288 in tcg, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 12/44] configure: enable --s390-pgste linker option, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 13/44] 9pfs: fix dependencies,
Cornelia Huck <=
- [Qemu-devel] [PULL 14/44] kvm: remove hard dependency on pci, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 15/44] s390x/pci: add stubs, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 16/44] s390x: chsc nt2 events are pci-only, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 17/44] s390x/pci: do not advertise pci on non-pci builds, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 18/44] s390x/ccw: create s390 phb conditionally, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 19/44] s390x/sclp: properly guard pci-specific functions, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 20/44] s390x/pci: fence off instructions for non-pci, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 21/44] s390x: refine pci dependencies, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 22/44] s390x/s390-skeys: Mark the storage key devices with user_creatable = false, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count(), Cornelia Huck, 2017/08/30