[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 21/30] qemu-storage-daemon: avoid compiling blockdev_ss twice
From: |
Stefan Hajnoczi |
Subject: |
[PULL v2 21/30] qemu-storage-daemon: avoid compiling blockdev_ss twice |
Date: |
Mon, 12 Oct 2020 19:27:51 +0100 |
Introduce libblkdev.fa to avoid recompiling blockdev_ss twice.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200929125516.186715-3-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
meson.build | 12 ++++++++++--
storage-daemon/meson.build | 3 +--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 4ddd899fdd..2fb0bb7cb4 100644
--- a/meson.build
+++ b/meson.build
@@ -1366,7 +1366,6 @@ blockdev_ss.add(files(
blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
-softmmu_ss.add_all(blockdev_ss)
softmmu_ss.add(files(
'bootdevice.c',
'dma-helpers.c',
@@ -1462,6 +1461,15 @@ block = declare_dependency(link_whole: [libblock],
link_args: '@block.syms',
dependencies: [crypto, io])
+blockdev_ss = blockdev_ss.apply(config_host, strict: false)
+libblockdev = static_library('blockdev', blockdev_ss.sources() + genh,
+ dependencies: blockdev_ss.dependencies(),
+ name_suffix: 'fa',
+ build_by_default: false)
+
+blockdev = declare_dependency(link_whole: [libblockdev],
+ dependencies: [block])
+
qmp_ss = qmp_ss.apply(config_host, strict: false)
libqmp = static_library('qmp', qmp_ss.sources() + genh,
dependencies: qmp_ss.dependencies(),
@@ -1478,7 +1486,7 @@ foreach m : block_mods + softmmu_mods
install_dir: config_host['qemu_moddir'])
endforeach
-softmmu_ss.add(authz, block, chardev, crypto, io, qmp)
+softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp)
common_ss.add(qom, qemuutil)
common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss])
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
index 0409acc3f5..c5adce81c3 100644
--- a/storage-daemon/meson.build
+++ b/storage-daemon/meson.build
@@ -1,7 +1,6 @@
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)
+qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil)
subdir('qapi')
--
2.26.2
- [PULL v2 11/30] util/vhost-user-server: drop unnecessary watch deletion, (continued)
- [PULL v2 11/30] util/vhost-user-server: drop unnecessary watch deletion, Stefan Hajnoczi, 2020/10/12
- [PULL v2 09/30] util/vhost-user-server: s/fileds/fields/ typo fix, Stefan Hajnoczi, 2020/10/12
- [PULL v2 13/30] util/vhost-user-server: drop unused DevicePanicNotifier, Stefan Hajnoczi, 2020/10/12
- [PULL v2 14/30] util/vhost-user-server: fix memory leak in vu_message_read(), Stefan Hajnoczi, 2020/10/12
- [PULL v2 15/30] util/vhost-user-server: check EOF when reading payload, Stefan Hajnoczi, 2020/10/12
- [PULL v2 17/30] block/export: report flush errors, Stefan Hajnoczi, 2020/10/12
- [PULL v2 18/30] block/export: convert vhost-user-blk server to block export API, Stefan Hajnoczi, 2020/10/12
- [PULL v2 19/30] util/vhost-user-server: move header to include/, Stefan Hajnoczi, 2020/10/12
- [PULL v2 16/30] util/vhost-user-server: rework vu_client_trip() coroutine lifecycle, Stefan Hajnoczi, 2020/10/12
- [PULL v2 20/30] util/vhost-user-server: use static library in meson.build, Stefan Hajnoczi, 2020/10/12
- [PULL v2 21/30] qemu-storage-daemon: avoid compiling blockdev_ss twice,
Stefan Hajnoczi <=
- [PULL v2 22/30] block: move block exports to libblockdev, Stefan Hajnoczi, 2020/10/12
- [PULL v2 23/30] block/export: add iothread and fixed-iothread options, Stefan Hajnoczi, 2020/10/12
- [PULL v2 24/30] block/export: add vhost-user-blk multi-queue support, Stefan Hajnoczi, 2020/10/12
- [PULL v2 25/30] tests/qtest: add multi-queue test case to vhost-user-blk-test, Stefan Hajnoczi, 2020/10/12
- [PULL v2 26/30] block/io: fix bdrv_co_block_status_above, Stefan Hajnoczi, 2020/10/12
- [PULL v2 27/30] block/io: bdrv_common_block_status_above: support include_base, Stefan Hajnoczi, 2020/10/12
- [PULL v2 29/30] block/io: fix bdrv_is_allocated_above, Stefan Hajnoczi, 2020/10/12
- [PULL v2 30/30] iotests: add commit top->base cases to 274, Stefan Hajnoczi, 2020/10/12
- [PULL v2 28/30] block/io: bdrv_common_block_status_above: support bs == base, Stefan Hajnoczi, 2020/10/12
- Re: [PULL v2 00/30] Block patches, no-reply, 2020/10/12