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

meson: convert fsdev/

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-07-25 14:22:34 +04:00 committed by Paolo Bonzini
parent ab3180515c
commit 5eead72bd3
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.objs
View File

@ -39,9 +39,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS
# single QEMU executable should support all CPUs and machines. # single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y) ifeq ($(CONFIG_SOFTMMU),y)
common-obj-$(CONFIG_LINUX) = fsdev/ common-obj-y = accel/
common-obj-y += accel/
common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF) common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF) common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)

1
configure vendored
View File

@ -3751,7 +3751,6 @@ int main(void)
EOF EOF
if compile_prog "" "$cap_libs" ; then if compile_prog "" "$cap_libs" ; then
cap_ng=yes cap_ng=yes
libs_tools="$cap_libs $libs_tools"
else else
if test "$cap_ng" = "yes" ; then if test "$cap_ng" = "yes" ; then
feature_not_found "cap_ng" "Install libcap-ng devel" feature_not_found "cap_ng" "Install libcap-ng devel"

12
fsdev/Makefile.objs
View File

@ -1,12 +0,0 @@
# 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.
ifeq ($(CONFIG_FSDEV_9P),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
# common-obj-y
common-obj-$(CONFIG_ALL) += qemu-fsdev-dummy.o

10
fsdev/meson.build
View File

@ -1,3 +1,13 @@
fsdev_ss = ss.source_set()
fsdev_ss.add(files('qemu-fsdev-opts.c', 'qemu-fsdev-throttle.c'))
fsdev_ss.add(when: 'CONFIG_ALL', if_true: files('qemu-fsdev-dummy.c'))
fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
'9p-iov-marshal.c',
'9p-marshal.c',
'qemu-fsdev.c',
), if_false: files('qemu-fsdev-dummy.c'))
softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and 'CONFIG_VIRTFS' in config_host have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and 'CONFIG_VIRTFS' in config_host
if have_virtfs_proxy_helper if have_virtfs_proxy_helper
executable('virtfs-proxy-helper', executable('virtfs-proxy-helper',