Message ID | 20220203191814.45023-2-f4bug@amsat.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | softmmu: Make various objects target agnostic | expand |
On 03/02/2022 20.17, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > accel/stubs/meson.build | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build > index 12dd1539af..0249b9258f 100644 > --- a/accel/stubs/meson.build > +++ b/accel/stubs/meson.build > @@ -1,4 +1,7 @@ > -specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) > -specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) > -specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) > -specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) > +sysemu_stubs_ss = ss.source_set() > +sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) > +sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) > +sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) > +sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) > + > +specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: sysemu_stubs_ss) Reviewed-by: Thomas Huth <thuth@redhat.com>
On 2/4/22 06:17, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > accel/stubs/meson.build | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build > index 12dd1539af..0249b9258f 100644 > --- a/accel/stubs/meson.build > +++ b/accel/stubs/meson.build > @@ -1,4 +1,7 @@ > -specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) > -specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) > -specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) > -specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) > +sysemu_stubs_ss = ss.source_set() > +sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) > +sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) > +sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) > +sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) > + > +specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: sysemu_stubs_ss) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 12dd1539af..0249b9258f 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,4 +1,7 @@ -specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) -specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) -specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +sysemu_stubs_ss = ss.source_set() +sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) +sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) +sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) + +specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: sysemu_stubs_ss)
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- accel/stubs/meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)