| Message ID | 20211028150521.1973821-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/core: Restrict qdev-hotplug to sysemu | expand |
On 2021/10/28 23:05, Philippe Mathieu-Daudé wrote: > All these files don't make sense for tools and user emulation, > restrict them to system emulation. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/core/meson.build | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/core/meson.build b/hw/core/meson.build > index 18f44fb7c24..a829cc4245b 100644 > --- a/hw/core/meson.build > +++ b/hw/core/meson.build > @@ -14,15 +14,15 @@ > ) > > common_ss.add(files('cpu-common.c')) > -common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) > -common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) > -common_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c')) > -common_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) > -common_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c')) > -common_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) > -common_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) > -common_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) > -common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) > +softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) > +softmmu_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) > +softmmu_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c')) > +softmmu_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) > +softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c')) > +softmmu_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) > +softmmu_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) > +softmmu_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) > +softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) > > softmmu_ss.add(files( > 'cpu-sysemu.c', Reviewed-by: Yanan Wang <wangyanan55@huawei.com> Tested-by: Yanan Wang <wangyanan55@huawei.com> Thanks, Yanan
diff --git a/hw/core/meson.build b/hw/core/meson.build index 18f44fb7c24..a829cc4245b 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -14,15 +14,15 @@ ) common_ss.add(files('cpu-common.c')) -common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) -common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) -common_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c')) -common_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) -common_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c')) -common_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) -common_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) -common_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) -common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) +softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) +softmmu_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) +softmmu_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c')) +softmmu_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) +softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c')) +softmmu_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) +softmmu_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) +softmmu_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) softmmu_ss.add(files( 'cpu-sysemu.c',
All these files don't make sense for tools and user emulation, restrict them to system emulation. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/core/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)