* [PATCH v2] meson: fix condition for io_uring stubs
@ 2021-07-12 15:18 Paolo Bonzini
2021-07-12 15:30 ` Philippe Mathieu-Daudé
2021-07-13 13:54 ` Daniel P. Berrangé
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2021-07-12 15:18 UTC (permalink / raw
To: qemu-devel; +Cc: alex.bennee
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>
---
stubs/meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] meson: fix condition for io_uring stubs
2021-07-12 15:18 [PATCH v2] meson: fix condition for io_uring stubs Paolo Bonzini
@ 2021-07-12 15:30 ` Philippe Mathieu-Daudé
2021-07-13 13:54 ` Daniel P. Berrangé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-12 15:30 UTC (permalink / raw
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 7/12/21 5:18 PM, Paolo Bonzini wrote:
> 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>
> ---
> stubs/meson.build | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] meson: fix condition for io_uring stubs
2021-07-12 15:18 [PATCH v2] meson: fix condition for io_uring stubs Paolo Bonzini
2021-07-12 15:30 ` Philippe Mathieu-Daudé
@ 2021-07-13 13:54 ` Daniel P. Berrangé
1 sibling, 0 replies; 3+ messages in thread
From: Daniel P. Berrangé @ 2021-07-13 13:54 UTC (permalink / raw
To: Paolo Bonzini; +Cc: alex.bennee, qemu-devel
On Mon, Jul 12, 2021 at 05:18:10PM +0200, Paolo Bonzini wrote:
> 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>
> ---
> stubs/meson.build | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
> 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.31.1
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-13 14:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-12 15:18 [PATCH v2] meson: fix condition for io_uring stubs Paolo Bonzini
2021-07-12 15:30 ` Philippe Mathieu-Daudé
2021-07-13 13:54 ` Daniel P. Berrangé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.