adbffc2074
hw/9pfs/Makefile.objs uses CONFIG_VIRTIO_9P to guard the definition for FileOperations structs, while fsdev/Makefile.objs uses CONFIG_VIRTIO to guard the use. Mismatch causes linking to fail when CONFIG_VIRTIO is set but CONFIG_VIRTIO_9P is not. Fix it and use if/else to clarify that the two lines are for opposite conditions. Reported-by: Peter Maydell <peter.maydell@linaro.org> Fixes: b5dfdb082fc350f3e68dfa61dc988d97cad28cfe Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Greg Kurz <groug@kaod.org> Tested-by: Greg Kurz <groug@kaod.org> Signed-off-by: Greg Kurz <groug@kaod.org>
13 lines
515 B
Makefile
13 lines
515 B
Makefile
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
|
|
# only pull in the actual 9p backend if we also enabled virtio or xen.
|
|
ifeq ($(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO_9P),$(CONFIG_XEN))),y)
|
|
common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
|
|
else
|
|
common-obj-y = qemu-fsdev-dummy.o
|
|
endif
|
|
common-obj-y += qemu-fsdev-opts.o qemu-fsdev-throttle.o
|
|
|
|
# Toplevel always builds this; targets without virtio will put it in
|
|
# common-obj-y
|
|
common-obj-$(CONFIG_ALL) += qemu-fsdev-dummy.o
|