Commit adbffc20 authored Aug 22, 2018 by Paolo Bonzini Committed by Greg Kurz Aug 22, 2018

fsdev: fix compilation with VIRTIO but not VIRTIO_9P



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: b5dfdb08
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>

parent 13b7b188

fsdev/Makefile.objs

+5 −2

Original line number	Diff line number	Diff line
		# 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.
		common-obj-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
		common-obj-$(call lnot,$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN)))) = qemu-fsdev-dummy.o
		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