Revision 01af7daf

b/Makefile.objs
42 42
net-nested-$(CONFIG_VDE) += vde.o
43 43
net-obj-y += $(addprefix net/, $(net-nested-y))
44 44

  
45
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy)
46
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
47
# only pull in the actual virtio-9p device if we also enabled virtio.
48
CONFIG_REALLY_VIRTFS=y
49
endif
45 50
fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o
46 51
fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
47 52

  
......
159 164

  
160 165
hw-obj-y =
161 166
hw-obj-y += vl.o loader.o
162
hw-obj-y += virtio.o virtio-console.o
167
hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
163 168
hw-obj-y += fw_cfg.o
164 169
# FIXME: Core PCI code and its direct dependencies are required by the
165 170
# QMP query-pci command.
......
264 269
adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
265 270
hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
266 271

  
267
hw-obj-$(CONFIG_VIRTFS) += virtio-9p-debug.o virtio-9p-local.o virtio-9p-xattr.o
272
hw-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p-debug.o
273
hw-obj-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o
268 274
hw-obj-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
269 275

  
270 276
######################################################################
b/Makefile.target
188 188
obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o
189 189
# virtio has to be here due to weird dependency between PCI and virtio-net.
190 190
# need to fix this properly
191
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
191
obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
192 192
obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
193 193
obj-y += vhost_net.o
194 194
obj-$(CONFIG_VHOST_NET) += vhost.o
195
obj-$(CONFIG_VIRTFS) += virtio-9p.o
195
obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o
196 196
obj-y += rwhandler.o
197 197
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
198 198
obj-$(CONFIG_NO_KVM) += kvm-stub.o
b/default-configs/s390x-softmmu.mak
1
include virtio.mak

Also available in: Unified diff