| Message ID | 20201109094547.2456385-3-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel: Remove system-mode stubs from user-mode builds | expand |
On 11/9/20 10:45 AM, Philippe Mathieu-Daudé wrote: > This system-mode emulation stubs are not require nit: s,require,required, > in user-mode binaries. Restrict them to system-mode > binaries. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > accel/stubs/meson.build | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build > index 12dd1539afa..a83408bc0a7 100644 > --- a/accel/stubs/meson.build > +++ b/accel/stubs/meson.build > @@ -1,4 +1,8 @@ > -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')) > +accel_stubs_ss = ss.source_set() > + > +accel_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) > +accel_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) > +accel_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) > +accel_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) > + > +specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: accel_stubs_ss) >
diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 12dd1539afa..a83408bc0a7 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,4 +1,8 @@ -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')) +accel_stubs_ss = ss.source_set() + +accel_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) +accel_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) +accel_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +accel_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) + +specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: accel_stubs_ss)
This system-mode emulation stubs are not require in user-mode binaries. Restrict them to system-mode binaries. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- accel/stubs/meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)