| Message ID | 20240408155330.522792-14-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | buildsys: Start shrinking qemu-user build process | expand |
On 8/4/24 17:53, Paolo Bonzini wrote: > Since the ramfb stubs are needed exactly when the Kconfig symbols are not > needed, move them to hw/display/ and compile them when ramfb.c is absent. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > stubs/ramfb.c => hw/display/ramfb-stubs.c | 0 > hw/display/meson.build | 2 +- > stubs/meson.build | 1 - > 3 files changed, 1 insertion(+), 2 deletions(-) > rename stubs/ramfb.c => hw/display/ramfb-stubs.c (100%) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 4/8/24 05:53, Paolo Bonzini wrote: > Since the ramfb stubs are needed exactly when the Kconfig symbols are not > needed, move them to hw/display/ and compile them when ramfb.c is absent. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> > --- > stubs/ramfb.c => hw/display/ramfb-stubs.c | 0 > hw/display/meson.build | 2 +- > stubs/meson.build | 1 - > 3 files changed, 1 insertion(+), 2 deletions(-) > rename stubs/ramfb.c Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 4/8/24 05:53, Paolo Bonzini wrote: > Since the ramfb stubs are needed exactly when the Kconfig symbols are not > needed, move them to hw/display/ and compile them when ramfb.c is absent. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> > --- > stubs/ramfb.c => hw/display/ramfb-stubs.c | 0 > hw/display/meson.build | 2 +- > stubs/meson.build | 1 - > 3 files changed, 1 insertion(+), 2 deletions(-) > rename stubs/ramfb.c => hw/display/ramfb-stubs.c (100%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/stubs/ramfb.c b/hw/display/ramfb-stubs.c similarity index 100% rename from stubs/ramfb.c rename to hw/display/ramfb-stubs.c diff --git a/hw/display/meson.build b/hw/display/meson.build index f93a69f70f4..4751aab3ba9 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -3,7 +3,7 @@ hw_display_modules = {} system_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c')) system_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c')) -system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c')) +system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'), if_false: files('ramfb-stubs.c')) system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c')) system_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c')) diff --git a/stubs/meson.build b/stubs/meson.build index 84ecaa4daa1..92887660e41 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -36,7 +36,6 @@ stub_ss.add(files('qmp-command-available.c')) stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qtest.c')) stub_ss.add(files('ram-block.c')) -stub_ss.add(files('ramfb.c')) stub_ss.add(files('replay.c')) stub_ss.add(files('runstate-check.c')) stub_ss.add(files('sysbus.c'))
Since the ramfb stubs are needed exactly when the Kconfig symbols are not needed, move them to hw/display/ and compile them when ramfb.c is absent. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- stubs/ramfb.c => hw/display/ramfb-stubs.c | 0 hw/display/meson.build | 2 +- stubs/meson.build | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename stubs/ramfb.c => hw/display/ramfb-stubs.c (100%)