Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
Makefile | 5 -----
Makefile.objs | 10 ----------
meson.build | 2 +-
storage-daemon/Makefile.objs | 3 ---
storage-daemon/meson.build | 13 +++++++++++++
storage-daemon/qapi/meson.build | 5 +----
.../qemu-storage-daemon.c | 0
7 files changed, 15 insertions(+), 23 deletions(-)
delete mode 100644 storage-daemon/Makefile.objs
rename qemu-storage-daemon.c => storage-daemon/qemu-storage-daemon.c (100%)
diff --git a/Makefile b/Makefile
index cb364f4167..0b06b9cacd 100644
--- a/Makefile
+++ b/Makefile
@@ -179,8 +179,6 @@ include $(SRC_PATH)/Makefile.objs
endif
dummy := $(call unnest-vars,, \
- storage-daemon-obj-y \
- storage-daemon-obj-m \
common-obj-y \
common-obj-m)
@@ -196,7 +194,6 @@ TARGET_DIRS_RULES := $(foreach t, all fuzz clean install,
$(addsuffix /$(t), $(T
SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES))
$(SOFTMMU_ALL_RULES): $(authz-obj-y)
$(SOFTMMU_ALL_RULES): $(block-obj-y)
-$(SOFTMMU_ALL_RULES): $(storage-daemon-obj-y)
$(SOFTMMU_ALL_RULES): $(chardev-obj-y)
$(SOFTMMU_ALL_RULES): $(crypto-obj-y)
$(SOFTMMU_ALL_RULES): $(io-obj-y)
@@ -287,8 +284,6 @@ Makefile: $(version-obj-y)
COMMON_LDADDS = libqemuutil.a
-qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y)
$(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y)
$(storage-daemon-obj-y) $(COMMON_LDADDS)
-
clean: recurse-clean ninja-clean clean-ctlist
-test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean
# avoid old build problems by removing potentially incorrect old files
diff --git a/Makefile.objs b/Makefile.objs
index d7826c1e5c..e304d92954 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -33,16 +33,6 @@ io-obj-y = io/libio.fa
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
-#######################################################################
-# storage-daemon-obj-y is code used by qemu-storage-daemon (these objects are
-# used for system emulation, too, but specified separately there)
-
-storage-daemon-obj-y = block/ qapi/ qom/ storage-daemon/
-storage-daemon-obj-y += blockdev.o blockdev-nbd.o iothread.o job-qmp.o
-storage-daemon-obj-$(CONFIG_WIN32) += os-win32.o
-storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
-storage-daemon-obj-y += libqmp.fa
-
######################################################################
# Target independent part of system emulation. The long term path is to
# suppress *all* target specific code in case of system emulation, i.e. a
diff --git a/meson.build b/meson.build
index 9d1a530271..4ff3f7bccb 100644
--- a/meson.build
+++ b/meson.build
@@ -590,7 +590,6 @@ subdir('util')
subdir('qom')
subdir('authz')
subdir('crypto')
-subdir('storage-daemon')
subdir('ui')
@@ -800,6 +799,7 @@ if have_tools
dependencies: [block, qemuutil], install: true)
endif
+ subdir('storage-daemon')
subdir('contrib/rdmacm-mux')
subdir('contrib/elf2dmp')
diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs
deleted file mode 100644
index 41c0d02178..0000000000
--- a/storage-daemon/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-storage-daemon-obj-y = qapi/libqsd-qapi.fa
-
-qemu-storage-daemon.o: storage-daemon/qapi/qapi-commands.h
storage-daemon/qapi/qapi-init-commands.h
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
index 35f8949924..0409acc3f5 100644
--- a/storage-daemon/meson.build
+++ b/storage-daemon/meson.build
@@ -1 +1,14 @@
+qsd_ss = ss.source_set()
+qsd_ss.add(files('qemu-storage-daemon.c'))
+qsd_ss.add(block, chardev, qmp, qom, qemuutil)
+qsd_ss.add_all(blockdev_ss)
+
subdir('qapi')
+
+if have_tools
+ qsd_ss = qsd_ss.apply(config_host, strict: false)
+ executable('qemu-storage-daemon',
+ qsd_ss.sources(),
+ dependencies: qsd_ss.dependencies(),
+ install: true)
+endif
diff --git a/storage-daemon/qapi/meson.build b/storage-daemon/qapi/meson.build
index 7a2b041247..cea618bec0 100644
--- a/storage-daemon/qapi/meson.build
+++ b/storage-daemon/qapi/meson.build
@@ -4,7 +4,4 @@ qsd_qapi_files = custom_target('QAPI files for
qemu-storage-daemon',
command: [ qapi_gen, '-o',
'storage-daemon/qapi', '@INPUT@' ],
depend_files: [ qapi_inputs, qapi_gen_depends ])
-static_library('qsd-qapi',
- qsd_qapi_files.to_list(),
- name_suffix: 'fa',
- build_by_default: false)
+qsd_ss.add(qsd_qapi_files.to_list())
diff --git a/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
similarity index 100%
rename from qemu-storage-daemon.c
rename to storage-daemon/qemu-storage-daemon.c
--
2.26.2
