Commit 993c91a0 authored Mar 04, 2014 by Aneesh Kumar K.V

hw/9pfs: Include virtio-9p-device.o in build



After commit ba1183da 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>

parent 4fa4ce71

Makefile.objs

+0 −5

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

fsdev/Makefile.objs

+3 −1

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

hw/Makefile.objs

+1 −1

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