mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Just a build fix that I had queued during soft freeze.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEtIKLr5QxQM7yo0kQcdTV5YIvc9YFAlt9OYAACgkQcdTV5YIv
 c9bqBg/+J5G2sEhLUMxNXBaISyiQRXm70BSnpZdEFOkgIrtH4AnH3dcU9e7yPrHI
 ENpke2KkDUesf9uQqclvJPZEBNxdxU/AYg0V9/QtxAuLraYD7ucATEm6pPRtM4Qz
 a/Qpv5HlMkMMLt1ZnAMeMjoN0Oktgb+eTriKup5J/5OPSVKtA8mpDikgxcDI7mnN
 UJCgl1Kv6f5gmpnhda+GIh9Dp3y6DPBVMLo1ZzzT9KRv/KvnSRFwKmeH9qo/jWDd
 bFdvUwOw+sBy0hARGhRG6KYxGOnv9Ix+Ny5Ucia+GHVsEBb/BpvegXvx0LFc3Uth
 LdTY0PPq+0LaBT1p0VE41KL7v6oC/avbjYLWIuXLfbyDfyNnKH8Pth8izB0owkkl
 3tDKS2irqvBpTHKQRXv6xViNQ+UWLgNpS95fcrecFxJ8dAghH9aVTw8XcfuVRi1E
 JYBDl6mgh+92Xi+4MFzGxUBpQIvnzvEquV7yvxyPEkzQ3tnlNM35dBLOFQV46f5q
 1FQraYNpIBJhpqT83vlIgccqwxsuRtuSwSFJBzjmXWRl7yZFE3CHK9+2DNMDnaKJ
 Ox95FGA5C5KmhLep3mg9ZMuBuWLfgaIXKoCaYZO6KQ0kEBtAO6US4hzs+mj0rfzU
 6pGQo9tRY3+U9xMee5lwvAN8YqwAEUv6kkmg6OmLcNwQsMwE4AI=
 =hrFA
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-08-24 18:05:25 +01:00
commit 746b7907fe
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fsdev/Makefile.objs
View File

@ -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