| Message ID | 20240408155330.522792-15-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | buildsys: Start shrinking qemu-user build process | expand |
On 4/8/24 05:53, Paolo Bonzini wrote: > Since the memory-device stubs are needed exactly when the Kconfig symbols are not > needed, move them to hw/mem/. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> > --- > stubs/memory_device.c => hw/mem/memory-device-stubs.c | 0 > hw/mem/meson.build | 1 + > stubs/meson.build | 1 - > 3 files changed, 1 insertion(+), 1 deletion(-) > rename stubs/memory_device.c => hw/mem/memory-device-stubs.c (100%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 8/4/24 17:53, Paolo Bonzini wrote: > Since the memory-device stubs are needed exactly when the Kconfig symbols are not > needed, move them to hw/mem/. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > stubs/memory_device.c => hw/mem/memory-device-stubs.c | 0 > hw/mem/meson.build | 1 + > stubs/meson.build | 1 - > 3 files changed, 1 insertion(+), 1 deletion(-) > rename stubs/memory_device.c => hw/mem/memory-device-stubs.c (100%) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/stubs/memory_device.c b/hw/mem/memory-device-stubs.c similarity index 100% rename from stubs/memory_device.c rename to hw/mem/memory-device-stubs.c diff --git a/hw/mem/meson.build b/hw/mem/meson.build index faee1fe9360..1c1c6da24b5 100644 --- a/hw/mem/meson.build +++ b/hw/mem/meson.build @@ -6,6 +6,7 @@ mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c')) system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_stubs.c')) +system_ss.add(when: 'CONFIG_MEM_DEVICE', if_false: files('memory-device-stubs.c')) system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) system_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c')) diff --git a/stubs/meson.build b/stubs/meson.build index 92887660e41..a4404e765ab 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -31,7 +31,6 @@ stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) stub_ss.add(files('physmem.c')) stub_ss.add(files('qemu-timer-notify-cb.c')) -stub_ss.add(files('memory_device.c')) stub_ss.add(files('qmp-command-available.c')) stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qtest.c'))
Since the memory-device stubs are needed exactly when the Kconfig symbols are not needed, move them to hw/mem/. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- stubs/memory_device.c => hw/mem/memory-device-stubs.c | 0 hw/mem/meson.build | 1 + stubs/meson.build | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename stubs/memory_device.c => hw/mem/memory-device-stubs.c (100%)