[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v5 06/44] meson: fix condition for io_uring stubs
From: |
Alex Bennée |
Subject: |
[PULL v5 06/44] meson: fix condition for io_uring stubs |
Date: |
Wed, 14 Jul 2021 15:59:58 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
CONFIG_LINUX_IO_URING is not included in config-host.mak and therefore is
not usable in "when" clauses. Check the availability of the library,
which matches the condition for the non-stubbed version block/io_uring.c.
At this point, the difference between libraries that have config-host.mak
entries and those that do not is quite confusing. The remaining ~dozen
should be converted in 6.2.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210712151810.508249-1-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/stubs/meson.build b/stubs/meson.build
index 2e79ff9f4d..d3fa8646b3 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -15,7 +15,9 @@ stub_ss.add(files('fdset.c'))
stub_ss.add(files('fw_cfg.c'))
stub_ss.add(files('gdbstub.c'))
stub_ss.add(files('get-vm-name.c'))
-stub_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('io_uring.c'))
+if linux_io_uring.found()
+ stub_ss.add(files('io_uring.c'))
+endif
stub_ss.add(files('iothread-lock.c'))
stub_ss.add(files('isa-bus.c'))
stub_ss.add(files('is-daemonized.c'))
--
2.20.1
- [PULL v5 00/44] testing, build and plugin updates, Alex Bennée, 2021/07/14
- [PULL v5 01/44] Jobs based on custom runners: documentation and configuration placeholder, Alex Bennée, 2021/07/14
- [PULL v5 03/44] Jobs based on custom runners: docs and gitlab-runner setup playbook, Alex Bennée, 2021/07/14
- [PULL v5 05/44] tests/tcg: also disable the signals test for plugins, Alex Bennée, 2021/07/14
- [PULL v5 08/44] build: validate that system capstone works before using it, Alex Bennée, 2021/07/14
- [PULL v5 04/44] Jobs based on custom runners: add job definitions for QEMU's machines, Alex Bennée, 2021/07/14
- [PULL v5 07/44] disable modular TCG on Darwin, Alex Bennée, 2021/07/14
- [PULL v5 02/44] Jobs based on custom runners: build environment docs and playbook, Alex Bennée, 2021/07/14
- [PULL v5 09/44] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run, Alex Bennée, 2021/07/14
- [PULL v5 06/44] meson: fix condition for io_uring stubs,
Alex Bennée <=
- [PULL v5 10/44] cirrus: delete FreeBSD and macOS jobs, Alex Bennée, 2021/07/14
- [PULL v5 11/44] hw/usb/ccid: remove references to NSS, Alex Bennée, 2021/07/14
- [PULL v5 14/44] tests/docker: use explicit docker.io registry, Alex Bennée, 2021/07/14
- [PULL v5 12/44] tests/docker: don't use BUILDKIT in GitLab either, Alex Bennée, 2021/07/14
- [PULL v5 39/44] docs/devel: tcg-plugins: add execlog plugin description, Alex Bennée, 2021/07/14
- [PULL v5 23/44] tests/docker: expand ubuntu1804 package list, Alex Bennée, 2021/07/14
- [PULL v5 36/44] tcg/plugins: enable by default for most TCG builds, Alex Bennée, 2021/07/14
- [PULL v5 44/44] MAINTAINERS: Added myself as a reviewer for TCG Plugins, Alex Bennée, 2021/07/14
- [PULL v5 34/44] configure: add an explicit static and plugins check, Alex Bennée, 2021/07/14
- [PULL v5 26/44] tests/vm: update NetBSD to 9.2, Alex Bennée, 2021/07/14