Message ID | 20221209112409.184703-12-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
Series | Meson changes for QEMU 8.0 | expand |
Hi On Fri, Dec 9, 2022 at 3:48 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > Now that qtest is available on all targets including Windows, dummy-cpus.c > is included unconditionally in the build. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (and doesn't have to be target specific) Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > accel/meson.build | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/accel/meson.build b/accel/meson.build > index 259c35c4c882..3a480cc2efef 100644 > --- a/accel/meson.build > +++ b/accel/meson.build > @@ -11,10 +11,5 @@ if have_system > subdir('stubs') > endif > > -dummy_ss = ss.source_set() > -dummy_ss.add(files( > - 'dummy-cpus.c', > -)) > - > -specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: dummy_ss) > -specific_ss.add_all(when: ['CONFIG_XEN'], if_true: dummy_ss) > +# qtest > +softmmu_ss.add(files('dummy-cpus.c')) > -- > 2.38.1 > >
On Fri, Dec 09, 2022 at 12:23:50PM +0100, Paolo Bonzini wrote: > Now that qtest is available on all targets including Windows, dummy-cpus.c > is included unconditionally in the build. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > accel/meson.build | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
diff --git a/accel/meson.build b/accel/meson.build index 259c35c4c882..3a480cc2efef 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -11,10 +11,5 @@ if have_system subdir('stubs') endif -dummy_ss = ss.source_set() -dummy_ss.add(files( - 'dummy-cpus.c', -)) - -specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: dummy_ss) -specific_ss.add_all(when: ['CONFIG_XEN'], if_true: dummy_ss) +# qtest +softmmu_ss.add(files('dummy-cpus.c'))
Now that qtest is available on all targets including Windows, dummy-cpus.c is included unconditionally in the build. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- accel/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)