diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-08-24 18:05:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-08-24 18:05:25 +0100 |
| commit | 746b7907feeba7eced022b96b8effa079bd27a2e (patch) | |
| tree | 2dc26ddf0afc97a777ac2b0b0786e7990e954009 | |
| parent | 54906fe0ce5dd8eb616094e7f11d4ce31b7ad9da (diff) | |
| parent | adbffc2074754aff8d806843d9e83443590ce5e0 (diff) | |
| download | qemu-746b7907feeba7eced022b96b8effa079bd27a2e.zip qemu-746b7907feeba7eced022b96b8effa079bd27a2e.tar.gz qemu-746b7907feeba7eced022b96b8effa079bd27a2e.tar.bz2 | |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
Just a build fix that I had queued during soft freeze.
# gpg: Signature made Wed 22 Aug 2018 11:22:56 BST
# gpg: using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg: aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg: aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3 4910 71D4 D5E5 822F 73D6
* remotes/gkurz/tags/for-upstream:
fsdev: fix compilation with VIRTIO but not VIRTIO_9P
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -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 |