diff options
| author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2014-03-04 00:35:32 +0530 |
|---|---|---|
| committer | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2014-03-04 09:20:49 +0530 |
| commit | 993c91a0e996346c7ee8fa2ca310cc76edb59e17 (patch) | |
| tree | 51512e94cdda6394e7145f2a9ea643553ebcafd3 | |
| parent | 4fa4ce7107c6ec432f185307158c5df91ce54308 (diff) | |
hw/9pfs: Include virtio-9p-device.o in build
After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
hw/Makefile.objs directly from Makefile.target. Make sure hw/Makefile.objs
rules doesn't depend on variable defined in Makefile.objs
Tested-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| -rw-r--r-- | Makefile.objs | 5 | ||||
| -rw-r--r-- | fsdev/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/Makefile.objs | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.objs b/Makefile.objs index 4a62913a4d..5cd3d816ff 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -21,11 +21,6 @@ block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o block-obj-m = block/ -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. -CONFIG_REALLY_VIRTFS=y -endif ###################################################################### # smartcard diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs index 206289c49f..c27dad3f6d 100644 --- a/fsdev/Makefile.objs +++ b/fsdev/Makefile.objs @@ -1,4 +1,6 @@ -ifeq ($(CONFIG_REALLY_VIRTFS),y) +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 virtio-9p-marshal.o else common-obj-y = qemu-fsdev-dummy.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 05a00dc401..d178b65de4 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,4 +1,4 @@ -devices-dirs-$(CONFIG_REALLY_VIRTFS) += 9pfs/ +devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/ devices-dirs-$(CONFIG_ACPI) += acpi/ devices-dirs-$(CONFIG_SOFTMMU) += audio/ devices-dirs-$(CONFIG_SOFTMMU) += block/ |