diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:15:43 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:15:43 -0500 |
| commit | 93e0597ef9fa266756c30e61fafe4b70fc7ce6a6 (patch) | |
| tree | b1dcd7925329853ac5284bc2c12ebecdfa44fa34 /Makefile.objs | |
| parent | ac779fe2334ebea5d4a365b053d786f7748a1db5 (diff) | |
| parent | 5c3234c6c037943bd4c2d643a1b8cc35f563dbdb (diff) | |
| download | qemu-93e0597ef9fa266756c30e61fafe4b70fc7ce6a6.tar.gz qemu-93e0597ef9fa266756c30e61fafe4b70fc7ce6a6.tar.bz2 qemu-93e0597ef9fa266756c30e61fafe4b70fc7ce6a6.zip | |
Merge remote-tracking branch 'jvrao/for-anthony' into staging
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.objs b/Makefile.objs index 50fbb200de..52d8b23045 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -45,12 +45,14 @@ net-nested-$(CONFIG_SLIRP) += slirp.o net-nested-$(CONFIG_VDE) += vde.o net-obj-y += $(addprefix net/, $(net-nested-y)) -ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy) +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 +fsdev-nested-y = qemu-fsdev.o +else +fsdev-nested-y = qemu-fsdev-dummy.o endif -fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) ###################################################################### @@ -286,12 +288,11 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) -9pfs-nested-$(CONFIG_REALLY_VIRTFS) = virtio-9p-debug.o +9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o virtio-9p-debug.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o -hw-obj-$(CONFIG_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y)) -$(addprefix 9pfs/, $(9pfs-nested-y)): CFLAGS += -I$(SRC_PATH)/hw/ +hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y)) ###################################################################### |