[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 066/142] meson: convert fsdev/
From: |
Paolo Bonzini |
Subject: |
[PATCH 066/142] meson: convert fsdev/ |
Date: |
Tue, 28 Jan 2020 18:52:26 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile.objs | 6 +-----
fsdev/Makefile.objs | 12 ------------
fsdev/meson.build | 10 ++++++++++
3 files changed, 11 insertions(+), 17 deletions(-)
delete mode 100644 fsdev/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index e56106400c..63796fe8bc 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -35,8 +35,6 @@ qom-obj-y = qom/libqom.fa
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-$(CONFIG_LINUX) = fsdev/
-
common-obj-y += accel/
common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
@@ -58,14 +56,12 @@ common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF)
common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF)
common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) +=
block-dmg-bz2$(DSOSUF)
-
-common-obj-y += hw/
endif
#######################################################################
# Target-independent parts used in system and user emulation
-common-obj-y += hw/
+common-obj-y = hw/
common-obj-y += disas/
######################################################################
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs
deleted file mode 100644
index 42cd70c367..0000000000
--- a/fsdev/Makefile.objs
+++ /dev/null
@@ -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
diff --git a/fsdev/meson.build b/fsdev/meson.build
index eee8507033..ae84c13069 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -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)
+
if have_tools and libattr.found() and libcap_ng.found() and 'CONFIG_VIRTFS' in
config_host
executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c',
'9p-marshal.c', '9p-iov-marshal.c'),
dependencies: [qemuutil, libattr, libcap_ng])
--
2.21.0
- [PATCH 056/142] meson: convert trace/, (continued)
- [PATCH 056/142] meson: convert trace/, Paolo Bonzini, 2020/01/28
- [PATCH 058/142] meson: convert block/, Paolo Bonzini, 2020/01/28
- [PATCH 059/142] meson: convert dump/, Paolo Bonzini, 2020/01/28
- [PATCH 060/142] meson: convert monitor directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 061/142] meson: convert replay directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 062/142] meson: convert migration directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 063/142] meson: build softmmu-specific migration/ram.c, Paolo Bonzini, 2020/01/28
- [PATCH 064/142] meson: convert net directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 065/142] meson: convert backends directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 067/142] meson: convert disas directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 066/142] meson: convert fsdev/,
Paolo Bonzini <=
- [PATCH 068/142] meson: convert qapi-specific to meson, Paolo Bonzini, 2020/01/28
- [PATCH 069/142] meson: convert hw/xen, Paolo Bonzini, 2020/01/28
- [PATCH 070/142] meson: convert hw/core, Paolo Bonzini, 2020/01/28
- [PATCH 071/142] meson: convert hw/semihosting, Paolo Bonzini, 2020/01/28
- [PATCH 072/142] meson: convert hw/nubus, Paolo Bonzini, 2020/01/28
- [PATCH 073/142] meson: convert hw/smbios, Paolo Bonzini, 2020/01/28
- [PATCH 074/142] meson: convert hw/mem, Paolo Bonzini, 2020/01/28
- [PATCH 075/142] meson: convert hw/watchdog, Paolo Bonzini, 2020/01/28
- [PATCH 076/142] meson: convert hw/virtio, Paolo Bonzini, 2020/01/28
- [PATCH 078/142] meson: convert hw/usb, Paolo Bonzini, 2020/01/28