[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/36] meson: Restrict block subsystem processing
From: |
Paolo Bonzini |
Subject: |
[PULL 27/36] meson: Restrict block subsystem processing |
Date: |
Fri, 29 Jan 2021 12:18:05 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Avoid generating module_block.h and block-gen.c if we are
not going to use them.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210122204441.2145197-6-philmd@redhat.com>
[Extend to nearby files and directories. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 48 +++++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/meson.build b/meson.build
index 4e694e78a0..0bebab037c 100644
--- a/meson.build
+++ b/meson.build
@@ -1794,29 +1794,31 @@ subdir('libdecnumber')
subdir('target')
subdir('dump')
-block_ss.add(files(
- 'block.c',
- 'blockjob.c',
- 'job.c',
- 'qemu-io-cmds.c',
-))
-block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c'))
-
-subdir('nbd')
-subdir('scsi')
-subdir('block')
-
-blockdev_ss.add(files(
- 'blockdev.c',
- 'blockdev-nbd.c',
- 'iothread.c',
- 'job-qmp.c',
-), gnutls)
-
-# os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
-# os-win32.c does not
-blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
-softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
+if have_block
+ block_ss.add(files(
+ 'block.c',
+ 'blockjob.c',
+ 'job.c',
+ 'qemu-io-cmds.c',
+ ))
+ block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c'))
+
+ subdir('nbd')
+ subdir('scsi')
+ subdir('block')
+
+ blockdev_ss.add(files(
+ 'blockdev.c',
+ 'blockdev-nbd.c',
+ 'iothread.c',
+ 'job-qmp.c',
+ ), gnutls)
+
+ # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
+ # os-win32.c does not
+ blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
+ softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
+endif
common_ss.add(files('cpus-common.c'))
--
2.29.2
- [PULL 22/36] meson: Warn when TCI is selected but TCG backend is available, (continued)
- [PULL 22/36] meson: Warn when TCI is selected but TCG backend is available, Paolo Bonzini, 2021/01/29
- [PULL 19/36] configure: Fix --enable-tcg-interpreter, Paolo Bonzini, 2021/01/29
- [PULL 20/36] configure: Improve TCI feature description, Paolo Bonzini, 2021/01/29
- [PULL 21/36] meson: Explicit TCG backend used, Paolo Bonzini, 2021/01/29
- [PULL 26/36] pc-bios/meson: Only install EDK2 blob firmwares with system emulation, Paolo Bonzini, 2021/01/29
- [PULL 24/36] build-sys: make libslirp a meson subproject, Paolo Bonzini, 2021/01/29
- [PULL 25/36] tests/meson: Only build softfloat objects if TCG is selected, Paolo Bonzini, 2021/01/29
- [PULL 28/36] meson: Merge trace_events_subdirs array, Paolo Bonzini, 2021/01/29
- [PULL 31/36] qapi/meson: Restrict qdev code to system-mode emulation, Paolo Bonzini, 2021/01/29
- [PULL 23/36] slirp: update to git master, Paolo Bonzini, 2021/01/29
- [PULL 27/36] meson: Restrict block subsystem processing,
Paolo Bonzini <=
- [PULL 32/36] qapi/meson: Remove QMP from user-mode emulation, Paolo Bonzini, 2021/01/29
- [PULL 30/36] meson: Restrict emulation code, Paolo Bonzini, 2021/01/29
- [PULL 35/36] hvf: Fetch cr4 before evaluating CPUID(1), Paolo Bonzini, 2021/01/29
- [PULL 36/36] accel/kvm/kvm-all: Fix wrong return code handling in dirty log code, Paolo Bonzini, 2021/01/29
- [PULL 29/36] meson: Restrict some trace event directories to user/system emulation, Paolo Bonzini, 2021/01/29
- [PULL 33/36] qapi/meson: Restrict system-mode specific modules, Paolo Bonzini, 2021/01/29
- [PULL 34/36] qapi/meson: Restrict UI module to system emulation and tools, Paolo Bonzini, 2021/01/29
- Re: [PULL 00/36] Misc patches (buildsys, i386, fuzzing) for 2021-01-29, Peter Maydell, 2021/01/29