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 /Makefile.objs | |
| parent | d7c698af8a5c7330a5ba70de0ff70904a661c20e (diff) | |
| parent | 993c91a0e996346c7ee8fa2ca310cc76edb59e17 (diff) | |
| download | qemu-f53f3d0a00b6df39ce8dfca942608e5b6a9a4f71.zip | |
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 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Makefile.objs b/Makefile.objs index 4a62913a4d..5cd3d816ff 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -21,11 +21,6 @@ block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o block-obj-m = block/ -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. -CONFIG_REALLY_VIRTFS=y -endif ###################################################################### # smartcard |