diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-22 12:21:13 +0200 |
|---|---|---|
| committer | Greg Kurz <groug@kaod.org> | 2018-08-22 12:21:13 +0200 |
| commit | adbffc2074754aff8d806843d9e83443590ce5e0 (patch) | |
| tree | 95ffc439b8fcf3aaae1d8a658dfa4276eb4a4a0b /fsdev | |
| parent | 13b7b188501d419a7d63c016e00065bcc693b7d4 (diff) | |
| download | qemu-adbffc2074754aff8d806843d9e83443590ce5e0.zip qemu-adbffc2074754aff8d806843d9e83443590ce5e0.tar.gz qemu-adbffc2074754aff8d806843d9e83443590ce5e0.tar.bz2 | |
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: 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>
Diffstat (limited to 'fsdev')
| -rw-r--r-- | fsdev/Makefile.objs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs index fb38017..24bbb3e 100644 --- a/fsdev/Makefile.objs +++ b/fsdev/Makefile.objs @@ -1,7 +1,10 @@ # 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 |