Commit 746b7907 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 54906fe0 adbffc20

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