diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-08 12:38:43 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-08 12:38:43 +0000 |
commit | f53f3d0a00b6df39ce8dfca942608e5b6a9a4f71 (patch) | |
tree | 1fda6a6482b69da84db90e151c3250a7fd9c7482 /fsdev/Makefile.objs | |
parent | d7c698af8a5c7330a5ba70de0ff70904a661c20e (diff) | |
parent | 993c91a0e996346c7ee8fa2ca310cc76edb59e17 (diff) | |
download | qemu-f53f3d0a00b6df39ce8dfca942608e5b6a9a4f71.tar.gz |
Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging
* remotes/kvaneesh/for-upstream:
hw/9pfs: Include virtio-9p-device.o in build
hw/9pfs: use g_strdup_printf() instead of PATH_MAX limitation
hw/9pfs/virtio-9p-local.c: use snprintf() instead of sprintf()
hw/9pfs/virtio-9p-local.c: move v9fs_string_free() to below "err_out:"
fsdev: Fix overrun after readlink() fills buffer completely
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'fsdev/Makefile.objs')
-rw-r--r-- | fsdev/Makefile.objs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs index 206289c49f..c27dad3f6d 100644 --- a/fsdev/Makefile.objs +++ b/fsdev/Makefile.objs @@ -1,4 +1,6 @@ -ifeq ($(CONFIG_REALLY_VIRTFS),y) +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) +# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. +# only pull in the actual virtio-9p device if we also enabled virtio. common-obj-y = qemu-fsdev.o virtio-9p-marshal.o else common-obj-y = qemu-fsdev-dummy.o |