| Message ID | 20220107133514.7785-1-vr_qemu@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | meson: reenable filemonitor-inotify compilation | expand |
On 1/7/22 14:35, Volker Rümelin wrote: > Reenable util/filemonitor-inotify compilation. Compilation was > disabled when commit a620fbe9ac ("configure: convert compiler tests > to meson, part 5") moved CONFIG_INOTIFY1 from config-host.mak to > config-host.h. > > This fixes the usb-mtp device and reenables test-util-filemonitor. > > Fixes: a620fbe9ac ("configure: convert compiler tests to meson, part 5") > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/800 > Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> > --- > tests/unit/meson.build | 2 +- > util/meson.build | 7 +++++-- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/tests/unit/meson.build b/tests/unit/meson.build > index 90acf5b0da..64a5e7bfde 100644 > --- a/tests/unit/meson.build > +++ b/tests/unit/meson.build > @@ -129,7 +129,7 @@ if have_system > 'test-vmstate': [migration, io], > 'test-yank': ['socket-helpers.c', qom, io, chardev] > } > - if 'CONFIG_INOTIFY1' in config_host > + if config_host_data.get('CONFIG_INOTIFY1') > tests += {'test-util-filemonitor': []} > endif > > diff --git a/util/meson.build b/util/meson.build > index 05b593055a..71543e1a85 100644 > --- a/util/meson.build > +++ b/util/meson.build > @@ -83,7 +83,10 @@ if have_block > util_ss.add(files('readline.c')) > util_ss.add(files('throttle.c')) > util_ss.add(files('timed-average.c')) > - util_ss.add(when: 'CONFIG_INOTIFY1', if_true: files('filemonitor-inotify.c'), > - if_false: files('filemonitor-stub.c')) > + if config_host_data.get('CONFIG_INOTIFY1') > + util_ss.add(files('filemonitor-inotify.c')) > + else > + util_ss.add(files('filemonitor-stub.c')) > + endif > util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c')) > endif Queued, thanks. Paolo
diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 90acf5b0da..64a5e7bfde 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -129,7 +129,7 @@ if have_system 'test-vmstate': [migration, io], 'test-yank': ['socket-helpers.c', qom, io, chardev] } - if 'CONFIG_INOTIFY1' in config_host + if config_host_data.get('CONFIG_INOTIFY1') tests += {'test-util-filemonitor': []} endif diff --git a/util/meson.build b/util/meson.build index 05b593055a..71543e1a85 100644 --- a/util/meson.build +++ b/util/meson.build @@ -83,7 +83,10 @@ if have_block util_ss.add(files('readline.c')) util_ss.add(files('throttle.c')) util_ss.add(files('timed-average.c')) - util_ss.add(when: 'CONFIG_INOTIFY1', if_true: files('filemonitor-inotify.c'), - if_false: files('filemonitor-stub.c')) + if config_host_data.get('CONFIG_INOTIFY1') + util_ss.add(files('filemonitor-inotify.c')) + else + util_ss.add(files('filemonitor-stub.c')) + endif util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c')) endif
Reenable util/filemonitor-inotify compilation. Compilation was disabled when commit a620fbe9ac ("configure: convert compiler tests to meson, part 5") moved CONFIG_INOTIFY1 from config-host.mak to config-host.h. This fixes the usb-mtp device and reenables test-util-filemonitor. Fixes: a620fbe9ac ("configure: convert compiler tests to meson, part 5") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/800 Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> --- tests/unit/meson.build | 2 +- util/meson.build | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)