aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-02-05 09:45:39 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2020-08-21 06:30:09 -0400
commit3f99cf5710d77ce218116d1b6bb9682c466bbde1 (patch)
treeb03f11959ec3ad2d2e206965c02c16d7f7e2d9a6 /Makefile
parent931049b46cb58a499a36d8a1d0ac3f7b334e0876 (diff)
downloadqemu-3f99cf5710d77ce218116d1b6bb9682c466bbde1.zip
qemu-3f99cf5710d77ce218116d1b6bb9682c466bbde1.tar.gz
qemu-3f99cf5710d77ce218116d1b6bb9682c466bbde1.tar.bz2
tools/virtiofsd: convert to Meson
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 0 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 78d3a78..e591d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -205,11 +205,6 @@ HELPERS-y += vhost-user-gpu$(EXESUF)
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
endif
-ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy)
-HELPERS-y += virtiofsd$(EXESUF)
-vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json
-endif
-
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from
@@ -316,7 +311,6 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
- virtiofsd-obj-y \
rdmacm-mux-obj-y \
vhost-user-scsi-obj-y \
vhost-user-blk-obj-y \
@@ -549,12 +543,6 @@ rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
-# relies on Linux-specific syscalls
-ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
-virtiofsd$(EXESUF): $(virtiofsd-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
- $(call LINK, $^)
-endif
-
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)